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
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
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
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
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
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
Seth Alves
bcd6b30ec3
move AnimationHandle from render-utils to animation. give Rig some jointstates and animation lists
2015-07-17 13:31:48 -07:00
Howard Stearns
5312993e56
Hmm, last was missing some emptiness.
2015-07-15 15:30:34 -07:00
Howard Stearns
bbb5f832a2
Empty Rig.
2015-07-15 15:11:16 -07:00
