Added inAir animations

Anthony J. Thibault committed 10 years ago

Commit e9fd4391 parent ee963415 files · +125 −14Browse files

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

Unified · Split

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

@@ -133,7 +133,14 @@ void SkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) { · 132 unmodified lines
133	133
134	134	_rig->updateFromHandParameters(handParams, deltaTime);
135	135
136		− _rig->computeMotionAnimationState(deltaTime, _owningAvatar->getPosition(), _owningAvatar->getVelocity(), _owningAvatar->getOrientation(), myAvatar->isHovering());
	136	+ Rig::CharacterControllerState ccState = Rig::CharacterControllerState::Ground;
	137	+ if (myAvatar->getCharacterController()->isHovering()) {
	138	+ ccState = Rig::CharacterControllerState::Hover;
	139	+ } else if (myAvatar->getCharacterController()->isJumping()) {
	140	+ ccState = Rig::CharacterControllerState::Jump;
	141	+ }
	142	+
	143	+ _rig->computeMotionAnimationState(deltaTime, _owningAvatar->getPosition(), _owningAvatar->getVelocity(), _owningAvatar->getOrientation(), ccState);
137	144
138	145	// evaluate AnimGraph animation and update jointStates.
139	146	Model::updateRig(deltaTime, parentTransform);