Anthony J. Thibault
bef136d811
AnimGraph: prefer QString over std::string
2015-09-17 11:21:14 -07:00
Anthony J. Thibault
5aeebba90e
Renamed AnimController to AnimManipulator, Removed offsets on IK targets
2015-09-16 15:49:47 -07:00
Anthony J. Thibault
90f46ba2c8
Added hand state machines to AnimGraph.
...
* Application: Forward trigger values to the MyAvatar's PalmData
* SkeletonModel: Pass PalmData to Rig via updateRigFromHandData() this is more explicit then
the Rig::inverseKinematics methods.
* AnimNodeLoader & AnimOverlay: add support for LeftHand and RightHand bone sets
* Rig::updateRigFromHandData() read the triggers and set stateMachine trigger vars
* avatar.json - udpated with new hand state machine with temporary animations
2015-09-14 18:54:12 -07:00
Anthony J. Thibault
9a9838fd0d
Clean up of AnimNodeLoader after merge from master.
2015-09-10 11:47:41 -07:00
Anthony J. Thibault
663e37da66
Merge branch 'master' into tony/ik-and-controllers
2015-09-10 11:37:47 -07:00
Anthony Thibault
e8ede3ad00
Merge pull request #5731 from ChristophHaag/master
...
build fixes
2015-09-10 11:36:45 -07:00
Anthony J. Thibault
756eb54a0a
AnimNodeLoader support for InverseKinematics node.
2015-09-09 15:28:21 -07:00
Anthony J. Thibault
146836452f
Merge remote-tracking branch 'andrew/europium' into tony/ik-and-controllers
2015-09-09 09:40:55 -07:00
Anthony J. Thibault
75ecf0020d
WIP commit, added AnimController node.
2015-09-08 20:34:21 -07:00
Andrew Meadows
c3e16d33c1
add InverseKinematics type
2015-09-08 18:18:50 -07:00
Stephen Birarda
c670c9a0d5
fix for AnimNodeLoader use of Resource loaded
2015-09-08 15:31:37 -07:00
Christoph Haag
ddcee763ca
extend macros to take return value if necessary
2015-09-08 19:10:15 +02:00
Christoph Haag
fa221fa7e3
In gcc5 nullptr can't be directly used as bool
...
See https://gcc.gnu.org/gcc-5/porting_to.html
"Converting std::nullptr_t to bool"
2015-09-08 10:07:06 +02:00
Anthony J. Thibault
91fbbf7d4e
Updated copyright boiler plate.
2015-09-02 13:35:26 -07:00
Anthony J. Thibault
df26f18222
Fix for compilation errors on linux
2015-09-02 13:29:29 -07:00
Anthony J. Thibault
fea030b9a0
Compile and warning fixes for MacOSX.
2015-09-02 12:18:17 -07:00
Anthony J. Thibault
1ae22268ac
Added comment to AnimStateMachine header.
2015-09-02 11:04:52 -07:00
Anthony J. Thibault
9d983e0614
Bug fix to AnimNode::setSkeletonModel and AnimNodeLoader.
...
Also updated avatar.json to test nested graphs under a SM.
2015-08-28 17:16:32 -07:00
Anthony J. Thibault
3286a32afc
Initial version of AnimStateMachine.
...
No interpolation support, but basic avatar.json is working
with two states and two transitions between them.
2015-08-27 20:41:53 -07:00
Anthony J. Thibault
0c02a338f2
Added support for setting Variants in the json file.
...
For example: the avatar.json file was updated to use the "sine" Variant
to drive the Overlay alpha parameter.
2015-08-25 20:57:01 -07:00
Anthony J. Thibault
7a2ca047cb
Added network resource download support to AnimNodeLoader.
2015-08-24 19:00:12 -07:00
Anthony J. Thibault
c3fc37df18
Added true boneSets to AnimOverlay.
2015-08-05 18:07:56 -07:00
Anthony J. Thibault
1f8c8adbd6
Added AnimOverlay node, moved blend sub-routine into AnimUtil.
2015-08-05 17:05:53 -07:00
Anthony J. Thibault
5d83976e2a
Added AnimBlendLinear + tests.
...
MyAvatar now does a sine wave blend between a walk
and a walk animation.
2015-08-04 18:14:50 -07:00
Anthony J. Thibault
f5dee717a1
Added fbx loading via animation cache.
...
* added AnimPose::copyFromNetworkAnim() which
should, re-map bone ids to match the current
skeleton, and fill in missing bones with bind
pose frames.
* added ability to set a skeleton on a node.
I might need to add a recursive version of this.
* it compiles!
* tests run!
2015-08-04 18:14:46 -07:00
Anthony J. Thibault
da809efcd6
WIP commit, DOES NOT BUILD.
...
* Added AnimSkeleton class
* Attempt to copy animation frames when _networkAnimation has
finished loading. Fill in the holes with bind pose.
2015-08-04 18:14:46 -07:00
Anthony J. Thibault
343b2ccf9d
Added AnimNodeLoader which loads AnimClip nodes from json
...
* added tests and sample json file
2015-08-04 18:14:45 -07:00
