diff options
Diffstat (limited to 'src/engine/particles')
| -rw-r--r-- | src/engine/particles/ParticleEmitter.cpp | 17 | ||||
| -rw-r--r-- | src/engine/particles/ParticleEmitter.h | 8 | ||||
| -rw-r--r-- | src/engine/particles/StarEmitter.cpp | 8 | ||||
| -rw-r--r-- | src/engine/particles/StarEmitter.h | 9 |
4 files changed, 21 insertions, 21 deletions
diff --git a/src/engine/particles/ParticleEmitter.cpp b/src/engine/particles/ParticleEmitter.cpp index 5154abf56..c1a66ae98 100644 --- a/src/engine/particles/ParticleEmitter.cpp +++ b/src/engine/particles/ParticleEmitter.cpp @@ -2,12 +2,15 @@ #include "ParticleEmitter.h" +ParticleEmitter::ParticleEmitter() { +} +// Virtual functions to be overridden by derived classes +void ParticleEmitter::Tick() { +} +void ParticleEmitter::Draw(s32 cameraId) { +} -ParticleEmitter::ParticleEmitter() {} - - // Virtual functions to be overridden by derived classes -void ParticleEmitter::Tick() { } -void ParticleEmitter::Draw(s32 cameraId) { } - -bool ParticleEmitter::IsMod() { return false; } +bool ParticleEmitter::IsMod() { + return false; +} diff --git a/src/engine/particles/ParticleEmitter.h b/src/engine/particles/ParticleEmitter.h index 1a71164d1..8197d4b97 100644 --- a/src/engine/particles/ParticleEmitter.h +++ b/src/engine/particles/ParticleEmitter.h @@ -8,10 +8,9 @@ extern "C" { #include "camera.h" #include "common_structs.h" - class ParticleEmitter { -public: - virtual ~ParticleEmitter() = default; // Virtual destructor for proper cleanup in derived classes + public: + virtual ~ParticleEmitter() = default; // Virtual destructor for proper cleanup in derived classes explicit ParticleEmitter(); @@ -19,5 +18,4 @@ public: virtual void Draw(s32 cameraId); virtual bool IsMod(); }; - -}
\ No newline at end of file +} diff --git a/src/engine/particles/StarEmitter.cpp b/src/engine/particles/StarEmitter.cpp index 242e1a75a..fcf187180 100644 --- a/src/engine/particles/StarEmitter.cpp +++ b/src/engine/particles/StarEmitter.cpp @@ -101,7 +101,7 @@ void StarEmitter::Draw(s32 cameraId) { // func_80054BE8 Camera* camera; camera = &camera1[cameraId]; - gSPDisplayList(gDisplayListHead++, (Gfx*)D_0D007AE0); + gSPDisplayList(gDisplayListHead++, (Gfx*) D_0D007AE0); load_texture_block_ia8_nomirror(D_8018D488, 0x00000020, 0x00000020); func_8004B35C(0x000000FF, 0x000000FF, 0, 0x000000FF); D_80183E80[0] = 0; @@ -121,8 +121,8 @@ void StarEmitter::func_80054AFC(s32 objectIndex, Vec3f arg1) { (s32) gObjectList[objectIndex].unk_084[2], (s32) gObjectList[objectIndex].primAlpha); rsp_set_matrix_transformation(gObjectList[objectIndex].pos, (u16*) D_80183E80, gObjectList[objectIndex].sizeScaling); - gSPVertex(gDisplayListHead++, (uintptr_t)D_0D005AE0, 4, 0); - gSPDisplayList(gDisplayListHead++, (Gfx*)common_rectangle_display); + gSPVertex(gDisplayListHead++, (uintptr_t) D_0D005AE0, 4, 0); + gSPDisplayList(gDisplayListHead++, (Gfx*) common_rectangle_display); } void StarEmitter::func_80077428(s32 objectIndex) { @@ -176,4 +176,4 @@ void StarEmitter::func_80077450(s32 objectIndex) { gObjectList[objectIndex].unk_084[1] = sp3A; gObjectList[objectIndex].unk_084[2] = sp38; } -}
\ No newline at end of file +} diff --git a/src/engine/particles/StarEmitter.h b/src/engine/particles/StarEmitter.h index e1c6e0416..a5d37fece 100644 --- a/src/engine/particles/StarEmitter.h +++ b/src/engine/particles/StarEmitter.h @@ -20,11 +20,10 @@ extern "C" { * Used in the podium ceremony when the trophy appears */ class StarEmitter : public ParticleEmitter { -public: - enum Behaviour : uint16_t { - }; + public: + enum Behaviour : uint16_t {}; -public: + public: f32 Diameter = 0.0f; // Waddle in a circle around the spawn point at this diameter. uint16_t MirrorModeAngleOffset; @@ -38,7 +37,7 @@ public: void func_80077450(s32 objectIndex); void func_80054AFC(s32 objectIndex, Vec3f arg1); -private: + private: s32 ObjectIndex[128]; s32 _next = 0; }; |
