From 09707217ec40c64470583c2e58adc397629d583a Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Mon, 23 Jan 2017 14:04:33 -0800 Subject: [PATCH] remove Model::simulateInternal() --- libraries/render-utils/src/Model.cpp | 10 +++------- libraries/render-utils/src/Model.h | 1 - 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index d3fddc96d9..1e83a874dc 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -1126,7 +1126,9 @@ void Model::simulate(float deltaTime, bool fullUpdate) { if (_snapModelToRegistrationPoint && !_snappedToRegistrationPoint) { snapToRegistrationPoint(); } - simulateInternal(deltaTime); + // update the world space transforms for all joints + glm::mat4 parentTransform = glm::scale(_scale) * glm::translate(_offset); + updateRig(deltaTime, parentTransform); } } @@ -1136,12 +1138,6 @@ void Model::updateRig(float deltaTime, glm::mat4 parentTransform) { _rig->updateAnimations(deltaTime, parentTransform); } -void Model::simulateInternal(float deltaTime) { - // update the world space transforms for all joints - glm::mat4 parentTransform = glm::scale(_scale) * glm::translate(_offset); - updateRig(deltaTime, parentTransform); -} - // virtual void Model::updateClusterMatrices() { PerformanceTimer perfTimer("Model::updateClusterMatrices"); diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h index 246d67180e..3f673b0250 100644 --- a/libraries/render-utils/src/Model.h +++ b/libraries/render-utils/src/Model.h @@ -312,7 +312,6 @@ protected: void scaleToFit(); void snapToRegistrationPoint(); - void simulateInternal(float deltaTime); virtual void updateRig(float deltaTime, glm::mat4 parentTransform); /// Restores the indexed joint to its default position.