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

fix regressions

Browse Source
This commit is contained in:
elijah-thomas774
2025-06-09 23:07:51 -04:00
parent d586e445e7
commit a016a38405
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/m/m_angle.h
-5
View File
@@ -82,11 +82,6 @@ struct mAng {
return mVal * sAngToDeg;
}
static s16 angle(const mVec3_c &a, const mVec3_c &b) {
f32 rads = a.angle(b);
return fromRad(rads);
}
f32 radian() const {
return ((2.f * M_PI) / 65536.0f) * mVal;
}
src/REL/d/a/obj/d_a_obj_tubo.cpp
+2 -3
View File
@@ -37,7 +37,6 @@
#include "toBeSorted/event_manager.h"
#include "toBeSorted/special_item_drop_mgr.h"
void float_ordering() {
f32 f[] = {15.f, .4f, .4f, 5.f};
}
@@ -759,7 +758,7 @@ void dAcOtubo_c::adjustSpeed() {
cM3dGPla pla;
dBgS::GetInstance()->GetTriPla(mObjAcch.mGnd, &pla);
f32 step = 0.4f;
mAng gndAngle = mAng::angle(mVec3_c::Ey, pla.GetN());
mAng gndAngle = mAng::fromRad(mVec3_c::Ey.angle(pla.GetN()));
step *= gndAngle.cos();
if (gndAngle < mAng::deg2short(5) ||
@@ -779,7 +778,7 @@ void dAcOtubo_c::adjustSpeed() {
bool dAcOtubo_c::checkSlope() {
cM3dGPla pla;
dBgS::GetInstance()->GetTriPla(mObjAcch.mGnd, &pla);
mAng gndAngle = mAng::angle(mVec3_c::Ey, pla.GetN());
mAng gndAngle = mAng::fromRad(mVec3_c::Ey.angle(pla.GetN()));
return sLib::absDiff(gndAngle, 0) > mAng::deg2short(5);
}
src/REL/d/a/obj/d_a_obj_tumble_weed.cpp
+3 -3
View File
@@ -246,7 +246,7 @@ bool dAcOTumbleWeed_c::checkSlope() {
cM3dGPla pla;
dBgS::GetInstance()->GetTriPla(mObjAcch.mGnd, &pla);
mAng ang = mAng::angle(mVec3_c::Ey, pla.GetN());
mAng ang = mAng::fromRad(mVec3_c::Ey.angle(pla.GetN()));
return sLib::absDiff(ang, 0) > mAng::deg2short(1);
}
@@ -304,13 +304,13 @@ void dAcOTumbleWeed_c::adjustAngle() {
void dAcOTumbleWeed_c::adjustSpeed() {
cM3dGPla pla;
// BUG
// @bug
// the ground angle calculation happens before retrieving the grounds normal
// this is probably hard to notice due to the little effect it has.
// Effect:
// Tumbleweed slows to the target much quicker than intended
// Tumbleweed speeds to the target + 5.0f much quicker than intended
mAng gndAngle = mAng::angle(mVec3_c::Ey, pla.GetN());
mAng gndAngle = mAng::fromRad(mVec3_c::Ey.angle(pla.GetN()));
dBgS::GetInstance()->GetTriPla(mObjAcch.mGnd, &pla);