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

call simulate from setScaleInternal rather than just initJointTransforms so the scale change is visible

Browse source
This commit is contained in:
Seth Alves 2016-02-19 10:05:22 -08:00
parent 01d3977bf1
commit ee5a82f9b8
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -92,7 +92,7 @@ void Model::setScale(const glm::vec3& scale) {
_scaledToFit = false; _scaledToFit = false;
} }
const float METERS_PER_MILLIMETER = 0.01f; const float METERS_PER_MILLIMETER = 0.01f;
void Model::setScaleInternal(const glm::vec3& scale) { void Model::setScaleInternal(const glm::vec3& scale) {
if (glm::distance(_scale, scale) > METERS_PER_MILLIMETER) { if (glm::distance(_scale, scale) > METERS_PER_MILLIMETER) {
@ -100,7 +100,7 @@ void Model::setScaleInternal(const glm::vec3& scale) {
if (_scale.x == 0.0f || _scale.y == 0.0f || _scale.z == 0.0f) { if (_scale.x == 0.0f || _scale.y == 0.0f || _scale.z == 0.0f) {
assert(false); assert(false);
} }
initJointTransforms(); simulate(0.0f, true);
} }
} }