PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Almost forgot these 

Former-commit-id: 4ba459c876
This commit is contained in:
Phillip Stephens 2022-10-05 16:26:05 -07:00
parent fd92b6bd05
commit 8c4c08865b
13 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
asm/Kyoto/Math/CloseEnough.s
View File

@ -7,8 +7,8 @@ lbl_ctor:
.section .sbss, "wa"
.balign 8
.global lbl_805A9440
lbl_805A9440:
.global svector2_Identity
svector2_Identity:
.skip 0x8
.section .text, "ax"
@ -69,7 +69,7 @@ __sinit_CloseEnough_cpp:
/* 8030FFCC 0030CF2C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8030FFD0 0030CF30 7C 08 02 A6 */ mflr r0
/* 8030FFD4 0030CF34 C0 22 C8 48 */ lfs f1, lbl_805AE568@sda21(r2)
/* 8030FFD8 0030CF38 38 6D A8 80 */ addi r3, r13, lbl_805A9440@sda21
/* 8030FFD8 0030CF38 38 6D A8 80 */ addi r3, r13, svector2_Identity@sda21
/* 8030FFDC 0030CF3C 90 01 00 14 */ stw r0, 0x14(r1)
/* 8030FFE0 0030CF40 FC 40 08 90 */ fmr f2, f1
/* 8030FFE4 0030CF44 48 00 42 1D */ bl __ct__9CVector2fFff
@ -85,4 +85,3 @@ lbl_805AE568:
# ROM: 0x3FAE08
.4byte 0
.4byte 0

1
asm/MetroidPrime/BodyState/CBSHurled.s
View File

@ -1379,4 +1379,3 @@ lbl_805AB970:
lbl_805AB978:
# ROM: 0x3F8218
.double 4.503601774854144E15

1
asm/MetroidPrime/BodyState/CBSLocomotion.s
View File

@ -2812,4 +2812,3 @@ lbl_805AB770:
lbl_805AB774:
# ROM: 0x3F8014
.4byte 0x3E32B8C2

1
asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s
View File

@ -1171,4 +1171,3 @@ lbl_805AB6B0:
lbl_805AB6B4:
# ROM: 0x3F7F54
.float 1.0E-4

1
asm/MetroidPrime/CGameArea.s
View File

@ -8036,4 +8036,3 @@ lbl_803CCFAC:
.asciz "??(??)"
.balign 4
.4byte 0

1
asm/MetroidPrime/CGameCollision.s
View File

@ -6674,4 +6674,3 @@ lbl_803D0690:
.asciz "ollidableAABox"
.balign 4
.4byte 0

1
asm/MetroidPrime/PathFinding/CPathFindArea.s
View File

@ -2337,4 +2337,3 @@ lbl_803D1AA0:
# ROM: 0x3CEAA0
.asciz "??(??)"
.balign 4

1
asm/MetroidPrime/PathFinding/CPathFindSearch.s
View File

@ -2588,4 +2588,3 @@ lbl_805AC858:
# ROM: 0x3F90F8
.4byte 0x41200000
.4byte 0

1
asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s
View File

@ -302,4 +302,3 @@ lbl_805ABA48:
lbl_805ABA50:
# ROM: 0x3F82F0
.double 9.999999747378752E-6

1
configure.py
View File

@ -40,6 +40,7 @@ COMPLETE_OBJECTS = [
"Kyoto/Math/CVector2i",
"Kyoto/Math/CVector3d",
"Kyoto/Math/CVector3i",
"Kyoto/Math/CloseEnough",
"Kyoto/CRandom16",
"Kyoto/CCrc32",
"Kyoto/Alloc/CCircularBuffer",

4
include/Kyoto/Math/CloseEnough.hpp
View File

@ -17,8 +17,8 @@ struct Double {
static inline float vector3_epsilon() { return FLT_EPSILON; }
static inline float vector2_epsilon() { return FLT_EPSILON; }
static bool close_enough(const CVector2f& a, const CVector2f& b, float epsilon = vector2_epsilon());
static bool close_enough(const CVector3f& a, const CVector3f& b, float epsilon = vector3_epsilon());
bool close_enough(const CVector2f& a, const CVector2f& b, float epsilon = vector2_epsilon());
bool close_enough(const CVector3f& a, const CVector3f& b, float epsilon = vector3_epsilon());
inline bool close_enough(float a, float b, float epsilon = Real32::Epsilon()) {
return fabs(a - b) < epsilon;
}

2
obj_files.mk
View File

@ -513,7 +513,7 @@ KYOTO_1 :=\
$(BUILD_DIR)/asm/Kyoto/Graphics/DolphinCGraphics.o\
$(BUILD_DIR)/asm/Kyoto/Graphics/DolphinCPalette.o\
$(BUILD_DIR)/asm/Kyoto/Graphics/DolphinCTexture.o\
$(BUILD_DIR)/asm/Kyoto/Math/CloseEnough.o\
$(BUILD_DIR)/src/Kyoto/Math/CloseEnough.o\
$(BUILD_DIR)/asm/Kyoto/Math/CMatrix3f.o\
$(BUILD_DIR)/asm/Kyoto/Math/CMatrix4f.o\
$(BUILD_DIR)/asm/Kyoto/Math/CQuaternion.o\

1
src/Kyoto/Math/CVector3f.cpp
View File

@ -1,5 +1,6 @@
#include "Kyoto/Math/CVector3f.hpp"
#include "Kyoto/Math/CloseEnough.hpp"
#include "Kyoto/Math/CMath.hpp"
#include "Kyoto/Math/CRelAngle.hpp"
#include "Kyoto/Streams/CInputStream.hpp"