Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-03-21 17:55:13 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

PR Feedback

Browse Source
This commit is contained in:
Fexty12573 2024-09-21 12:04:15 +02:00
parent b0d4cd4a89
commit 860248bc84
8 changed files with 39 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/struct_defs/struct_020147B8.h
View File

@ -7,7 +7,7 @@ struct SPLParticle;
struct SPLEmitter;
typedef struct SPLBehavior {
void (*apply)(const void *, struct SPLParticle *, VecFx32 *, struct SPLEmitter *);
void (*applyFunc)(const void *, struct SPLParticle *, VecFx32 *, struct SPLEmitter *);
const void *object;
} SPLBehavior;

18
lib/spl/include/spl_behavior.h
View File

@ -41,11 +41,7 @@ typedef struct SPLSpinBehavior {
typedef struct SPLCollisionPlaneBehavior {
fx32 y; // The Y position of the collision plane
fx16 elasticity; // The elasticity of the collision, 1.0 being perfectly elastic and 0.0 being perfectly inelastic
struct {
u16 collisionType : 2;
u16 : 14;
} flags;
u16 collisionType : 2;
} SPLCollisionPlaneBehavior;
// Applies a convergence behavior to particles
@ -56,11 +52,11 @@ typedef struct SPLConvergenceBehavior {
u16 padding;
} SPLConvergenceBehavior;
void SPLBehavior_ApplyGravity(const void *param0, SPLParticle *param1, VecFx32 *param2, struct SPLEmitter *param3);
void SPLBehavior_ApplyRandom(const void *param0, SPLParticle *param1, VecFx32 *param2, struct SPLEmitter *param3);
void SPLBehavior_ApplyMagnet(const void *param0, SPLParticle *param1, VecFx32 *param2, struct SPLEmitter *param3);
void SPLBehavior_ApplySpin(const void *param0, SPLParticle *param1, VecFx32 *param2, struct SPLEmitter *param3);
void SPLBehavior_ApplyCollisionPlane(const void *param0, SPLParticle *param1, VecFx32 *param2, struct SPLEmitter *param3);
void SPLBehavior_ApplyConvergence(const void *param0, SPLParticle *param1, VecFx32 *param2, struct SPLEmitter *param3);
void SPLBehavior_ApplyGravity(const void *obj, SPLParticle *ptcl, VecFx32 *acc, struct SPLEmitter *emtr);
void SPLBehavior_ApplyRandom(const void *obj, SPLParticle *ptcl, VecFx32 *acc, struct SPLEmitter *emtr);
void SPLBehavior_ApplyMagnet(const void *obj, SPLParticle *ptcl, VecFx32 *acc, struct SPLEmitter *emtr);
void SPLBehavior_ApplySpin(const void *obj, SPLParticle *ptcl, VecFx32 *acc, struct SPLEmitter *emtr);
void SPLBehavior_ApplyCollisionPlane(const void *obj, SPLParticle *ptcl, VecFx32 *acc, struct SPLEmitter *emtr);
void SPLBehavior_ApplyConvergence(const void *obj, SPLParticle *ptcl, VecFx32 *acc, struct SPLEmitter *emtr);
#endif // SPL_BEHAVIOR_H

2
lib/spl/src/spl_behavior.c
View File

@ -61,7 +61,7 @@ void SPLBehavior_ApplyCollisionPlane(const void *obj, SPLParticle *ptcl, VecFx32
y = emtr->collisionPlaneHeight;
}
switch (plane->flags.collisionType) {
switch (plane->collisionType) {
case SPL_COLLISION_BEHAVIOR_TYPE_KILL:
ey = ptcl->emitterPos.y;
if (ey < y && ey + ptcl->position.y > y) {

8
lib/spl/src/spl_draw.c
View File

@ -15,14 +15,6 @@
typedef void (*RotFunc)(fx32 sin, fx32 cos, MtxFx43 *rot);
typedef void (*DrawPlaneFunc)(fx16 s, fx16 t, fx16 offsetX, fx16 offsetY);
void SPLDraw_Billboard(SPLManager *mgr, SPLParticle *ptcl);
void SPLDraw_Child_Billboard(SPLManager *mgr, SPLParticle *ptcl);
void SPLDraw_DirectionalBillboard(SPLManager *mgr, SPLParticle *ptcl);
void SPLDraw_Child_DirectionalBillboard(SPLManager *mgr, SPLParticle *ptcl);
void SPLDraw_Polygon(SPLManager *mgr, SPLParticle *ptcl);
void SPLDraw_Child_Polygon(SPLManager *mgr, SPLParticle *ptcl);
void SPLDraw_DirectionalPolygon(SPLManager *mgr, SPLParticle *ptcl);
void SPLDraw_Child_DirectionalPolygon(SPLManager *mgr, SPLParticle *ptcl);
static void SPLUtil_DrawXYPlane(fx16 s, fx16 t, fx16 offsetX, fx16 offsetY);
static void SPLUtil_DrawXZPlane(fx16 s, fx16 t, fx16 offsetX, fx16 offsetZ);
static void SPLUtil_RotateXYZ(fx32 sin, fx32 cos, MtxFx43 *mat);

10
lib/spl/src/spl_emit.c
View File

@ -78,14 +78,20 @@ void SPLEmitter_EmitParticles(SPLEmitter *emtr, SPLParticleList *list)
SPLResource *res = emtr->resource;
SPLResourceHeader *header = res->header;
int i = 0;
int i = 0; // Required for matching
int emitCountDec = emtr->emissionCount + FX32_CAST(emtr->emissionCountFractional);
int totalEmissions = emitCountDec >> FX32_SHIFT;
int emission = 0;
emtr->emissionCountFractional = emitCountDec & FX32_DEC_MASK;
enum SPLEmissionType emitType = header->flags.emissionType;
if (emitType == SPL_EMISSION_TYPE_CIRCLE_BORDER || emitType == SPL_EMISSION_TYPE_CIRCLE_BORDER_UNIFORM || emitType == SPL_EMISSION_TYPE_CIRCLE || emitType == SPL_EMISSION_TYPE_CYLINDER_SURFACE || emitType == SPL_EMISSION_TYPE_CYLINDER || emitType == SPL_EMISSION_TYPE_HEMISPHERE_SURFACE || emitType == SPL_EMISSION_TYPE_HEMISPHERE) {
if (emitType == SPL_EMISSION_TYPE_CIRCLE_BORDER
|| emitType == SPL_EMISSION_TYPE_CIRCLE_BORDER_UNIFORM
|| emitType == SPL_EMISSION_TYPE_CIRCLE
|| emitType == SPL_EMISSION_TYPE_CYLINDER_SURFACE
|| emitType == SPL_EMISSION_TYPE_CYLINDER
|| emitType == SPL_EMISSION_TYPE_HEMISPHERE_SURFACE
|| emitType == SPL_EMISSION_TYPE_HEMISPHERE) {
SPLEmitter_ComputeOrthogonalAxes(emtr);
}

17
lib/spl/src/spl_emitter.c
View File

@ -27,13 +27,10 @@ typedef struct FieldFunc8 {
BOOL loop;
} FieldFunc8;
static void SPLUtil_SetTexture(SPLTexture *tex); // spl_set_tex
static void SPLUtil_SetTexture_Stub(SPLTexture *tex); // spl_set_tex_dummy
static void SPLUtil_SetTexture(SPLTexture *tex);
static void SPLUtil_SetTexture_Stub(SPLTexture *tex);
static void SPLManager_DrawParticles(SPLManager *mgr);
static void SPLManager_DrawChildParticles(SPLManager *mgr);
void SPLEmitter_Init(SPLEmitter *emtr, SPLResource *res, const VecFx32 *param2);
void SPLManager_DoDraw(SPLManager *mgr);
void SPLEmitter_Update(SPLManager *mgr, SPLEmitter *emtr);
static void SPLUtil_SetTexture(SPLTexture *tex)
{
@ -201,7 +198,7 @@ void SPLEmitter_Update(SPLManager *mgr, SPLEmitter *emtr)
}
for (i = 0; i < behaviorCount; i++) {
res->behaviors[i].apply(res->behaviors[i].object, ptcl, &acc, emtr);
res->behaviors[i].applyFunc(res->behaviors[i].object, ptcl, &acc, emtr);
}
ptcl->rotation += ptcl->angularVelocity;
@ -224,10 +221,8 @@ void SPLEmitter_Update(SPLManager *mgr, SPLEmitter *emtr)
// The >> 8 here is a division by 256 because emissionDelay is a fraction of the particle's lifetime represented as a u8
fx32 diff = ((fx32)ptcl->age * FX32_ONE) - (emissionDelay >> 8);
if (diff >= 0) {
if ((diff >> FX32_SHIFT) % child->misc.emissionInterval == 0) {
SPLEmitter_EmitChildren(ptcl, emtr, &mgr->inactiveParticles);
}
if (diff >= 0 && ((diff >> FX32_SHIFT) % child->misc.emissionInterval == 0)) {
SPLEmitter_EmitChildren(ptcl, emtr, &mgr->inactiveParticles);
}
}
@ -283,7 +278,7 @@ void SPLEmitter_Update(SPLManager *mgr, SPLEmitter *emtr)
}
for (i = 0; i < behaviorCount; i++) {
res->behaviors[i].apply(res->behaviors[i].object, ptcl, &acc, emtr);
res->behaviors[i].applyFunc(res->behaviors[i].object, ptcl, &acc, emtr);
}
ptcl->rotation += ptcl->angularVelocity;

21
lib/spl/src/spl_manager.c
View File

@ -10,11 +10,10 @@
#include "spl_particle.h"
#define DECODE_WH(X) ((u16)(1 << ((X) + 3)))
#define EMITTER_SHOULD_TERMINATE(emtr, header) \
(( \
(header->flags.selfMaintaining && header->emitterLifeTime != 0 && emtr->state.started && emtr->age > header->emitterLifeTime) \
|| emtr->state.terminate) \
&& emtr->particles.count == 0 && emtr->childParticles.count == 0)
#define EMITTER_SHOULD_TERMINATE(emtr, header) \
(((header->flags.selfMaintaining && header->emitterLifeTime != 0 && emtr->state.started && emtr->age > header->emitterLifeTime) \
|| emtr->state.terminate) \
&& emtr->particles.count == 0 && emtr->childParticles.count == 0)
static u32 SPLUtil_AllocTextureVRAM(u32 size, BOOL is4x4);
static u32 SPLUtil_AllocPaletteVRAM(u32 size, BOOL is4Pltt);
@ -152,42 +151,42 @@ void SPLManager_LoadResources(SPLManager *mgr, const void *data)
if (flags.hasGravityBehavior) {
behavior->object = (const void *)((u8 *)spa + offset);
behavior->apply = SPLBehavior_ApplyGravity;
behavior->applyFunc = SPLBehavior_ApplyGravity;
offset += sizeof(SPLGravityBehavior);
behavior++;
}
if (flags.hasRandomBehavior) {
behavior->object = (const void *)((u8 *)spa + offset);
behavior->apply = SPLBehavior_ApplyRandom;
behavior->applyFunc = SPLBehavior_ApplyRandom;
offset += sizeof(SPLRandomBehavior);
behavior++;
}
if (flags.hasMagnetBehavior) {
behavior->object = (const void *)((u8 *)spa + offset);
behavior->apply = SPLBehavior_ApplyMagnet;
behavior->applyFunc = SPLBehavior_ApplyMagnet;
offset += sizeof(SPLMagnetBehavior);
behavior++;
}
if (flags.hasSpinBehavior) {
behavior->object = (const void *)((u8 *)spa + offset);
behavior->apply = SPLBehavior_ApplySpin;
behavior->applyFunc = SPLBehavior_ApplySpin;
offset += sizeof(SPLSpinBehavior);
behavior++;
}
if (flags.hasCollisionPlaneBehavior) {
behavior->object = (const void *)((u8 *)spa + offset);
behavior->apply = SPLBehavior_ApplyCollisionPlane;
behavior->applyFunc = SPLBehavior_ApplyCollisionPlane;
offset += sizeof(SPLCollisionPlaneBehavior);
behavior++;
}
if (flags.hasConvergenceBehavior) {
behavior->object = (const void *)((u8 *)spa + offset);
behavior->apply = SPLBehavior_ApplyConvergence;
behavior->applyFunc = SPLBehavior_ApplyConvergence;
offset += sizeof(SPLConvergenceBehavior);
}
} else {

12
src/unk_02014000.c
View File

@ -685,32 +685,32 @@ static const void *sub_020147B8(SPLEmitter *param0, int param1)
switch (param1) {
case SPL_FLD_TYPE_GRAVITY:
if (v2->apply == SPLBehavior_ApplyGravity) {
if (v2->applyFunc == SPLBehavior_ApplyGravity) {
return v2->object;
}
continue;
case SPL_FLD_TYPE_RANDOM:
if (v2->apply == SPLBehavior_ApplyRandom) {
if (v2->applyFunc == SPLBehavior_ApplyRandom) {
return v2->object;
}
continue;
case SPL_FLD_TYPE_MAGNET:
if (v2->apply == SPLBehavior_ApplyMagnet) {
if (v2->applyFunc == SPLBehavior_ApplyMagnet) {
return v2->object;
}
continue;
case SPL_FLD_TYPE_SPIN:
if (v2->apply == SPLBehavior_ApplySpin) {
if (v2->applyFunc == SPLBehavior_ApplySpin) {
return v2->object;
}
continue;
case SPL_FLD_TYPE_SIMPLE_COLL:
if (v2->apply == SPLBehavior_ApplyCollisionPlane) {
if (v2->applyFunc == SPLBehavior_ApplyCollisionPlane) {
return v2->object;
}
break;
case SPL_FLD_TYPE_CONVERGENCE:
if (v2->apply == SPLBehavior_ApplyConvergence) {
if (v2->applyFunc == SPLBehavior_ApplyConvergence) {
return v2->object;
}
continue;