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

Split, match and link CVector3i

This commit is contained in:
Phillip Stephens 2022-10-02 20:09:01 -07:00
parent 302df55a60
commit 9f8f1ab7f7
5 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/Kyoto/Math/CVector3f.s
View File

@ -484,13 +484,6 @@ __sinit_CVector3f_cpp:
/* 80314C40 00311BA0 D0 43 00 08 */ stfs f2, 8(r3) /* 80314C40 00311BA0 D0 43 00 08 */ stfs f2, 8(r3)
/* 80314C44 00311BA4 4E 80 00 20 */ blr /* 80314C44 00311BA4 4E 80 00 20 */ blr
.global __ct__9CVector3iFiii
__ct__9CVector3iFiii:
/* 80314C48 00311BA8 90 83 00 00 */ stw r4, 0(r3)
/* 80314C4C 00311BAC 90 A3 00 04 */ stw r5, 4(r3)
/* 80314C50 00311BB0 90 C3 00 08 */ stw r6, 8(r3)
/* 80314C54 00311BB4 4E 80 00 20 */ blr
.section .sdata2, "a" .section .sdata2, "a"
.balign 8 .balign 8
.global lbl_805AE630 .global lbl_805AE630
@ -518,4 +511,3 @@ lbl_805AE640:
# ROM: 0x3FAEE0 # ROM: 0x3FAEE0
.4byte 0x10FD87B5 .4byte 0x10FD87B5
.4byte 0 .4byte 0

4
configure.py
View File

@ -31,6 +31,9 @@ COMPLETE_OBJECTS = [
"Kyoto/Basics/CSWDataDolphin", "Kyoto/Basics/CSWDataDolphin",
"Kyoto/Audio/CSfxHandle", "Kyoto/Audio/CSfxHandle",
"Kyoto/Graphics/CGX", "Kyoto/Graphics/CGX",
"Kyoto/Particles/CWarp",
"Kyoto/Math/CPlane",
"Kyoto/Math/CVector3i",
"Kyoto/CRandom16", "Kyoto/CRandom16",
"Kyoto/CCrc32", "Kyoto/CCrc32",
"Kyoto/Alloc/CCircularBuffer", "Kyoto/Alloc/CCircularBuffer",
@ -680,6 +683,7 @@ LIBS = [
"Kyoto/Math/CVector2i", "Kyoto/Math/CVector2i",
"Kyoto/Math/CVector3d", "Kyoto/Math/CVector3d",
"Kyoto/Math/CVector3f", "Kyoto/Math/CVector3f",
"Kyoto/Math/CVector3i",
"Kyoto/Math/RMathUtils", "Kyoto/Math/RMathUtils",
"Kyoto/CCrc32", "Kyoto/CCrc32",
"Kyoto/Alloc/CCircularBuffer", "Kyoto/Alloc/CCircularBuffer",

14
include/Kyoto/Math/CVector3i.hpp Normal file
View File

@ -0,0 +1,14 @@
#ifndef __CVECTOR3I_HPP__
#define __CVECTOR3I_HPP__
class CVector3i {
public:
CVector3i(int x, int y, int z);
private:
int mX;
int mY;
int mZ;
};
#endif // __CVECTOR3I_HPP__

1
obj_files.mk
View File

@ -524,6 +524,7 @@ KYOTO_1 :=\
$(BUILD_DIR)/asm/Kyoto/Math/CVector2i.o\ $(BUILD_DIR)/asm/Kyoto/Math/CVector2i.o\
$(BUILD_DIR)/asm/Kyoto/Math/CVector3d.o\ $(BUILD_DIR)/asm/Kyoto/Math/CVector3d.o\
$(BUILD_DIR)/asm/Kyoto/Math/CVector3f.o\ $(BUILD_DIR)/asm/Kyoto/Math/CVector3f.o\
$(BUILD_DIR)/src/Kyoto/Math/CVector3i.o\
$(BUILD_DIR)/asm/Kyoto/Math/RMathUtils.o\ $(BUILD_DIR)/asm/Kyoto/Math/RMathUtils.o\
$(BUILD_DIR)/src/Kyoto/CCrc32.o\ $(BUILD_DIR)/src/Kyoto/CCrc32.o\
$(BUILD_DIR)/src/Kyoto/Alloc/CCircularBuffer.o\ $(BUILD_DIR)/src/Kyoto/Alloc/CCircularBuffer.o\

4
src/Kyoto/Math/CVector3i.cpp Normal file
View File

@ -0,0 +1,4 @@
#include "Kyoto/Math/CVector3i.hpp"
CVector3i::CVector3i(int x, int y, int z)
: mX(x), mY(y), mZ(z) {}