Showing the changes to libraries/render-utils/src/Model.cpp (1 of 1 file). Show all
Unified · Split
| @@ -216,10 +216,12 @@ void Model::updateRenderItems() { · 215 unmodified lines | |||
| 216 | render::ScenePointer scene = AbstractViewStateInterface::instance()->getMain3DScene(); | 216 | render::ScenePointer scene = AbstractViewStateInterface::instance()->getMain3DScene(); |
| 217 | 217 | ||
| 218 | Transform modelTransform; | 218 | Transform modelTransform; |
| 219 | modelTransform.setScale(scale); | ||
| 220 | modelTransform.setTranslation(self->_translation); | 219 | modelTransform.setTranslation(self->_translation); |
| 221 | modelTransform.setRotation(self->_rotation); | 220 | modelTransform.setRotation(self->_rotation); |
| 222 | 221 | ||
| 222 | Transform scaledModelTransform(modelTransform); | ||
| 223 | scaledModelTransform.setScale(scale); | ||
| 224 | |||
| 223 | Transform modelMeshOffset; | 225 | Transform modelMeshOffset; |
| 224 | if (self->isLoaded()) { | 226 | if (self->isLoaded()) { |
| 225 | // includes model offset and unitScale. | 227 | // includes model offset and unitScale. |
| @@ -254,9 +256,9 @@ void Model::updateRenderItems() { · 28 unmodified lines | |||
| 254 | Transform collisionMeshOffset; | 256 | Transform collisionMeshOffset; |
| 255 | collisionMeshOffset.setIdentity(); | 257 | collisionMeshOffset.setIdentity(); |
| 256 | foreach (auto itemID, self->_collisionRenderItems.keys()) { | 258 | foreach (auto itemID, self->_collisionRenderItems.keys()) { |
| 257 | pendingChanges.updateItem<MeshPartPayload>(itemID, [modelTransform, collisionMeshOffset](MeshPartPayload& data) { | 259 | pendingChanges.updateItem<MeshPartPayload>(itemID, [scaledModelTransform, collisionMeshOffset](MeshPartPayload& data) { |
| 258 | // update the model transform for this render item. | 260 | // update the model transform for this render item. |
| 259 | data.updateTransform(modelTransform, collisionMeshOffset); | 261 | data.updateTransform(scaledModelTransform, collisionMeshOffset); |
| 260 | }); | 262 | }); |
| 261 | } | 263 | } |
| 262 | 264 | ||