From 6c71054cb48d687f1b1cca5cfffb0c5c5887a1b6 Mon Sep 17 00:00:00 2001 From: Falco Girgis Date: Fri, 28 Mar 2025 17:50:59 -0500 Subject: [PATCH] Addressed review feedback. --- src/liberty/collision/Collision.cpp | 4 ++-- src/liberty/math/VuVector.h | 4 ++-- src/miami/collision/Collision.cpp | 4 ++-- src/miami/math/VuVector.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/liberty/collision/Collision.cpp b/src/liberty/collision/Collision.cpp index a901a9a5..3d85f0c4 100644 --- a/src/liberty/collision/Collision.cpp +++ b/src/liberty/collision/Collision.cpp @@ -2169,7 +2169,7 @@ CCollision::ProcessColModels(const CMatrix &matrixA, CColModel &modelA, assert(modelA.numLines <= MAXNUMLINES); // From model A space to model B space - matAB = Invert(matrixB, matAB); + Invert(matrixB, matAB); #ifndef DC_SH4 matAB *= matrixA; #else @@ -2242,7 +2242,7 @@ CCollision::ProcessColModels(const CMatrix &matrixA, CColModel &modelA, int numBoxesB = 0; int numTrianglesB = 0; // B to A space - matBA = Invert(matrixA, matBA); + Invert(matrixA, matBA); #ifndef DC_SH4 matBA *= matrixB; #else diff --git a/src/liberty/math/VuVector.h b/src/liberty/math/VuVector.h index b070e018..4f0239b7 100644 --- a/src/liberty/math/VuVector.h +++ b/src/liberty/math/VuVector.h @@ -45,7 +45,7 @@ __always_inline void TransformPoint(CVuVector &out, const CMatrix &mat, const CV ": : "r" (&out) , "r" (&mat) ,"r" (&in): "memory"); #elif defined(DC_SH4) mat_load(reinterpret_cast(const_cast(&mat))); - mat_trans_nodiv_nomod(in.x, in.y, in.z, out.x, out.y, out.z, out.y); + mat_trans_single3_nodiv_nomod(in.x, in.y, in.z, out.x, out.y, out.z); #else out = mat * in; #endif @@ -72,7 +72,7 @@ __always_inline void TransformPoint(CVuVector &out, const CMatrix &mat, const Rw ": : "r" (&out) , "r" (&mat) ,"r" (&in): "memory"); #elif defined(DC_SH4) mat_load(reinterpret_cast(const_cast(&mat))); - mat_trans_nodiv_nomod(in.x, in.y, in.z, out.x, out.y, out.z, out.y); + mat_trans_single3_nodiv_nomod(in.x, in.y, in.z, out.x, out.y, out.z); #else out = mat * in; #endif diff --git a/src/miami/collision/Collision.cpp b/src/miami/collision/Collision.cpp index 6b56360e..8db6c42a 100644 --- a/src/miami/collision/Collision.cpp +++ b/src/miami/collision/Collision.cpp @@ -2023,7 +2023,7 @@ CCollision::ProcessColModels(const CMatrix &matrixA, CColModel &modelA, assert(modelA.numLines <= MAXNUMLINES); // From model A space to model B space - matAB = Invert(matrixB, matAB); + Invert(matrixB, matAB); #ifndef DC_SH4 matAB *= matrixA; #else @@ -2095,7 +2095,7 @@ CCollision::ProcessColModels(const CMatrix &matrixA, CColModel &modelA, int numBoxesB = 0; int numTrianglesB = 0; // B to A space - matBA = Invert(matrixA, matBA); + Invert(matrixA, matBA); #ifndef DC_SH4 matBA *= matrixB; #else diff --git a/src/miami/math/VuVector.h b/src/miami/math/VuVector.h index 2e9fbc28..1b184f97 100644 --- a/src/miami/math/VuVector.h +++ b/src/miami/math/VuVector.h @@ -51,7 +51,7 @@ __always_inline void TransformPoint(CVuVector &out, const CMatrix &mat, const CV ": : "r" (&out) , "r" (&mat) ,"r" (&in): "memory"); #elif defined(DC_SH4) mat_load(reinterpret_cast(const_cast(&mat))); - mat_trans_nodiv_nomod(in.x, in.y, in.z, out.x, out.y, out.z, out.y); + mat_trans_single3_nodiv_nomod(in.x, in.y, in.z, out.x, out.y, out.z); #else out = mat * in; #endif @@ -78,7 +78,7 @@ __always_inline void TransformPoint(CVuVector &out, const CMatrix &mat, const Rw ": : "r" (&out) , "r" (&mat) ,"r" (&in): "memory"); #elif defined(DC_SH4) mat_load(reinterpret_cast(const_cast(&mat))); - mat_trans_nodiv_nomod(in.x, in.y, in.z, out.x, out.y, out.z, out.y); + mat_trans_single3_nodiv_nomod(in.x, in.y, in.z, out.x, out.y, out.z); #else out = mat * in; #endif