Howard Stearns
a840a17106
Change name originalRotation defaultRotation.
2015-08-06 19:45:58 -07:00
Howard Stearns
42cc34cd64
JointState has our own copy of any ivars we want from FBXJoint, instead of keeping a reference to the fbx.
2015-08-06 16:54:09 -07:00
Howard Stearns
bb974edf7f
Add assert on mix range.
2015-08-05 11:09:04 -07:00
Howard Stearns
f51b5be167
Simplify fade normalization, eliminating a loop.
2015-08-05 11:00:40 -07:00
Howard Stearns
653e46fdd3
const methods.
2015-08-05 10:51:26 -07:00
Howard Stearns
2f2b59b6b6
Merge branch 'master' of https://github.com/highfidelity/hifi into smooth-faded-animations
2015-08-05 10:05:05 -07:00
Howard Stearns
a1f86cc7b8
Make MSVC happy.
2015-08-04 19:49:12 -07:00
Howard Stearns
731bcba956
Merge branch 'master' of https://github.com/highfidelity/hifi into smooth-faded-animations
2015-08-04 17:27:23 -07:00
Howard Stearns
61198a658c
Smooth fading of animations in and out.
...
Also, turn on the secret rig animations from Javascript with MyAvatar.setEnableRigAnimations(true). (persists)
2015-08-04 17:04:15 -07:00
Seth Alves
9171033f21
Merge branch 'master' of github.com:highfidelity/hifi into rig
2015-08-04 16:06:38 -07:00
Eric Levin
f506e58687
Merge pull request #5490 from howard-stearns/restart-animations-at-specified-parameters
...
restart animations at specified parameters
2015-08-04 15:09:11 -07:00
Howard Stearns
61afc362e7
For startAnimation (but not startAnimationByRole), use the specified parameters even if the animation
...
was already playing. This fixes the behavior exercised by the squeezeHands.js script.
Fixes https://app.asana.com/0/32622044445063/44025709513292
2015-08-03 17:00:39 -07:00
Howard Stearns
2e5142e9bb
Fix end of idle.
2015-08-03 16:09:48 -07:00
Howard Stearns
cdb697760f
Remove some debug.
2015-08-03 15:51:07 -07:00
Howard Stearns
4c1d1a65d5
Provide initial fight club animations and use them in rig.
...
Still only active when you do Settings.setValue('enableRig', true) and restart.
(Will be more exposed after fadein/fadeout is implemented.)
2015-08-03 15:41:15 -07:00
Seth Alves
241e767ab6
move setHandPosition from SkeletonModel to AvatarRig. Tell Rig::initJointStates joint-indexes for hands and elbows and shoulders
2015-07-30 18:44:09 -07:00
Seth Alves
c80516a051
Merge branch 'rig' of github.com:howard-stearns/hifi into rig
2015-07-30 18:39:09 -07:00
Seth Alves
c1f777e18f
move setHandPosition from SkeletonModel to AvatarRig. Tell Rig::initJointStates joint-indexes for hands and elbows and shoulders
2015-07-30 18:39:01 -07:00
Howard Stearns
78a900c866
Prototype blend. Just equal weighting for now.
2015-07-30 17:01:48 -07:00
Anthony J. Thibault
7a10b31dd9
Clear translation on root joint.
...
Also, delete/rename all instances of updateJointState except for the one in Rig
and derived classes.
2015-07-30 15:04:27 -07:00
Howard Stearns
06aa107762
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-30 09:57:02 -07:00
Anthony J. Thibault
4bb415fd0d
Fix for torso twist.
...
Off by one error, 0 is a valid parent bone index.
2015-07-30 09:31:23 -07:00
Brad Hefta-Gaub
b95e4e1e93
Merge pull request #5323 from MarcelEdward/20605
...
Removed the line where the directory is stripped off the RelativeFile
2015-07-30 07:30:01 -07:00
Howard Stearns
dc34c025bd
whitespace
2015-07-29 18:54:05 -07:00
Anthony J. Thibault
c2934bdb5d
Fix avatar head, eye and torso twist.
...
* Updated SkeletionModel::updateRig to explicitly pass a set of HeadParameters
to the rig to do procedural animation.
* Moved torso lean procedural animation from SkeletonModel into Rig.
* Moved eye tracking procedural animation from HeadModel into Rig.
* Moved neck procedural animation from HeadModel into Rig.
2015-07-29 17:35:29 -07:00
Howard Stearns
a9f76324b5
Merge branch 'rig' of https://github.com/sethalves/hifi into sethalves-rig2
2015-07-29 10:49:27 -07:00
Anthony J. Thibault
b06485c266
Remove cauterize code from Rig and move it back into Model.
...
* cauterize code is used as at render time and is not dependent on
the jointStates.
* MyAvatar now initialize the bone set used for cauterization and
makes the decision to perform cauterization or not in preRender.
2015-07-28 17:45:33 -07:00
Howard Stearns
4754615159
Fix NPC animations.
2015-07-28 12:34:10 -07:00
Seth Alves
6e5aca6da4
merge from upstream
2015-07-27 16:52:36 -07:00
Howard Stearns
1bb734aec0
Kill warnings.
2015-07-27 15:26:03 -07:00
Howard Stearns
146ddd2240
Cleanup false starts.
2015-07-27 13:42:18 -07:00
Howard Stearns
990f0d6d07
Pass correct position/velocity/orientation to Rig simulation.
2015-07-27 12:57:39 -07:00
Seth Alves
a3c6a4b9bc
merge from upstream
2015-07-27 09:29:18 -07:00
Howard Stearns
dac6667ee6
Start of state.
2015-07-27 09:21:24 -07:00
Howard Stearns
8b5f24e4df
Keep list of animations in Rig, not MyAvatar.
2015-07-24 22:02:39 -07:00
Howard Stearns
05dda1220e
Add logging.
2015-07-24 22:01:55 -07:00
Howard Stearns
4e298d815d
Add the joint mapping necessary for playing animations in the rig.
2015-07-24 14:07:32 -07:00
Seth Alves
d5400e2b9d
Merge branch 'rig' of github.com:howard-stearns/hifi into rig
2015-07-23 15:14:23 -07:00
Seth Alves
33c97a1833
get rid of _firstPersonSkeletonModel in MyAvatar. add flag in Rig for joints being dirty so Model knows when to recompute meshes
2015-07-23 15:14:10 -07:00
Howard Stearns
9593668110
Bring animation file headers up to date.
2015-07-23 15:08:22 -07:00
Seth Alves
4566d16402
move Model's AnimationHandles to Rig. Move a bunch of Model methods from public to protected
2015-07-23 13:03:38 -07:00
Howard Stearns
a1a10ad08e
Merge branch 'rig' of https://github.com/sethalves/hifi into sethalves-rig
2015-07-22 21:08:57 -07:00
Howard Stearns
5a0c1a9402
Checkpoint testing stuff.
2015-07-22 21:03:48 -07:00
Seth Alves
ee334ff826
JointStates are owned by Rig objects. Model, FaceModel, SkeletonModel call into their Rig pointer to access JointStates.
2015-07-22 18:43:10 -07:00
Seth Alves
47965bc39c
merge from upstream
2015-07-22 13:48:19 -07:00
Seth Alves
7c8d52cbd1
back out some changes to Model.cpp, change how rig pointer is delivered to model initilizer
2015-07-22 13:41:31 -07:00
Marcel Verhagen
8f0893ba21
Added fileOnUrl to check if a texture exist at the location. It return the correct filename of where the texture lives.
...
Added the url of the fix file to extractFBXGeometry and readFBX and updated the calls to readFBX to include the url of the fix file.
So it now does not break existing content.
Found a second place in the FBXReader.cpp where the RelativeFileName stripped out the dir location.
2015-07-22 22:34:45 +02:00
Howard Stearns
a161f527c4
Comments documenting direction and questions.
2015-07-22 11:41:24 -07:00
Seth Alves
abfe60aa20
whenever Model class uses _jointState, use the Rig version if there is a Rig.
2015-07-20 18:31:42 -07:00
Howard Stearns
ed815a0573
Reflect dependencies in unit test setup.
2015-07-17 16:53:41 -07:00
