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

Merge pull request #14009 from sethalves/fix-worn-shape-double-scale

Browse source 
fix scaling of worn shape entities
This commit is contained in:
John Conklin II 2018-09-28 13:08:46 -07:00 committed by GitHub
commit 5d00aa0bdb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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/entities-renderer/src/RenderableShapeEntityItem.cpp
View file

@ -97,10 +97,10 @@ void ShapeEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
withWriteLock([&] { withWriteLock([&] {
auto entity = getEntity(); auto entity = getEntity();
_position = entity->getWorldPosition(); _position = entity->getWorldPosition();
_dimensions = entity->getScaledDimensions(); _dimensions = entity->getUnscaledDimensions(); // get unscaled to avoid scaling twice
_orientation = entity->getWorldOrientation(); _orientation = entity->getWorldOrientation();
updateModelTransformAndBound(); updateModelTransformAndBound();
_renderTransform = getModelTransform(); _renderTransform = getModelTransform(); // contains parent scale, if this entity scales with its parent
if (_shape == entity::Sphere) { if (_shape == entity::Sphere) {
_renderTransform.postScale(SPHERE_ENTITY_SCALE); _renderTransform.postScale(SPHERE_ENTITY_SCALE);
} }