mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-08-15 12:58:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Get initial JParticle import to build, label symbols.txt

Browse Source
This commit is contained in:
robojumper
2025-04-27 07:49:37 +02:00
parent c1a0264e6a
commit 6468fc663c
60 changed files with 411 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/JParticle/JPABaseShape.cpp
+8 -8
View File
@@ -3,14 +3,14 @@
// Translation Unit: JPABaseShape
//
#include "egg/core/eggHeap.h"
#include "JSystem/JParticle/JPABaseShape.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "JSystem/JParticle/JPAParticle.h"
#include "JSystem/JParticle/JPAEmitter.h"
#include "JSystem/JParticle/JPAResourceManager.h"
#include "JSystem/JMath/JMATrigonometric.h"
#include "dolphin/mtx.h"
#include "dolphin/gx.h"
#include "rvl/MTX.h"
#include "rvl/GX.h"
/* 80276A90-80276ACC 2713D0 003C+00 0/0 1/1 0/0 .text JPASetPointSize__FP18JPAEmitterWorkData */
void JPASetPointSize(JPAEmitterWorkData* work) {
@@ -1266,10 +1266,10 @@ void JPADrawParticleCallBack(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
}
/* 8027A454-8027A6DC 274D94 0288+00 1/1 0/0 0/0 .text
* makeColorTable__FPP8_GXColorPC16JPAClrAnmKeyDataUcsP7JKRHeap */
* makeColorTable__FPP8_GXColorPC16JPAClrAnmKeyDataUcsP7EGG::Heap */
static void makeColorTable(GXColor** o_color_table, JPAClrAnmKeyData const* i_data, u8 param_2,
s16 i_size, JKRHeap* i_heap) {
GXColor* color_table = (GXColor*)JKRAllocFromHeap(i_heap, (i_size + 1) * 4, 4);
s16 i_size, EGG::Heap* i_heap) {
GXColor* color_table = (GXColor*)i_heap->alloc((i_size + 1) * 4, 4);
f32 r_step, g_step, b_step, a_step;
r_step = g_step = b_step = a_step = 0.0f;
f32 r = i_data[0].color.r;
@@ -1308,9 +1308,9 @@ static void makeColorTable(GXColor** o_color_table, JPAClrAnmKeyData const* i_da
*o_color_table = color_table;
}
/* 8027A6DC-8027A7E8 27501C 010C+00 0/0 1/1 0/0 .text __ct__12JPABaseShapeFPCUcP7JKRHeap
/* 8027A6DC-8027A7E8 27501C 010C+00 0/0 1/1 0/0 .text __ct__12JPABaseShapeFPCUcP7EGG::Heap
*/
JPABaseShape::JPABaseShape(u8 const* pData, JKRHeap* pHeap) {
JPABaseShape::JPABaseShape(u8 const* pData, EGG::Heap* pHeap) {
mpData = (const JPABaseShapeData*)pData;
if (isTexCrdAnm()) {
src/JSystem/JParticle/JPAChildShape.cpp
+2 -2
View File
@@ -6,8 +6,8 @@
#include "JSystem/JParticle/JPAChildShape.h"
#include "JSystem/JParticle/JPAParticle.h"
#include "JSystem/JParticle/JPAEmitter.h"
#include "dolphin/gx.h"
#include "dolphin/os.h"
#include "rvl/GX.h"
#include "rvl/OS.h"
/* 8027AEBC-8027AFDC 2757FC 0120+00 0/0 1/1 0/0 .text JPARegistChildPrmEnv__FP18JPAEmitterWorkData
*/
src/JSystem/JParticle/JPAEmitter.cpp
-1
View File
@@ -8,7 +8,6 @@
#include "JSystem/JParticle/JPAParticle.h"
#include "JSystem/JParticle/JPAResourceManager.h"
#include "JSystem/JParticle/JPABaseShape.h"
#include "dolphin/types.h"
//
// Types:
src/JSystem/JParticle/JPAEmitterManager.cpp
+4 -4
View File
@@ -3,17 +3,17 @@
// Translation Unit: JPAEmitterManager
//
#include "egg/core/eggHeap.h"
#include "JSystem/JParticle/JPAEmitterManager.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "JSystem/JParticle/JPAEmitter.h"
#include "JSystem/JParticle/JPAParticle.h"
#include "JSystem/JParticle/JPAResourceManager.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "dolphin/gx.h"
#include "rvl/GX.h"
/* 8027DCA0-8027DEBC 2785E0 021C+00 0/0 1/1 0/0 .text __ct__17JPAEmitterManagerFUlUlP7JKRHeapUcUc
/* 8027DCA0-8027DEBC 2785E0 021C+00 0/0 1/1 0/0 .text __ct__17JPAEmitterManagerFUlUlP7EGG::HeapUcUc
*/
JPAEmitterManager::JPAEmitterManager(u32 i_ptclNum, u32 i_emtrNum, JKRHeap* pHeap, u8 i_gidMax,
JPAEmitterManager::JPAEmitterManager(u32 i_ptclNum, u32 i_emtrNum, EGG::Heap* pHeap, u8 i_gidMax,
u8 i_ridMax) {
emtrNum = i_emtrNum;
ptclNum = i_ptclNum;
src/JSystem/JParticle/JPAExTexShape.cpp
+2 -2
View File
@@ -6,7 +6,7 @@
#include "JSystem/JParticle/JPAExTexShape.h"
#include "JSystem/JParticle/JPAResourceManager.h"
#include "JSystem/JParticle/JPAEmitter.h"
#include "dolphin/gx.h"
#include "rvl/GX.h"
/* 8027B040-8027B13C 275980 00FC+00 0/0 1/1 0/0 .text JPALoadExTex__FP18JPAEmitterWorkData */
void JPALoadExTex(JPAEmitterWorkData* work) {
@@ -32,4 +32,4 @@ void JPALoadExTex(JPAEmitterWorkData* work) {
/* 8027B13C-8027B144 -00001 0008+00 0/0 0/0 0/0 .text __ct__13JPAExTexShapeFPCUc */
JPAExTexShape::JPAExTexShape(u8 const* data) {
mpData = (const JPAExTexShapeData*)data;
}
}
src/JSystem/JParticle/JPAExtraShape.cpp
+1 -1
View File
@@ -7,7 +7,7 @@
#include "JSystem/JMath/JMATrigonometric.h"
#include "JSystem/JParticle/JPAParticle.h"
#include "JSystem/JParticle/JPAEmitter.h"
#include "dolphin/os.h"
#include "rvl/OS.h"
/* 8027A918-8027A990 275258 0078+00 0/0 1/1 0/0 .text
* JPACalcScaleX__FP18JPAEmitterWorkDataP15JPABaseParticle */
src/JSystem/JParticle/JPAFieldBlock.cpp
+5 -5
View File
@@ -3,8 +3,8 @@
// Translation Unit: JPAFieldBlock
//
#include "egg/core/eggHeap.h"
#include "JSystem/JParticle/JPAFieldBlock.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "JSystem/JParticle/JPAEmitter.h"
#include "JSystem/JParticle/JPAParticle.h"
@@ -237,15 +237,15 @@ void JPAFieldSpin::calc(JPAEmitterWorkData* work, JPAFieldBlock* block, JPABaseP
calcAffect(block, ptcl);
}
/* 8027D088-8027D0C0 2779C8 0038+00 0/0 1/1 0/0 .text __ct__13JPAFieldBlockFPCUcP7JKRHeap
/* 8027D088-8027D0C0 2779C8 0038+00 0/0 1/1 0/0 .text __ct__13JPAFieldBlockFPCUcP7EGG::Heap
*/
JPAFieldBlock::JPAFieldBlock(u8 const* data, JKRHeap* heap)
JPAFieldBlock::JPAFieldBlock(u8 const* data, EGG::Heap* heap)
: mpData((const JPAFieldBlockData*)data) {
init(heap);
}
/* 8027D0C0-8027D3AC 277A00 02EC+00 2/1 0/0 0/0 .text init__13JPAFieldBlockFP7JKRHeap */
void JPAFieldBlock::init(JKRHeap* heap) {
/* 8027D0C0-8027D3AC 277A00 02EC+00 2/1 0/0 0/0 .text init__13JPAFieldBlockFP7EGG::Heap */
void JPAFieldBlock::init(EGG::Heap* heap) {
mFadeInRate = getFadeInTime() - getEnTime();
if (mFadeInRate == 0.0f) {
mFadeInRate = 1.0f;
src/JSystem/JParticle/JPAMath.cpp
-28
View File
@@ -5,34 +5,6 @@
#include "JSystem/JParticle/JPAMath.h"
#include "JSystem/JMath/JMATrigonometric.h"
#include "JSystem/J2DGraph/J2DAnimation.h"
//
// Types:
//
//
// Forward References:
//
extern "C" void func_80280588();
extern "C" void JPAGetYZRotateMtx__FssPA4_f();
extern "C" void JPAGetXYZRotateMtx__FsssPA4_f();
extern "C" void func_802807E0();
extern "C" void func_80280808();
extern "C" void JPACalcKeyAnmValue__FfUsPCf();
//
// External References:
//
extern "C" void _savegpr_28();
extern "C" void _restgpr_28();
extern "C" u8 sincosTable___5JMath[65536];
//
// Declarations:
//
/* ############################################################################################## */
// Probably some local function needed to change float literal order
src/JSystem/JParticle/JPAResource.cpp
+11 -12
View File
@@ -3,8 +3,8 @@
// Translation Unit: JPAResource
//
#include "egg/core/eggHeap.h"
#include "JSystem/JParticle/JPAResource.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "JSystem/JParticle/JPABaseShape.h"
#include "JSystem/JParticle/JPAChildShape.h"
#include "JSystem/JParticle/JPAEmitter.h"
@@ -14,8 +14,7 @@
#include "JSystem/JParticle/JPAKeyBlock.h"
#include "JSystem/JParticle/JPAParticle.h"
#include "JSystem/JParticle/JPAResourceManager.h"
#include "dolphin/gx.h"
#include "global.h"
#include "rvl/GX.h"
/* 80274010-80274080 26E950 0070+00 0/0 1/1 0/0 .text __ct__11JPAResourceFv */
JPAResource::JPAResource() {
@@ -78,8 +77,8 @@ static u8 jpa_crd[32] ALIGN_DECL(32) = {
0x00, 0x00, 0x01, 0x00, 0x01, 0x02, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x02,
};
/* 80274080-802755E8 26E9C0 1568+00 2/0 1/1 0/0 .text init__11JPAResourceFP7JKRHeap */
void JPAResource::init(JKRHeap* heap) {
/* 80274080-802755E8 26E9C0 1568+00 2/0 1/1 0/0 .text init__11JPAResourceFP7EGG::Heap */
void JPAResource::init(EGG::Heap* heap) {
BOOL is_glbl_clr_anm = mpBaseShape->isGlblClrAnm();
BOOL is_glbl_tex_anm = mpBaseShape->isGlblTexAnm();
BOOL is_prm_anm = mpBaseShape->isPrmAnm();
@@ -123,7 +122,7 @@ void JPAResource::init(JKRHeap* heap) {
if (mpCalcEmitterFuncListNum != 0) {
mpCalcEmitterFuncList =
(EmitterFunc*)JKRAllocFromHeap(heap, mpCalcEmitterFuncListNum * 4, 4);
(EmitterFunc*)heap->alloc(mpCalcEmitterFuncListNum * 4, 4);
}
int func_no = 0;
@@ -220,7 +219,7 @@ void JPAResource::init(JKRHeap* heap) {
if (mpCalcParticleFuncListNum != 0) {
mpCalcParticleFuncList =
(ParticleFunc*)JKRAllocFromHeap(heap, mpCalcParticleFuncListNum * 4, 4);
(ParticleFunc*)heap->alloc(mpCalcParticleFuncListNum * 4, 4);
}
func_no = 0;
@@ -339,7 +338,7 @@ void JPAResource::init(JKRHeap* heap) {
if (mpCalcParticleChildFuncListNum != 0) {
mpCalcParticleChildFuncList =
(ParticleFunc*)JKRAllocFromHeap(heap, mpCalcParticleChildFuncListNum * 4, 4);
(ParticleFunc*)heap->alloc(mpCalcParticleChildFuncListNum * 4, 4);
}
func_no = 0;
@@ -383,7 +382,7 @@ void JPAResource::init(JKRHeap* heap) {
if (mpDrawEmitterFuncListNum != 0) {
mpDrawEmitterFuncList =
(EmitterFunc*)JKRAllocFromHeap(heap, mpDrawEmitterFuncListNum * 4, 4);
(EmitterFunc*)heap->alloc(mpDrawEmitterFuncListNum * 4, 4);
}
func_no = 0;
@@ -481,7 +480,7 @@ void JPAResource::init(JKRHeap* heap) {
if (mpDrawEmitterChildFuncListNum != 0) {
mpDrawEmitterChildFuncList =
(EmitterFunc*)JKRAllocFromHeap(heap, mpDrawEmitterChildFuncListNum * 4, 4);
(EmitterFunc*)heap->alloc(mpDrawEmitterChildFuncListNum * 4, 4);
}
func_no = 0;
@@ -530,7 +529,7 @@ void JPAResource::init(JKRHeap* heap) {
if (mpDrawParticleFuncListNum != 0) {
mpDrawParticleFuncList =
(ParticleFunc*)JKRAllocFromHeap(heap, mpDrawParticleFuncListNum * 4, 4);
(ParticleFunc*)heap->alloc(mpDrawParticleFuncListNum * 4, 4);
}
func_no = 0;
@@ -634,7 +633,7 @@ void JPAResource::init(JKRHeap* heap) {
if (mpDrawParticleChildFuncListNum != 0) {
mpDrawParticleChildFuncList =
(ParticleFunc*)JKRAllocFromHeap(heap, mpDrawParticleChildFuncListNum * 4, 4);
(ParticleFunc*)heap->alloc(mpDrawParticleChildFuncListNum * 4, 4);
}
func_no = 0;
src/JSystem/JParticle/JPAResourceLoader.cpp
+2 -2
View File
@@ -3,8 +3,8 @@
// Translation Unit: JPAResourceLoader
//
#include "egg/core/eggHeap.h"
#include "JSystem/JParticle/JPAResourceLoader.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "JSystem/JParticle/JPABaseShape.h"
#include "JSystem/JParticle/JPAChildShape.h"
#include "JSystem/JParticle/JPADynamicsBlock.h"
@@ -34,7 +34,7 @@ struct JPAResourceHeader {
/* 8027D8E0-8027DCA0 278220 03C0+00 1/1 0/0 0/0 .text
* load_jpc__17JPAResourceLoaderFPCUcP18JPAResourceManager */
void JPAResourceLoader::load_jpc(u8 const* data, JPAResourceManager* mgr) {
JKRHeap* heap = mgr->mpHeap;
EGG::Heap* heap = mgr->mpHeap;
mgr->mResMax = *(u16*)(data + 8);
mgr->mTexMax = *(u16*)(data + 0xA);
mgr->mpResArr = new (heap, 0) JPAResource*[mgr->mResMax];
src/JSystem/JParticle/JPAResourceManager.cpp
+3 -3
View File
@@ -12,8 +12,8 @@ struct JPAResourceLoader {
/* 8027D8A0 */ JPAResourceLoader(u8 const*, JPAResourceManager*);
};
/* 80273E10-80273E68 26E750 0058+00 0/0 2/2 0/0 .text __ct__18JPAResourceManagerFPCvP7JKRHeap */
JPAResourceManager::JPAResourceManager(void const* pData, JKRHeap* pHeap) {
/* 80273E10-80273E68 26E750 0058+00 0/0 2/2 0/0 .text __ct__18JPAResourceManagerFPCvP7EGG::Heap */
JPAResourceManager::JPAResourceManager(void const* pData, EGG::Heap* pHeap) {
mpResArr = NULL;
mpTexArr = NULL;
mResMax = 0;
@@ -81,4 +81,4 @@ u32 JPAResourceManager::getResUserWork(u16 usrIdx) const {
ret = res->getDyn()->getResUserWork();
return ret;
}
}
src/JSystem/JSupport/JSUList.cpp
+1 -1
View File
@@ -159,4 +159,4 @@ JSUPtrLink* JSUPtrList::getNthLink(u32 index) const {
}
return node;
}
}