Hooked up fly animation to json and Rig

Anthony J. Thibault committed 10 years ago

Commit 7af20e91 parent 9ec2cf16 files · +98 −40Browse files

Showing the changes to interface/src/avatar/SkeletonModel.cpp (1 of 6 files). Show all

Unified · Split

interface/src/avatar/SkeletonModel.cpp+1−1

@@ -133,7 +133,7 @@ void SkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) { · 132 unmodified lines
133		133
134	_rig->updateFromHandParameters(handParams, deltaTime);	134	_rig->updateFromHandParameters(handParams, deltaTime);
135		135
136	_rig->computeMotionAnimationState(deltaTime, _owningAvatar->getPosition(), _owningAvatar->getVelocity(), _owningAvatar->getOrientation());	136	_rig->computeMotionAnimationState(deltaTime, _owningAvatar->getPosition(), _owningAvatar->getVelocity(), _owningAvatar->getOrientation(), myAvatar->isHovering());
137		137
138	// evaluate AnimGraph animation and update jointStates.	138	// evaluate AnimGraph animation and update jointStates.
139	Model::updateRig(deltaTime, parentTransform);	139	Model::updateRig(deltaTime, parentTransform);