Merge branch 'reanimaterescaling' into 'master'

Restore animated collision shape rescaling (take 3) See merge request OpenMW/openmw!3635
OpenMW · Dec 10, 2023 · 47b87f1 · 47b87f1
2 parents 623a610 + 754c5a8
commit 47b87f1
Show file tree

Hide file tree

Showing 5 changed files with 132 additions and 46 deletions.
diff --git a/apps/openmw/mwphysics/object.cpp b/apps/openmw/mwphysics/object.cpp
@@ -137,6 +137,7 @@ namespace MWPhysics
 
             osg::NodePath& nodePath = nodePathFound->second;
             osg::Matrixf matrix = osg::computeLocalToWorld(nodePath);
+            btVector3 scale = Misc::Convert::toBullet(matrix.getScale());
             matrix.orthoNormalize(matrix);
 
             btTransform transform;
@@ -145,8 +146,15 @@ namespace MWPhysics
                 for (int j = 0; j < 3; ++j)
                     transform.getBasis()[i][j] = matrix(j, i); // NB column/row major difference
 
-            // Note: we can not apply scaling here for now since we treat scaled shapes
-            // as new shapes (btScaledBvhTriangleMeshShape) with 1.0 scale for now
+            btCollisionShape* childShape = compound->getChildShape(shapeIndex);
+            btVector3 newScale = compound->getLocalScaling() * scale;
+
+            if (childShape->getLocalScaling() != newScale)
+            {
+                childShape->setLocalScaling(newScale);
+                result = true;
+            }
+
             if (!(transform == compound->getChildTransform(shapeIndex)))
             {
                 compound->updateChildTransform(shapeIndex, transform);