RuiFPB/tyra-linux
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #36 from h4570/hotfix/vector3

Browse Source 
Fixed sqrt() VU0 calcs on real PS2
This commit is contained in:
Michał Mostowik
2020-12-07 00:41:34 +01:00
committed by GitHub
parent 9f4f6f4b18 f080a97dc5
commit f95794c181
2 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/include/models/math/vector3.hpp
+2 -1
View File
@@ -39,7 +39,8 @@ public:
Vector3 operator+(Vector3 v); Vector3 operator+(Vector3 v);
Vector3 operator-(const Vector3 &v); Vector3 operator-(const Vector3 &v);
Vector3 operator*(Vector3 &v); Vector3 operator*(Vector3 &v);
Vector3 operator*(float t); Vector3 operator*(const float &t);
void operator*=(const float &t);
Vector3 operator/(float t); Vector3 operator/(float t);
Vector3 operator-(void); Vector3 operator-(void);
src/engine/models/math/vector3.cpp
+26 -18
View File
@@ -45,8 +45,7 @@ void Vector3::setByLerp(const Vector3 &v1, const Vector3 &v2, const float &t_int
"vadd.xyz vf9, vf8, vf4 \n\t" // vf9 = vf8 + vf4 "vadd.xyz vf9, vf8, vf4 \n\t" // vf9 = vf8 + vf4
"sqc2 vf9, 0x0(%0) \n\t" // v0 = vf9 "sqc2 vf9, 0x0(%0) \n\t" // v0 = vf9
: :
: "r"(&this->xyz), "r"(&v1.xyz), "r"(&v2.xyz), "f"(t_interp) : "r"(&this->xyz), "r"(&v1.xyz), "r"(&v2.xyz), "f"(t_interp));
: "$8");
x *= t_scale; x *= t_scale;
y *= t_scale; y *= t_scale;
z *= t_scale; z *= t_scale;
@@ -120,7 +119,7 @@ Vector3 Vector3::operator*(Vector3 &v)
return res; return res;
} }
Vector3 Vector3::operator*(float t) Vector3 Vector3::operator*(const float &t)
{ {
Vector3 result; Vector3 result;
asm volatile( asm volatile(
@@ -130,11 +129,22 @@ Vector3 Vector3::operator*(float t)
"vmulx.xyz vf6, vf4, vf5 \n\t" "vmulx.xyz vf6, vf4, vf5 \n\t"
"sqc2 vf6, 0x0(%0) \n\t" "sqc2 vf6, 0x0(%0) \n\t"
: :
: "r"(result.xyz), "r"(this->xyz), "f"(t) : "r"(result.xyz), "r"(this->xyz), "f"(t));
: "$8");
return result; return result;
} }
void Vector3::operator*=(const float &t)
{
asm volatile(
"lqc2 vf4, 0x0(%0) \n\t"
"mfc1 $8, %1 \n\t"
"qmtc2 $8, vf5 \n\t"
"vmulx.xyz vf4, vf4, vf5 \n\t"
"sqc2 vf4, 0x0(%0) \n\t"
:
: "r"(this->xyz), "f"(t));
}
Vector3 Vector3::operator/(float t) Vector3 Vector3::operator/(float t)
{ {
Vector3 result; Vector3 result;
@@ -164,8 +174,7 @@ u8 Vector3::shouldBeBackfaceCulled(const Vector3 *t_cameraPos, const Vector3 *v0
"qmfc2 $2, vf5 \n\t" // store result on `dot` variable "qmfc2 $2, vf5 \n\t" // store result on `dot` variable
"mtc1 $2, %0 \n\t" "mtc1 $2, %0 \n\t"
: "=f"(dot) : "=f"(dot)
: "r"(t_cameraPos->xyz), "r"(v0->xyz), "r"(v1->xyz), "r"(v2->xyz) : "r"(t_cameraPos->xyz), "r"(v0->xyz), "r"(v1->xyz), "r"(v2->xyz));
: "$2");
return dot <= 0.0F; return dot <= 0.0F;
} }
@@ -190,12 +199,12 @@ float Vector3::length()
"vaddy.x vf5, vf5, vf5 \n\t" "vaddy.x vf5, vf5, vf5 \n\t"
"vaddz.x vf5, vf5, vf5 \n\t" "vaddz.x vf5, vf5, vf5 \n\t"
"vsqrt Q , vf5x \n\t" "vsqrt Q , vf5x \n\t"
"vwaitq \n\t"
"vaddq.x vf8, vf0, Q \n\t" "vaddq.x vf8, vf0, Q \n\t"
"qmfc2 $2, vf8 \n\t" "qmfc2 $2, vf8 \n\t"
"mtc1 $2, %0 \n\t" "mtc1 $2, %0 \n\t"
: "=f"(result) : "=f"(result)
: "r"(this->xyz) : "r"(this->xyz));
: "$2");
return result; return result;
// return Math::sqrt(x * x + y * y + z * z); // return Math::sqrt(x * x + y * y + z * z);
} }
@@ -208,6 +217,7 @@ void Vector3::normalize()
"vaddy.x vf5, vf5, vf5 \n\t" "vaddy.x vf5, vf5, vf5 \n\t"
"vaddz.x vf5, vf5, vf5 \n\t" "vaddz.x vf5, vf5, vf5 \n\t"
"vrsqrt Q, vf0w, vf5x \n\t" "vrsqrt Q, vf0w, vf5x \n\t"
"vwaitq \n\t"
"vsub.xyz vf6, vf0, vf0 \n\t" "vsub.xyz vf6, vf0, vf0 \n\t"
"vaddw.xyz vf6, vf6, vf4 \n\t" "vaddw.xyz vf6, vf6, vf4 \n\t"
"vwaitq \n\t" "vwaitq \n\t"
@@ -230,8 +240,7 @@ float Vector3::innerProduct(Vector3 &v)
"qmfc2 $2, vf6 \n\t" "qmfc2 $2, vf6 \n\t"
"mtc1 $2, %0 \n\t" "mtc1 $2, %0 \n\t"
: "=f"(result) : "=f"(result)
: "r"(this->xyz), "r"(v.xyz) : "r"(this->xyz), "r"(v.xyz));
: "$2");
return result; return result;
// return (x * v.x + y * v.y + z * v.z); // return (x * v.x + y * v.y + z * v.z);
} }
@@ -294,8 +303,7 @@ void Vector3::copy(Vector3 &v)
"lq $6, 0x0(%1) \n\t" "lq $6, 0x0(%1) \n\t"
"sq $6, 0x0(%0) \n\t" "sq $6, 0x0(%0) \n\t"
: :
: "r"(v.xyz), "r"(this->xyz) : "r"(v.xyz), "r"(this->xyz));
: "$6");
} }
float Vector3::distanceTo(const Vector3 &v) const float Vector3::distanceTo(const Vector3 &v) const
@@ -309,16 +317,16 @@ float Vector3::distanceTo(const Vector3 &v) const
"vaddy.x vf7, vf7, vf7 \n\t" "vaddy.x vf7, vf7, vf7 \n\t"
"vaddz.x vf7, vf7, vf7 \n\t" "vaddz.x vf7, vf7, vf7 \n\t"
"vsqrt Q , vf7x \n\t" "vsqrt Q , vf7x \n\t"
"vwaitq \n\t"
"vaddq.x vf8, vf0, Q \n\t" "vaddq.x vf8, vf0, Q \n\t"
"qmfc2 $2, vf8 \n\t" "qmfc2 $2, vf8 \n\t"
"mtc1 $2, %0 \n\t" "mtc1 $2, %0 \n\t"
: "=f"(result) : "=f"(result)
: "r"(this->xyz), "r"(v.xyz) : "r"(this->xyz), "r"(v.xyz));
: "$2");
return result; return result;
// return Math::sqrt((this->x - another.x) * (this->x - another.x) + // return Math::sqrt((this->x - v.x) * (this->x - v.x) +
// (this->y - another.y) * (this->y - another.y) + // (this->y - v.y) * (this->y - v.y) +
// (this->z - another.z) * (this->z - another.z)); // (this->z - v.z) * (this->z - v.z));
} }
const void Vector3::print() const const void Vector3::print() const