Disable head ik while reacting

Also, split getReactions() API into two calls * getTriggerReactions() - lists all reactions that can be triggered with MyAvatar.triggerReaction(). * getBeginReactions() - lists all reactions that can be used with MyAvatar.beginReaction() and MyAvatar.endReaction().

Anthony J. Thibault committed 7 years ago

Commit 2f949a41 parent 7486e907 files · +96 −58Browse files

Showing the changes to libraries/animation/src/AnimStateMachine.cpp (1 of 7 files). Show all

Unified · Split

libraries/animation/src/AnimStateMachine.cpp+9−0

@@ -95,6 +95,15 @@ const AnimPoseVec& AnimStateMachine::evaluate(const AnimVariantMap& animVars, co · 94 unmodified lines
95	95	return _poses;
96	96	}
97	97
	98	+const QString& AnimStateMachine::getCurrentStateID() const {
	99	+ if (_currentState) {
	100	+ return _currentState->getID();
	101	+ } else {
	102	+ static QString emptyString;
	103	+ return emptyString;
	104	+ }
	105	+}
	106	+
98	107	void AnimStateMachine::setCurrentState(State::Pointer state) {
99	108	_previousState = _currentState ? _currentState : state;
100	109	_currentState = state;