Merge branch 'rotatingtouhouplush' into 'master'

Capostrophic · Capostrophic · commit bca843fd23b2 · 2025-12-19T04:26:35.000+03:00
Use horizontal extent ratio to detect stretched bounding boxes (#8847)

Closes #8847

See merge request OpenMW/openmw!5052
diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
@@ -63,8 +63,11 @@ namespace MWPhysics
         }
 
         const btVector3 halfExtents = Misc::Convert::toBullet(mOriginalHalfExtents);
-        if ((mMeshTranslation.x() == 0.0 && mMeshTranslation.y() == 0.0)
-            && std::fabs(mOriginalHalfExtents.x() - mOriginalHalfExtents.y()) < 2.2)
+        float extRatio = 0.f;
+        if (mOriginalHalfExtents.y() != 0.f)
+            extRatio = mOriginalHalfExtents.x() / mOriginalHalfExtents.y();
+
+        if (mMeshTranslation.x() == 0.0 && mMeshTranslation.y() == 0.0 && extRatio >= 1.f / 1.1f && extRatio <= 1.1f)
         {
             switch (collisionShapeType)
             {

Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,11 @@ namespace MWPhysics`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`const btVector3 halfExtents = Misc::Convert::toBullet(mOriginalHalfExtents);`
`66`		`- if ((mMeshTranslation.x() == 0.0 && mMeshTranslation.y() == 0.0)`
`67`		`- && std::fabs(mOriginalHalfExtents.x() - mOriginalHalfExtents.y()) < 2.2)`
	`66`	`+ float extRatio = 0.f;`
	`67`	`+ if (mOriginalHalfExtents.y() != 0.f)`
	`68`	`+ extRatio = mOriginalHalfExtents.x() / mOriginalHalfExtents.y();`
	`69`	`+`
	`70`	`+ if (mMeshTranslation.x() == 0.0 && mMeshTranslation.y() == 0.0 && extRatio >= 1.f / 1.1f && extRatio <= 1.1f)`
`68`	`71`	`{`
`69`	`72`	`switch (collisionShapeType)`
`70`	`73`	`{`