Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 15:29:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

remove Model::simulateInternal()

Browse source
This commit is contained in:
Andrew Meadows 2017-01-23 14:04:33 -08:00
parent d8a10320d1
commit 09707217ec
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/render-utils/src/Model.cpp
View file

@ -1126,7 +1126,9 @@ void Model::simulate(float deltaTime, bool fullUpdate) {
if (_snapModelToRegistrationPoint && !_snappedToRegistrationPoint) { if (_snapModelToRegistrationPoint && !_snappedToRegistrationPoint) {
snapToRegistrationPoint(); 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); _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 // virtual
void Model::updateClusterMatrices() { void Model::updateClusterMatrices() {
PerformanceTimer perfTimer("Model::updateClusterMatrices"); PerformanceTimer perfTimer("Model::updateClusterMatrices");

1
libraries/render-utils/src/Model.h
View file

@ -312,7 +312,6 @@ protected:
void scaleToFit(); void scaleToFit();
void snapToRegistrationPoint(); void snapToRegistrationPoint();
void simulateInternal(float deltaTime);
virtual void updateRig(float deltaTime, glm::mat4 parentTransform); virtual void updateRig(float deltaTime, glm::mat4 parentTransform);
/// Restores the indexed joint to its default position. /// Restores the indexed joint to its default position.