Get initial JParticle import to build, label symbols.txt

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
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JGEOMETRY_H
#define JGEOMETRY_H
#include "dolphin/mtx.h"
#include "common.h"
#include "math.h"
#include "JSystem/JMath/JMath.h"
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JMATRIGONOMETRIC_H
#define JMATRIGONOMETRIC_H
#include "dolphin/types.h"
#include "common.h"
#include "utility.h"
template<typename T>
+2 -1
View File
@@ -1,7 +1,8 @@
#ifndef JMATH_H
#define JMATH_H
#include "dolphin/mtx.h"
#include "common.h"
#include "rvl/MTX.h"
#include "math.h"
void JMAMTXApplyScale(const Mtx, Mtx, f32, f32, f32);
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef RANDOM_H
#define RANDOM_H
#include "dolphin/types.h"
#include "common.h"
namespace JMath {
+4 -3
View File
@@ -1,11 +1,12 @@
#ifndef JPABASESHAPE_H
#define JPABASESHAPE_H
#include <dolphin/gx.h>
#include "common.h"
#include "egg/egg_types.h"
#include "rvl/GX.h"
class JPAEmitterWorkData;
class JPABaseParticle;
class JKRHeap;
/**
* @ingroup jsystem-jparticle
@@ -46,7 +47,7 @@ struct JPABaseShapeData {
*/
struct JPABaseShape {
public:
/* 8027A6DC */ JPABaseShape(u8 const*, JKRHeap*);
/* 8027A6DC */ JPABaseShape(u8 const*, EGG::Heap*);
/* 8027A7E8 */ void setGX(JPAEmitterWorkData*) const;
static GXBlendMode st_bm[3];
+2 -1
View File
@@ -1,7 +1,8 @@
#ifndef JPACHILDSHAPE_H
#define JPACHILDSHAPE_H
#include <dolphin/gx.h>
#include "common.h"
#include "rvl/GX.h"
class JPAEmitterWorkData;
class JPABaseParticle;
+2 -1
View File
@@ -1,7 +1,8 @@
#ifndef JPADRAWINFO_H
#define JPADRAWINFO_H
#include "dolphin/mtx.h"
#include "common.h"
#include "rvl/MTX.h"
/**
* @ingroup jsystem-jparticle
+2 -1
View File
@@ -1,9 +1,10 @@
#ifndef JPADYNAMICSBLOCK_H
#define JPADYNAMICSBLOCK_H
#include "common.h"
#include "JSystem/JGeometry.h"
#include "dolphin/types.h"
class JPAEmitterWorkData;
+2 -1
View File
@@ -1,7 +1,8 @@
#ifndef JPAEMITTER_H
#define JPAEMITTER_H
#include <dolphin/gx.h>
#include "common.h"
#include "rvl/GX.h"
#include "JSystem/JParticle/JPAResource.h"
#include "JSystem/JParticle/JPAList.h"
#include "JSystem/JParticle/JPARandom.h"
@@ -1,7 +1,8 @@
#ifndef JPAEMITTERMANAGER_H
#define JPAEMITTERMANAGER_H
#include "dolphin/types.h"
#include "common.h"
#include "egg/egg_types.h"
#include "JSystem/JParticle/JPAList.h"
#include "JSystem/JParticle/JPADrawInfo.h"
#include "JSystem/JSupport/JSUList.h"
@@ -12,7 +13,6 @@ class JPAParticleCallBack;
class JPABaseEmitter;
class JPAResourceManager;
class JPABaseParticle;
class JKRHeap;
struct JPAEmitterWorkData;
/**
@@ -21,7 +21,7 @@ struct JPAEmitterWorkData;
*/
class JPAEmitterManager {
public:
/* 8027DCA0 */ JPAEmitterManager(u32, u32, JKRHeap*, u8, u8);
/* 8027DCA0 */ JPAEmitterManager(u32, u32, EGG::Heap*, u8, u8);
/* 8027DEBC */ JPABaseEmitter* createSimpleEmitterID(JGeometry::TVec3<f32> const&, u16, u8, u8,
JPAEmitterCallBack*, JPAParticleCallBack*);
/* 8027DFA0 */ void calc(u8);
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JPAEXTEXSHAPE_H
#define JPAEXTEXSHAPE_H
#include "dolphin/types.h"
#include "common.h"
class JPAEmitterWorkData;
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JPAEXTRASHAPE_H
#define JPAEXTRASHAPE_H
#include "dolphin/types.h"
#include "common.h"
class JPAEmitterWorkData;
class JPABaseParticle;
+4 -4
View File
@@ -1,10 +1,10 @@
#ifndef JPAFIELDBLOCK_H
#define JPAFIELDBLOCK_H
#include "common.h"
#include "egg/egg_types.h"
#include "JSystem/JGeometry.h"
#include "dolphin/types.h"
class JKRHeap;
class JPAEmitterWorkData;
class JPABaseParticle;
class JPAFieldBlock;
@@ -119,8 +119,8 @@ public:
class JPAFieldBlock {
public:
/* 8027D088 */ JPAFieldBlock(u8 const*, JKRHeap*);
/* 8027D0C0 */ void init(JKRHeap*);
/* 8027D088 */ JPAFieldBlock(u8 const*, EGG::Heap*);
/* 8027D0C0 */ void init(EGG::Heap*);
u32 getType() { return mpData->mFlags & 0xF; }
u32 getAddType() { return (mpData->mFlags >> 8) & 3; }
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JPAKEYBLOCK_H
#define JPAKEYBLOCK_H
#include "dolphin/types.h"
#include "common.h"
/**
* @ingroup jsystem-jparticle
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JPALIST_H
#define JPALIST_H
#include "dolphin/types.h"
#include "common.h"
/**
* @ingroup jsystem-jparticle
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JPAMATH_H
#define JPAMATH_H
#include "dolphin/mtx.h"
#include "common.h"
#include "JSystem/JGeometry.h"
void JPAGetDirMtx(JGeometry::TVec3<f32> const& param_0, f32 (*param_1)[4]);
+2 -2
View File
@@ -1,10 +1,10 @@
#ifndef JPAPARTICLE_H
#define JPAPARTICLE_H
#include <dolphin/gx.h>
#include "common.h"
#include "rvl/GX.h"
#include "JSystem/JGeometry.h"
class JKRHeap;
class JPABaseEmitter;
class JPABaseParticle;
class JPAEmitterCallBack;
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JPARANDOM_H
#define JPARANDOM_H
#include "dolphin/types.h"
#include "common.h"
/**
* @ingroup jsystem-jparticle
+3 -3
View File
@@ -1,9 +1,9 @@
#ifndef JPARESOURCE_H
#define JPARESOURCE_H
#include "dolphin/types.h"
#include "common.h"
#include "egg/egg_types.h"
class JKRHeap;
class JPAEmitterWorkData;
class JPABaseEmitter;
class JPABaseParticle;
@@ -23,7 +23,7 @@ class JPAKeyBlock;
class JPAResource {
public:
/* 80274010 */ JPAResource();
/* 80274080 */ void init(JKRHeap*);
/* 80274080 */ void init(EGG::Heap*);
/* 802755E8 */ bool calc(JPAEmitterWorkData*, JPABaseEmitter*);
/* 80275A94 */ void draw(JPAEmitterWorkData*, JPABaseEmitter*);
/* 80275B74 */ void drawP(JPAEmitterWorkData*);
@@ -1,7 +1,7 @@
#ifndef JPARESOURCELOADER_H
#define JPARESOURCELOADER_H
#include "dolphin/types.h"
#include "common.h"
class JPAResourceManager;
@@ -1,9 +1,11 @@
#ifndef JPARESOURCEMANAGER_H
#define JPARESOURCEMANAGER_H
#include "common.h"
#include "egg/egg_types.h"
#include "rvl/GX.h"
#include "JSystem/JParticle/JPATexture.h"
class JKRHeap;
class JPAResource;
struct ResTIMG;
@@ -13,7 +15,7 @@ struct ResTIMG;
*/
class JPAResourceManager {
public:
/* 80273E10 */ JPAResourceManager(void const*, JKRHeap*);
/* 80273E10 */ JPAResourceManager(void const*, EGG::Heap*);
/* 80273E68 */ JPAResource* getResource(u16) const;
/* 80273EA8 */ bool checkUserIndexDuplication(u16) const;
/* 80273EEC */ const ResTIMG* swapTexture(ResTIMG const*, char const*);
@@ -24,7 +26,7 @@ public:
void load(u16 idx, GXTexMapID texMapID) { mpTexArr[idx]->load(texMapID); }
public:
/* 0x00 */ JKRHeap* mpHeap;
/* 0x00 */ EGG::Heap* mpHeap;
/* 0x04 */ JPAResource** mpResArr;
/* 0x08 */ JPATexture** mpTexArr;
/* 0x0C */ u16 mResMax;
+2
View File
@@ -1,6 +1,8 @@
#ifndef JPATEXTURE_H
#define JPATEXTURE_H
#include "common.h"
#include "rvl/GX.h"
#include "JSystem/JUtility/JUTTexture.h"
/**
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JSULIST_H
#define JSULIST_H
#include "dolphin/types.h"
#include "common.h"
template <typename T>
class JSUList;
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JSUPPORT_H
#define JSUPPORT_H
#include <dolphin.h>
#include "common.h"
/**
* @ingroup jsystem-jsupport
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JUTASSERT_H
#define JUTASSERT_H
#include "dolphin/os.h"
#include "rvl/OS.h"
#ifdef DEBUG
#define JUT_ASSERT(LINE, COND) \
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JUTTEXTURE_H
#define JUTTEXTURE_H
#include <dolphin/gx.h>
#include "rvl/GX.h"
class JUTPalette;