Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-06-04 02:20:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set activation when switching random states

Browse source
This commit is contained in:
luiscuenca 2019-08-27 10:57:22 -07:00
parent 7f1f6dba31
commit acbeb326a7
No known key found for this signature in database
GPG key ID: 2387ECD129A6961D
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/animation/src/AnimContext.h
View file

@ -45,7 +45,6 @@ public:
bool getEnableDebugDrawIKChains() const { return _enableDebugDrawIKChains; } bool getEnableDebugDrawIKChains() const { return _enableDebugDrawIKChains; }
const glm::mat4& getGeometryToRigMatrix() const { return _geometryToRigMatrix; } const glm::mat4& getGeometryToRigMatrix() const { return _geometryToRigMatrix; }
const glm::mat4& getRigToWorldMatrix() const { return _rigToWorldMatrix; } const glm::mat4& getRigToWorldMatrix() const { return _rigToWorldMatrix; }
int getEvaluationCount() const { return _evaluationCount; }
float getDebugAlpha(const QString& key) const { float getDebugAlpha(const QString& key) const {
auto it = _debugAlphaMap.find(key); auto it = _debugAlphaMap.find(key);
@ -87,7 +86,6 @@ protected:
bool _enableDebugDrawIKChains { false }; bool _enableDebugDrawIKChains { false };
glm::mat4 _geometryToRigMatrix; glm::mat4 _geometryToRigMatrix;
glm::mat4 _rigToWorldMatrix; glm::mat4 _rigToWorldMatrix;
int _evaluationCount{ 0 };
// used for debugging internal state of animation system. // used for debugging internal state of animation system.
mutable DebugAlphaMap _debugAlphaMap; mutable DebugAlphaMap _debugAlphaMap;

8
libraries/animation/src/AnimRandomSwitch.cpp
View file

@ -168,8 +168,16 @@ void AnimRandomSwitch::addState(RandomSwitchState::Pointer randomState) {
} }
void AnimRandomSwitch::switchRandomState(const AnimVariantMap& animVars, const AnimContext& context, RandomSwitchState::Pointer desiredState, bool shouldInterp) { void AnimRandomSwitch::switchRandomState(const AnimVariantMap& animVars, const AnimContext& context, RandomSwitchState::Pointer desiredState, bool shouldInterp) {
auto prevStateNode = _children[_currentState->getChildIndex()];
auto nextStateNode = _children[desiredState->getChildIndex()]; auto nextStateNode = _children[desiredState->getChildIndex()];
// activate/deactivate states
prevStateNode->setActive(false);
nextStateNode->setActive(true);
_lastPlayedState = nextStateNode->getID(); _lastPlayedState = nextStateNode->getID();
if (shouldInterp) { if (shouldInterp) {
bool interpActive = _duringInterp; bool interpActive = _duringInterp;