Use paired singles for object collision transformation

vabold · Dec 29, 2024 · 0094662 · 0094662
1 parent f64900d
commit 0094662
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/source/game/field/ObjectCollisionConvexHull.cc b/source/game/field/ObjectCollisionConvexHull.cc
@@ -29,15 +29,15 @@ void ObjectCollisionConvexHull::transform(const EGG::Matrix34f &mat, const EGG::
 
     if (scale.x == 0.0f) {
         for (size_t i = 0; i < m_points.size(); ++i) {
-            m_worldPoints[i] = mat.multVector(m_points[i]);
+            m_worldPoints[i] = mat.ps_multVector(m_points[i]);
         }
     } else {
         EGG::Matrix34f temp;
         temp.makeS(scale);
         temp = mat.multiplyTo(temp);
 
         for (size_t i = 0; i < m_points.size(); ++i) {
-            m_worldPoints[i] = temp.multVector(m_points[i]);
+            m_worldPoints[i] = temp.ps_multVector(m_points[i]);
         }
     }
 }

diff --git a/source/game/field/ObjectCollisionCylinder.cc b/source/game/field/ObjectCollisionCylinder.cc
@@ -22,7 +22,7 @@ ObjectCollisionCylinder::~ObjectCollisionCylinder() = default;
 void ObjectCollisionCylinder::transform(const EGG::Matrix34f &mat, const EGG::Vector3f &scale,
         const EGG::Vector3f &speed) {
     m_translation = speed;
-    m_worldPos = scale * m_pos;
+    m_worldPos = m_pos * scale.x;
     m_worldHeight = m_height * scale.y;
     m_worldRadius = m_radius * scale.x;