From 4d6e8a2c9e5746e230d43dba53552312203f3348 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Fri, 23 May 2014 09:42:36 -0700 Subject: [PATCH] Or rather, replaceMatchingPriorities. --- interface/src/renderer/Model.cpp | 6 +++--- interface/src/renderer/Model.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/renderer/Model.cpp b/interface/src/renderer/Model.cpp index 5d94a9a7d0..d18abce677 100644 --- a/interface/src/renderer/Model.cpp +++ b/interface/src/renderer/Model.cpp @@ -1696,7 +1696,7 @@ void AnimationHandle::setPriority(float priority) { if (_running) { _model->_runningAnimations.removeOne(_self); if (priority < _priority) { - lowerPriority(priority); + replaceMatchingPriorities(priority); } _priority = priority; insertSorted(_model->_runningAnimations, _self); @@ -1733,7 +1733,7 @@ void AnimationHandle::setRunning(bool running) { } else { _model->_runningAnimations.removeOne(_self); - lowerPriority(0.0f); + replaceMatchingPriorities(0.0f); } emit runningChanged(_running); } @@ -1819,7 +1819,7 @@ void AnimationHandle::simulate(float deltaTime) { } } -void AnimationHandle::lowerPriority(float newPriority) { +void AnimationHandle::replaceMatchingPriorities(float newPriority) { for (int i = 0; i < _jointMappings.size(); i++) { int mapping = _jointMappings.at(i); if (mapping != -1) { diff --git a/interface/src/renderer/Model.h b/interface/src/renderer/Model.h index c2aeec7183..1a6642dfc6 100644 --- a/interface/src/renderer/Model.h +++ b/interface/src/renderer/Model.h @@ -430,7 +430,7 @@ private: AnimationHandle(Model* model); void simulate(float deltaTime); - void lowerPriority(float newPriority); + void replaceMatchingPriorities(float newPriority); Model* _model; WeakAnimationHandlePointer _self;