mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-05 19:27:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix some of the floating point stuff

Browse Source
This commit is contained in:
elijah-thomas774
2024-05-25 03:42:13 -04:00
parent d9e22fe76d
commit 51dae63c9a
5 changed files with 79 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1
View File
@@ -186,6 +186,7 @@ cflags_framework = [
*cflags_base,
"-inline noauto",
"-str reuse",
"-fp_contract off",
"-ipa file",
]
include/d/a/d_a_base.h
+22 -6
View File
@@ -24,6 +24,22 @@ struct SoundInfo {
SoundInfo *next;
SoundInfo *prev;
};
template <typename T, int offset>
struct TList {
T *GetOffset() {
return (T *)((u8 *)this - offset);
}
TList() {
sound_info_next = GetOffset();
sound_info_tail = GetOffset();
count = 0;
}
T *sound_info_tail;
T *sound_info_next;
s32 count;
};
// Ghidra: ActorBase
// size: 0xFC
// non-official name
@@ -31,9 +47,7 @@ class dAcBase_c : public dBase_c {
public:
/* 0x68 */ mHeapAllocator_c heap_allocator;
/* 0x84 */ ObjInfo *obj_info;
/* 0x88 */ void *sound_info_tail;
/* 0x8c */ void *sound_info_next;
/* 0x90 */ int count;
/* 0x88 */ TList<SoundInfo, 0xC> sound_list;
/* 0x94 */ SoundSource *sound_source;
/* 0x9C */ mVec3_c *obj_pos;
/* 0x9c */ mVec3_c pos_copy;
@@ -124,7 +138,7 @@ public:
// Kinda performs the code of the first param on every actor (second param is optional parent)
/* 8002d130 */ static void forEveryActor(void *func(dAcBase_c *, dAcBase_c *), dAcBase_c *parent);
// Not really static, but we currently dont have a type for the return (not just simply a s16)
/* 8002d190 */ void getXZAngleToPlayer(s16 *angle);
/* 8002d190 */ mAng getXZAngleToPlayer(s16 *angle);
// returns true if under the distThresh, False if not. the actual distance is returned in outDist
/* 8002d1d0 */ bool getDistanceToActor(dAcBase_c *actor, f32 distThresh, f32 *outDist);
// same concept as above
@@ -164,9 +178,11 @@ public:
/* 8002d940 */ void changeLoadedEntitiesWithSet();
/* 8002d960 */ void changeLoadedEntitiesNoSet();
/* 8002d980 */ dAcBase_c *createActor(ProfileName actorId, u32 params1, mVec3_c *pos, mAng3_c *rot, mVec3_c *scale, u32 params2, s32 roomId, dBase_c *ref);
/* 8002d980 */ dAcBase_c *createActor(ProfileName actorId, u32 params1, mVec3_c *pos, mAng3_c *rot, mVec3_c *scale,
u32 params2, s32 roomId, dBase_c *ref);
/* 8002da80 */ dAcBase_c *createActorStage(ProfileName actorId, u32 params1, mVec3_c *pos, mAng3_c *rot, mVec3_c *scale, u32 params2, s32 roomId, dBase_c *ref);
/* 8002da80 */ dAcBase_c *createActorStage(ProfileName actorId, u32 params1, mVec3_c *pos, mAng3_c *rot,
mVec3_c *scale, u32 params2, s32 roomId, dBase_c *ref);
/* 8002dc20 */ void FUN_8002dc20(s16 *, s16 *);
/* 8002dc50 */ void incrementKillCounter();
include/egg/prim/eggList.h
View File
include/toBeSorted/room_manager.h
+2 -1
View File
@@ -2,9 +2,9 @@
#define ROOM_MANAGER_H
#include "d/d_base.h"
#include <common.h>
#include "m/m_allocator.h"
#include "m/types_m.h"
#include <common.h>
#define MAX_ROOM_NUMBER 64
@@ -94,6 +94,7 @@ public:
/* 80575760 */ static RoomManager *m_Instance;
public:
dRoom *GetRoomByIndex(int roomid);
/* 801b42b0 */ static dBase_c *getRoom(int roomid);
/* 801b42d0 */ static void bindStageResToFile(nw4r::g3d::ResFile *);
/* 801b4320 */ static void bindSkyCmnToResFile(nw4r::g3d::ResFile *);
src/d/a/d_a_base.cpp
+54 -67
View File
@@ -1,13 +1,12 @@
#include "d/a/d_a_base.h"
#include "m/m_vec.h"
#include "d/d_player.h"
#include "f/f_list_nd.h"
#include "toBeSorted/misc_flag_managers.h"
#include "toBeSorted/special_item_drop_mgr.h"
#include "toBeSorted/scgame.h"
#include "m/m_vec.h"
#include "toBeSorted/event.h"
#include "toBeSorted/file_manager.h"
#include "toBeSorted/misc_flag_managers.h"
#include "toBeSorted/scgame.h"
#include "toBeSorted/special_item_drop_mgr.h"
// .sdata
u32 dAcBase_c::s_Create_RoomId = -1;
@@ -27,12 +26,12 @@ extern "C" ObjInfo *getObjByActorIdAndSubtype_unkNamespace(ProfileName, u8);
extern "C" ObjInfo *getObjByActorName_unkNamespace(char *name);
extern "C" char *getObjectName_8006a730(ObjInfo *);
extern "C" SoundSource *soundForActorInitRelated_803889c0(s8, fBase_c *, char *, u8);
extern "C" short targetAngleY(mVec3_c *, mVec3_c *);
extern "C" short targetAngleX(mVec3_c *, mVec3_c *);
extern "C" s16 targetAngleY(mVec3_c *, mVec3_c *);
extern "C" s16 targetAngleX(mVec3_c *, mVec3_c *);
extern "C" bool checkCollision(mVec3_c *pos);
extern "C" s8 collisionCheckGetRoom();
extern "C" dRoom *getRoomByIndex(RoomManager *mgr, s8 roomid);
extern "C" bool alsoSetAsCurrentEvent(dAcBase_c*, Event*, void *);
extern "C" bool alsoSetAsCurrentEvent(dAcBase_c *, Event *, void *);
bool dAcBase_c::createHeap() {
return true;
@@ -40,8 +39,7 @@ bool dAcBase_c::createHeap() {
// Doesnt Match Yet
dAcBase_c::dAcBase_c()
: heap_allocator(), obj_info(s_Create_ObjInfo), sound_info_tail(&heap_allocator.mHeap),
sound_info_next(&heap_allocator.mHeap), count(0), sound_source(nullptr), obj_pos(&position),
: heap_allocator(), obj_info(s_Create_ObjInfo), sound_source(nullptr), sound_list(), obj_pos(&position),
params2(s_Create_Params2), obj_id(s_Create_UnkFlags), viewclip_index(s_Create_ViewClipIdx), actor_node(nullptr),
roomid(s_Create_RoomId), actor_subtype(s_Create_Subtype) {
JStudio_actor = 0;
@@ -241,11 +239,12 @@ u32 dAcBase_c::itemDroppingAndGivingRelated(mVec3_c *spawnPos, int subtype) {
spawnPos = &position;
}
u32 param2Copy = params2;
u32 param2Copy = params2;
params2 = param2Copy | 0xFF000000;
// mAng3_c rot = {};
s16 rot = 0;
return SpecialItemDropMgr::giveSpecialDropItem(SpecialItemDropMgr::sInstance, param2Copy >> 0x18, roomid, spawnPos, subtype, &rot, -1);
return SpecialItemDropMgr::giveSpecialDropItem(SpecialItemDropMgr::sInstance, param2Copy >> 0x18, roomid, spawnPos,
subtype, &rot, -1);
}
// 8002cf90
@@ -301,21 +300,24 @@ dAcBase_c *dAcBase_c::findActor(char *objName, dAcBase_c *parent) {
// searches for actor based on groupType
// 8002d0a0
dAcBase_c *dAcBase_c::searchActor(dAcBase_c *parent) {
dAcBase_c *foundActor = nullptr;
if (parent == nullptr) {
foundActor = (dAcBase_c *)fManager_c::searchBaseByGroupType(ACTOR, nullptr);
} else if (parent->group_type == 2) {
foundActor = (dAcBase_c *)fManager_c::searchBaseByGroupType(ACTOR, parent);
parent = foundActor;
DECOMP_INLINE dAcBase_c *findActor(dAcBase_c *parent) {
if (!parent) {
return (dAcBase_c *)fManager_c::searchBaseByGroupType(2, nullptr);
}
if (parent->group_type == 2) {
return (dAcBase_c *)fManager_c::searchBaseByGroupType(2, parent);
}
return nullptr;
}
if (foundActor == nullptr) {
dAcBase_c *dAcBase_c::searchActor(dAcBase_c *parent) {
dAcBase_c *foundActor = ::findActor(parent);
if (foundActor) {
return foundActor;
} else {
return (dAcBase_c *)fManager_c::searchBaseByGroupType(STAGE, parent);
}
return foundActor;
}
// 8002d130
@@ -329,12 +331,10 @@ void dAcBase_c::forEveryActor(void *func(dAcBase_c *, dAcBase_c *), dAcBase_c *p
}
// 8002d190
void dAcBase_c::getXZAngleToPlayer(s16 *angle) {
*angle = targetAngleY(&this->position, &dPlayer::LINK->position);
mAng dAcBase_c::getXZAngleToPlayer(s16 *angle) {
return targetAngleY(&this->position, &dPlayer::LINK->position);
}
// The "distSquared > dist" bit is misbehaving.
// Trying different operators doesn't work so I'm leaving it as the most simple wrong choice.
// 8002d1d0
bool dAcBase_c::getDistanceToActor(dAcBase_c *actor, f32 distThresh, f32 *outDist) {
f32 distSquared = 3.402823e+38;
@@ -343,26 +343,23 @@ bool dAcBase_c::getDistanceToActor(dAcBase_c *actor, f32 distThresh, f32 *outDis
if (actor != nullptr) {
distSquared = PSVECSquareDistance(position, actor->position);
if (distSquared <= distThresh*distThresh) {
if (distSquared <= distThresh * distThresh) {
isWithinThreshhold = true;
}
}
if (outDist != nullptr) {
f32 dist = 0.0;
// TODO: make this not sad :(
if (distSquared <= dist) {
dist = nw4r::math::FrSqrt(distSquared) * distSquared;
}
*outDist = dist;
*outDist = distSquared <= 0.0f ? 0.0f : nw4r::math::FrSqrt(distSquared) * distSquared;
}
return isWithinThreshhold;
}
// Similar weirdness as the above function. Also, r29->31 are initted in the wrong order?
// 8002d290
bool dAcBase_c::getDistanceAndAngleToActor(dAcBase_c *actor, f32 distThresh, s16 yAngle, s16 xAngle, f32 *outDist, s16 *outDiffAngleY, s16 *outDiffAngleX) {
f32 distSquared = 3.402823e+38;
bool dAcBase_c::getDistanceAndAngleToActor(dAcBase_c *actor, f32 distThresh, s16 yAngle, s16 xAngle, f32 *outDist,
s16 *outDiffAngleY, s16 *outDiffAngleX) {
f32 distSquared = 3.402823e+38f;
s16 angleToActorY = 0;
s16 angleToActorX = 0;
bool isWithinRange = false;
@@ -372,21 +369,14 @@ bool dAcBase_c::getDistanceAndAngleToActor(dAcBase_c *actor, f32 distThresh, s16
angleToActorY = targetAngleY(&position, &actor->position);
angleToActorX = targetAngleX(&position, &actor->position);
if ((distSquared <= distThresh*distThresh)
&& (labs(rotation.y - angleToActorY) <= yAngle)
&& (labs(rotation.x - angleToActorX) <= xAngle)
) {
if ((distSquared <= distThresh * distThresh) && (labs(rotation.y - angleToActorY) <= yAngle) &&
(labs(rotation.x - angleToActorX) <= xAngle)) {
isWithinRange = true;
}
}
if (outDist != nullptr) {
f32 dist = 0.0;
if (distSquared <= dist) {
dist = nw4r::math::FrSqrt(distSquared);
dist *= distSquared;
}
*outDist = dist;
*outDist = distSquared <= 0.0f ? 0.0f : nw4r::math::FrSqrt(distSquared) * distSquared;
}
if (outDiffAngleY != nullptr) {
@@ -400,16 +390,16 @@ bool dAcBase_c::getDistanceAndAngleToActor(dAcBase_c *actor, f32 distThresh, s16
return isWithinRange;
}
// Very notmatching
// 8002d3e0
bool dAcBase_c::isWithinPlayerRadius(f32 radius) {
f32 zDist = position.z - dPlayer::LINK->position.z;
f32 xDist = position.x - dPlayer::LINK->position.x;
return (xDist*xDist + zDist*zDist) < radius*radius;
mVec3_c dist_diff = position - dPlayer::LINK->position;
return dist_diff.x * dist_diff.x + dist_diff.z * dist_diff.z < radius * radius;
}
// 8002d440
bool dAcBase_c::getDistanceAndAngleToPlayer(f32 distThresh, s16 yAngle, s16 xAngle, f32 *outDist, s16 *outDiffAngleY, s16 *outDiffAngleX) {
bool dAcBase_c::getDistanceAndAngleToPlayer(f32 distThresh, s16 yAngle, s16 xAngle, f32 *outDist, s16 *outDiffAngleY,
s16 *outDiffAngleX) {
return getDistanceAndAngleToActor(dPlayer::LINK, distThresh, yAngle, xAngle, outDist, outDiffAngleY, outDiffAngleX);
}
@@ -427,10 +417,7 @@ f32 dAcBase_c::getSquareDistToPlayer() {
// 8002d4b0
void dAcBase_c::updateRoomId(f32 yOffset) {
if (getConnectParent()->profile_name != 701 /* fProfile::PROFILE_NAME_e::ROOM */) {
mVec3_c actorPos;
actorPos.x = position.x;
actorPos.y = position.y + yOffset;
actorPos.z = position.z;
mVec3_c actorPos(position.x, position.y + yOffset, position.z);
if (checkCollision(&actorPos)) {
roomid = collisionCheckGetRoom();
@@ -442,8 +429,8 @@ void dAcBase_c::updateRoomId(f32 yOffset) {
// 8002d540
bool dAcBase_c::isRoomFlags_0x6_Set() {
dRoom *room = getRoomByIndex(RoomManager::m_Instance, roomid);
return (room->flags & 6) != 0;
dRoom *room = RoomManager::m_Instance->GetRoomByIndex(roomid);
return (room->flags & 6);
}
// Start of SoundSource stuff
@@ -496,7 +483,8 @@ void dAcBase_c::changeLoadedEntitiesNoSet() {
// spawns GroupType2 (ACTOR)
// 8002d980
dAcBase_c *dAcBase_c::createActor(ProfileName actorId, u32 actorParams1, mVec3_c *actorPosition, mAng3_c *actorRotation, mVec3_c *actorScale, u32 actorParams2, s32 actorRoomid, dBase_c *actorRef) {
dAcBase_c *dAcBase_c::createActor(ProfileName actorId, u32 actorParams1, mVec3_c *actorPosition, mAng3_c *actorRotation,
mVec3_c *actorScale, u32 actorParams2, s32 actorRoomid, dBase_c *actorRef) {
if (actorPosition == nullptr) {
actorPosition = &position;
}
@@ -518,14 +506,16 @@ dAcBase_c *dAcBase_c::createActor(ProfileName actorId, u32 actorParams1, mVec3_c
newParams2 = getParams2_ignoreLower();
}
setTempCreateParams(actorPosition, actorRotation, actorScale, actorRoomid, newParams2, (dAcBase_c *)actorRef, 0, -1, 0xFF, nullptr);
setTempCreateParams(actorPosition, actorRotation, actorScale, actorRoomid, newParams2, (dAcBase_c *)actorRef, 0, -1,
0xFF, nullptr);
dBase_c *room = RoomManager::getRoom(roomid);
return (dAcBase_c *)dBase_c::createBase(actorId, room, actorParams1, ACTOR);
}
// spawns GroupType2 (STAGE)
// 8002da80
dAcBase_c *dAcBase_c::createActorStage(ProfileName actorId, u32 actorParams1, mVec3_c *actorPosition, mAng3_c *actorRotation, mVec3_c *actorScale, u32 actorParams2, s32 actorRoomid, dBase_c *actorRef) {
dAcBase_c *dAcBase_c::createActorStage(ProfileName actorId, u32 actorParams1, mVec3_c *actorPosition,
mAng3_c *actorRotation, mVec3_c *actorScale, u32 actorParams2, s32 actorRoomid, dBase_c *actorRef) {
if (actorPosition == nullptr) {
actorPosition = &position;
}
@@ -547,7 +537,8 @@ dAcBase_c *dAcBase_c::createActorStage(ProfileName actorId, u32 actorParams1, mV
newParams2 = getParams2_ignoreLower();
}
setTempCreateParams(actorPosition, actorRotation, actorScale, actorRoomid, newParams2, (dAcBase_c *)actorRef, 0, -1, 0xFF, nullptr);
setTempCreateParams(actorPosition, actorRotation, actorScale, actorRoomid, newParams2, (dAcBase_c *)actorRef, 0, -1,
0xFF, nullptr);
dBase_c *room = RoomManager::getRoom(roomid);
return (dAcBase_c *)dBase_c::createBase(actorId, room, actorParams1, STAGE);
}
@@ -569,9 +560,7 @@ void dAcBase_c::doInteraction(s32 param) {
// Only called by dPlayer::dig and that function fails to decomp in ghidra?
// 8002dc20
void dAcBase_c::FUN_8002dc20(s16 *, s16 *) {
}
void dAcBase_c::FUN_8002dc20(s16 *, s16 *) {}
// This whole function gets compiled to just a `blr`
// Not sure how to make this work as expected
@@ -620,9 +609,7 @@ void dAcBase_c::FUN_8002dd90() {
// Some collision related thing
// 8002ddd0
void dAcBase_c::FUN_8002ddd0() {
}
void dAcBase_c::FUN_8002ddd0() {}
// 8002de30
void dAcBase_c::FUN_8002de30() {