Commit graph

75 commits

Author SHA1 Message Date
Anthony J. Thibault
a4116e633a Removed last consumer of JointState class
Removed option to render IK constraints used by old animation system
2015-11-20 11:26:54 -08:00
Howard Stearns
722c024f61 Remove obsolete code. 2015-08-13 15:08:26 -07:00
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
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
Anthony J. Thibault
314434e068 Re-added neck and eye procedural animation to FaceModel.
This is only used in the case of split head/body avatars.
2015-07-30 12:27:28 -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
1663d095a1 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-24 14:08:51 -07:00
David Rowe
ad7167c67a Merge branch 'master' into 20602 2015-07-23 11:22:05 -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
ZappoMan
648d0f6d43 fix a bunch of warnings 2015-07-20 15:12:27 -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
David Rowe
8336b318e1 Scale saccade per target distance when calculating eye rotation
So that saccades still show when looking into distance.
2015-07-15 18:05:09 -07:00
David Rowe
bfad3ee02a Fix eye directions so that they're correct when avatar leans backwards 2015-07-14 14:07:32 -07:00
ZappoMan
5146e51d9f improvements to avatar part clipping 2015-06-04 16:44:46 -07:00
ZappoMan
9fb53e3d72 CR feedback 2015-03-23 11:13:42 -07:00
ZappoMan
19c8e526e1 add guards to _jointStates array size 2015-03-23 08:47:06 -07:00
Sam Gateau
5ab3cbb7ec Fixed the 2 remianing issues before PR, the shadow program needed to have the binding assigned and the Head of the avatar isn't getting it's BBox evaluated 2015-02-27 17:11:16 -08:00
Atlante45
4157a3ca40 Remove lean from head rotation 2015-01-08 11:33:14 -08:00
Philip Rosedale
f4f43d6b38 added twisting of torso to follow head, fixed bug with body rotation not factored out of head rotation, removed credits from title bar 2014-12-30 15:11:32 -08:00
Andrzej Kapolka
14eb87aefd Eliminate wacky scales in favor of newfangled "meters." 2014-11-14 12:23:47 -08:00
Philip Rosedale
75e536235c Avatars look at your camera, not your avatar. Improvements to lookAt code 2014-09-24 14:38:44 -07:00
Andrzej Kapolka
4a2e68fea4 Fix for eyes on skeleton (e.g., Mixamo) models. 2014-09-17 15:36:22 -07:00
Andrew Meadows
7e4c72445e JS scripts set joint animation priorities 2014-08-20 17:14:59 -07:00
Andrew Meadows
8fa7bf4fa0 rename: ParentFrame --> ConstrainedFrame 2014-07-09 16:43:46 -07:00
Andrew Meadows
1b24a111fe JointState::_rotationInParentFrame is now private 2014-06-25 09:56:18 -07:00
Andrew Meadows
c9ba71aa01 fix for broken neck on some body models 2014-06-10 09:38:38 -07:00
Andrew Meadows
4ae58153e0 computeTransformInModelFrame -> computeTransform 2014-06-04 13:31:31 -07:00
Andrew Meadows
d32e14ca04 renames of JointState data members 2014-06-04 13:27:28 -07:00
Andrew Meadows
30d936c15b getJointPosition -> getJointPositionInWorldFrame 2014-06-04 10:52:10 -07:00
Andrew Meadows
14e782e439 remove some JointState::getHybridTransform() calls 2014-06-04 10:42:04 -07:00
Andrew Meadows
9e60b758df Made JointState transforms private.
Also changed some function names to be more descriptive.
Using "Hybrid" to describe frame with world-rotation + model-local-origin.
2014-06-02 11:34:59 -07:00
Andrew Meadows
2e99d316ac remove JointState::_translation
(use corresponding data in FBXJoint instead)
2014-05-29 12:52:05 -07:00
Andrew Meadows
9f2a4ae626 Make JointState a proper class
JointState gets a pointer to its corresponding FBXJoint
2014-05-28 16:49:39 -07:00
Andrew Meadows
676a8882fe fix for no neck motion
FaceModel needs similar override to updateJointState() as SkeletonModel
2014-05-28 10:43:21 -07:00
Andrew Meadows
ae3b792a35 move face/head code from Model into SkeletonModel 2014-05-27 15:28:41 -07:00
Andrzej Kapolka
3a4dfb92f6 Let's try using the neck parent rotation, rather than the neck, to fix
separate heads.
2014-05-02 19:37:42 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Andrew Meadows
403ad5e984 removing a warning about hidden virtual override 2014-04-04 15:18:12 -07:00
Andrew Meadows
7a602aedd1 Fix crash: don't simulate until geometry exists 2014-04-03 09:06:49 -07:00
Andrew Meadows
933cade6b0 Re-add fullUpdate hint to Model::simulate() 2014-04-02 16:34:33 -07:00
Andrew Meadows
97ba5250a5 Only simulate() Avatar Models when necessary
Also: rebuild collision shapes when Model scale changes
2014-04-02 12:01:18 -07:00
Andrew Meadows
1bbdc9d78b Adding bounding capsule shape for Model
Also:
Cleaned up the automatic geometry LOD loading
Removed staticExtents data member from FBXGeometry
Split debug rendering of bounding shapes from joint shapes
2014-04-01 09:25:25 -07:00
Andrew Meadows
7949be0319 PitchTweak and friends become DeltaPitch 2014-03-27 11:14:26 -07:00
Andrew Meadows
c354e980a8 getTweakedOrientation() to getFinalOrientation() 2014-03-27 11:03:42 -07:00
Andrzej Kapolka
62884f1f4f Don't use textures/fancy shaders when rendering shadow map. Closes #2270. 2014-03-24 13:15:03 -07:00
Andrzej Kapolka
5b30f932c1 Fix for slight graphical glitches on loading avatars. 2014-03-13 14:09:12 -07:00
Andrzej Kapolka
43feef3ebd Only update the full set of joints when we've received new data from the
mixer.  Closes #2274.
2014-03-13 12:03:02 -07:00
Andrew Meadows
aa8c2fc8cb use radians instead of degrees (almost) everywhere 2014-03-11 17:26:58 -07:00
Andrzej Kapolka
cd2bd32210 Delay loading models until we know that we need them (i.e., that we're not
beyond billboard distance).  Closes #2121.
2014-02-27 12:30:46 -08:00