d_kankyo_rain work

This commit is contained in:
Jasper St. Pierre
2024-01-14 12:47:23 -08:00
parent dbd043f29d
commit 5e06ae88f2
6 changed files with 359 additions and 18 deletions
@@ -33,6 +33,8 @@ public:
void forceDeleteEmitter(JPABaseEmitter*);
void forceDeleteAllEmitter();
void clearResourceManager(u8);
u32 getParticleNumber() { return mPtclNum - mPtclPool.getNumLinks(); }
u32 getEmitterNumber() { return mEmtrNum - mEmtrPool.getNumLinks(); }
public:
/* 0x00 */ JSUList<JPABaseParticle> mPtclPool;
+3
View File
@@ -3038,6 +3038,9 @@ inline void dComIfGp_particle_draw2Dback(JPADrawInfo* inf) { if (g_dComIfG_gameI
inline void dComIfGp_particle_draw2DmenuFore(JPADrawInfo* inf) { if (g_dComIfG_gameInfo.play.getParticle() != NULL) g_dComIfG_gameInfo.play.getParticle()->draw2DmenuFore(inf); }
inline void dComIfGp_particle_draw2DmenuBack(JPADrawInfo* inf) { if (g_dComIfG_gameInfo.play.getParticle() != NULL) g_dComIfG_gameInfo.play.getParticle()->draw2DmenuBack(inf); }
inline u32 dComIfGp_particle_getParticleNum() { return g_dComIfG_gameInfo.play.getParticle()->getParticleNum(); }
inline u32 dComIfGp_particle_getEmitterNum() { return g_dComIfG_gameInfo.play.getParticle()->getEmitterNum(); }
/**
* === ATTENTION ===
*/
+8 -8
View File
@@ -303,14 +303,14 @@ struct KAMOME_EFF {
KAMOME_EFF();
~KAMOME_EFF();
/* 0x00 */ JPABaseEmitter* mpBaseEmitter;
/* 0x00 */ JPABaseEmitter* mpEmitter;
/* 0x04 */ cXyz mPos;
/* 0x10 */ s16 field_0x10;
/* 0x12 */ s16 field_0x12;
/* 0x14 */ f32 field_0x14;
/* 0x18 */ f32 field_0x18;
/* 0x1C */ s16 field_0x1c;
/* 0x1E */ u8 field_0x1e;
/* 0x10 */ s16 mAngleY;
/* 0x12 */ s16 mAngleX;
/* 0x14 */ f32 mAngleYSpeed;
/* 0x18 */ f32 mScale;
/* 0x1C */ s16 mTimer;
/* 0x1E */ u8 mStatus;
};
struct WIND_EFF {
@@ -319,7 +319,7 @@ struct WIND_EFF {
/* 0x00 */ JPABaseEmitter* mpEmitter;
/* 0x04 */ cXyz mBasePos;
/* 0x10 */ cXyz mRandomPos;
/* 0x10 */ cXyz mPos;
/* 0x1C */ f32 mStateTimer;
/* 0x20 */ f32 mAlpha;
/* 0x24 */ int mState;
+5 -1
View File
@@ -6,6 +6,7 @@
#include "JSystem/JGeometry.h"
#include "JSystem/JParticle/JPAParticle.h"
#include "JSystem/JParticle/JPAEmitter.h"
#include "JSystem/JParticle/JPAEmitterManager.h"
#include "d/d_particle_name.h"
#include "f_pc/f_pc_node.h"
#include "m_Do/m_Do_ext.h"
@@ -448,6 +449,9 @@ public:
void draw2DmenuFore(JPADrawInfo* inf) { draw(inf, 9); }
void draw2DmenuBack(JPADrawInfo* inf) { draw(inf, 10); }
u32 getParticleNum() { return mEmitterMng->getParticleNumber(); }
u32 getEmitterNum() { return mEmitterMng->getEmitterNumber(); }
void drawModelParticle() { mModelCtrl->draw(); }
JKRHeap * getHeap() { return mHeap; }
@@ -461,7 +465,7 @@ public:
static void offStatus(u8 status) { mStatus &= ~status; }
static u8 mStatus;
static JPAEmitterManager * mEmitterMng;
static JPAEmitterManager* mEmitterMng;
static dPa_stripesEcallBack mStripes;
static dPa_kageroEcallBack mKagero;
static dPa_smokeEcallBack mSmokeEcallback;