diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 3067576d..f974476a 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -26384,11 +26384,11 @@ set__Q23EGG5QuatfFffff = .text:0x8049B390; // type:function size:0x14 setAxisRotation__Q23EGG5QuatfFRCQ23EGG8Vector3ff = .text:0x8049B3B0; // type:function size:0x98 norm__Q23EGG5QuatfFv = .text:0x8049B450; // type:function size:0x30 normalise__Q23EGG5QuatfFv = .text:0x8049B480; // type:function size:0x74 -conjugate__Q23EGG5QuatfFv = .text:0x8049B500; // type:function size:0x48 +conjugate__Q23EGG5QuatfCFv = .text:0x8049B500; // type:function size:0x48 rotateVector__Q23EGG5QuatfFRCQ23EGG8Vector3f = .text:0x8049B550; // type:function size:0x2A4 slerpTo__Q23EGG5QuatfCFRCQ23EGG5QuatffRQ23EGG5Quatf = .text:0x8049B800; // type:function size:0x1C4 limitSlerpTo__Q23EGG5QuatfCFRCQ23EGG5QuatfffRQ23EGG5Quatf = .text:0x8049B9D0; // type:function size:0x1DC -makeVectorRotation__Q23EGG5QuatfFRQ23EGG8Vector3fRQ23EGG8Vector3f = .text:0x8049BBB0; // type:function size:0x104 +makeVectorRotation__Q23EGG5QuatfFRCQ23EGG8Vector3fRCQ23EGG8Vector3f = .text:0x8049BBB0; // type:function size:0x104 normalise__Q23EGG8Vector3fFv = .text:0x8049BCC0; // type:function size:0x84 setLength__Q23EGG8Vector3fFRCQ23EGG8Vector3ff = .text:0x8049BD50; // type:function size:0xB8 setLength__Q23EGG8Vector3fFf = .text:0x8049BE10; // type:function size:0xA0 diff --git a/include/egg/math/eggQuat.h b/include/egg/math/eggQuat.h index df67e10d..302de985 100644 --- a/include/egg/math/eggQuat.h +++ b/include/egg/math/eggQuat.h @@ -39,14 +39,14 @@ struct Quatf { /* 8049b3b0 */ void setAxisRotation(const Vector3f &, f32); /* 8049b450 */ f32 norm(); /* 8049b480 */ void normalise(); - /* 8049b500 */ Quatf conjugate(); + /* 8049b500 */ Quatf conjugate() const; /* */ Quatf inverse(); /* 8049b550 */ Vector3f rotateVector(const Vector3f &); /* */ Vector3f rotateVectorInv(const Vector3f &); /* 8049b800 */ void slerpTo(const Quatf &, f32, Quatf &out) const; /* 8049b800 */ void limitSlerpTo(const Quatf &, f32, f32, Quatf &out) const; /* */ void makeVectorRotationLimit(Vector3f &, Vector3f &, f32); - /* 8049bbb0 */ void makeVectorRotation(Vector3f &, Vector3f &); + /* 8049bbb0 */ void makeVectorRotation(const Vector3f &, const Vector3f &); void multScalar(f32 s) { w *= s; diff --git a/src/egg/math/eggQuat.cpp b/src/egg/math/eggQuat.cpp index 0ccb90b1..93f06377 100644 --- a/src/egg/math/eggQuat.cpp +++ b/src/egg/math/eggQuat.cpp @@ -96,7 +96,7 @@ void Quatf::normalise() { } /* 8049b500 */ -Quatf Quatf::conjugate() { +Quatf Quatf::conjugate() const { Quatf q; q.w = w; q.v = -1.0f * v; @@ -211,7 +211,7 @@ void Quatf::limitSlerpTo(const Quatf &q2, f32 t, f32 t2, Quatf &out) const { } /* 8049bbb0 */ -void Quatf::makeVectorRotation(Vector3f &from, Vector3f &to) { +void Quatf::makeVectorRotation(const Vector3f &from, const Vector3f &to) { Vector3f cross = from.cross(to); f32 t0 = (from.dot(to) + 1) * 2.0f;