mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-05-28 00:15:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

matched

Browse Source
This commit is contained in:
elijah-thomas774
2024-06-14 18:59:06 -04:00
parent a35bedafc6
commit 69a9c3b68e
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1063,7 +1063,7 @@ config.libs = [
Rel(NonMatching, "d_t_siren_time_attack", "REL/d/t/d_t_siren_time_attack.cpp"),
Rel(NonMatching, "d_t_skyEnemy", "REL/d/t/d_t_skyEnemy.cpp"),
Rel(NonMatching, "d_t_sound", "REL/d/t/d_t_sound.cpp"),
Rel(NonMatching, "d_t_sound_area", "REL/d/t/d_t_sound_area.cpp"),
Rel(Matching, "d_t_sound_area", "REL/d/t/d_t_sound_area.cpp"),
Rel(NonMatching, "d_t_sound_area_mgr", "REL/d/t/d_t_sound_area_mgr.cpp"),
Rel(NonMatching, "d_t_sparks2", "REL/d/t/d_t_sparks2.cpp"),
Rel(NonMatching, "d_t_sparks", "REL/d/t/d_t_sparks.cpp"),
include/m/m_angle.h
+2 -1
View File
@@ -16,7 +16,6 @@ class mAng3_c {
public:
mAng3_c() {}
s16 x, y, z;
mAng3_c(s16 fx, s16 fy, s16 fz) : x(fx), y(fy), z(fz) {}
void set(s16 fx, s16 fy, s16 fz) {
@@ -25,6 +24,8 @@ public:
z = fz;
}
mAng x, y, z;
static mAng3_c Zero;
};
include/m/m_mtx.h
+7 -7
View File
@@ -10,16 +10,16 @@
class mMtx_c {
public:
mMtx_c() {};
mMtx_c(){};
/* 802f1660 */ mMtx_c(f32 xx, f32 xy, f32 xz, f32 xw, f32 yx, f32 yy, f32 yz, f32 yw, f32 zx, f32 zy, f32 zz,
f32 zw);
/* 802f16b0 */ void XrotS(mAng angle); ///< Generates a rotation matrix for the X axis with the given angle.
/* 802f1770 */ void XrotM(mAng angle); ///< Rotates the matrix on the X axis by the given angle.
/* 802f17c0 */ void YrotS(mAng angle); ///< Generates a rotation matrix for the Y axis with the given angle.
/* 802f1880 */ void YrotM(s16 &angle); ///< Rotates the matrix on the Y axis by the given angle.
/* 802f18d0 */ void ZrotS(mAng angle); ///< Generates a rotation matrix for the Z axis with the given angle.
/* 802f1990 */ void ZrotM(mAng angle); ///< Rotates the matrix on the Z axis by the given angle.
/* 802f16b0 */ void XrotS(const mAng &angle); ///< Generates a rotation matrix for the X axis with the given angle.
/* 802f1770 */ void XrotM(const mAng &angle); ///< Rotates the matrix on the X axis by the given angle.
/* 802f17c0 */ void YrotS(const mAng &angle); ///< Generates a rotation matrix for the Y axis with the given angle.
/* 802f1880 */ void YrotM(const mAng &angle); ///< Rotates the matrix on the Y axis by the given angle.
/* 802f18d0 */ void ZrotS(const mAng &angle); ///< Generates a rotation matrix for the Z axis with the given angle.
/* 802f1990 */ void ZrotM(const mAng &angle); ///< Rotates the matrix on the Z axis by the given angle.
/* 802f19e0 */ void ZXYrotS(mAng xRot, mAng yRot,
mAng zRot); ///< Generates the matrix on the Y, X and Z axes by the given angles.
src/REL/d/t/d_t_sound_area.cpp
+7 -4
View File
@@ -127,10 +127,13 @@ bool dTgSndAr_c::checkAlg2(const mVec3_c &pos) {
return false;
}
mVec3_c diff = pos - position;
f32 radius = scale.x * 100.0f;
mVec3_c diff = pos - position;
return diff.x * diff.x + diff.z * diff.z < radius * radius;
f32 dist = diff.x * diff.x + diff.z * diff.z;
f32 r2 = radius * radius;
return !(dist > r2);
}
struct UnkStruct {
@@ -143,8 +146,8 @@ struct UnkStruct {
};
extern "C" void fn_80337EA0(UnkStruct *);
extern "C" void fn_80337EF0(UnkStruct *, mVec3_c&, mVec3_c&, f32);
extern "C" int fn_8032BFB0(UnkStruct *, EGG::Vector3f&, f32*, f32&, int);
extern "C" void fn_80337EF0(UnkStruct *, mVec3_c &, mVec3_c &, f32);
extern "C" int fn_8032BFB0(UnkStruct *, EGG::Vector3f &, f32 *, f32 &, int);
// ???
bool dTgSndAr_c::checkAlg3(const mVec3_c &pos) {