diff --git a/Source/Contents/Effects/FriggSongEffect.cpp b/Source/Contents/Effects/FriggSongEffect.cpp index 9b0315aa..2068ce1e 100644 --- a/Source/Contents/Effects/FriggSongEffect.cpp +++ b/Source/Contents/Effects/FriggSongEffect.cpp @@ -1,5 +1,6 @@ #include "Contents/Effects/FriggSongEffect.h" +#include "Contents/Effects/EffectMemoryMgr.h" #include "Contents/Effects/EffectTypes.h" #include "Contents/Effects/Particle.h" #include "Utility/Math/AffineMatrix.h" @@ -13,12 +14,89 @@ CFriggSongEffect::CFriggSongEffect() : CEffect(0x423), lastInner{} { this->unknown_002C = EffectLifetime(0x423); } +// OFFSET: 0x00701EE0 +// FUNCTION: fn_07001 +void CFriggSongEffect::Close() { + for (std::vector::iterator it = this->particles.begin(); it != this->particles.end(); ++it) { + FreeParticle(*it); + } + + this->particles.clear(); +} + +// OFFSET: 0x00701F20 +// FUNCTION: fn_07002 +void CFriggSongEffect::Slot01() { + for (int segment = 0; segment <= 21; ++segment) { + CParticle* particle = CreateParticle(reinterpret_cast(this->position), 5); + if (!particle) { + continue; + } + + particle->SetTexture("effect\\ring_blue.tga"); + particle->unknown_0004 = this->id; + particle->unknown_000C = segment; + particle->unknown_0010 = 0; + particle->unknown_0008 = 1; + particle->alpha = 50; + particle->SetColor(50, 200, 50); + particle->unknown_0050 = 360; + particle->unknown_00C0 = 120.0f; + particle->unknown_004C = 90; + float& baseAngle = *reinterpret_cast(&particle->unknown_00C4); + baseAngle = static_cast(particle->unknown_0010 * 10); + particle->scale = static_cast(particle->unknown_0010) * 0.5f + 2.5f; + (&particle->unknown_0054)[particle->unknown_0010] = 0.0f; + particle->unknown_00E8 = particle->unknown_0010; + + int angle = static_cast(static_cast(static_cast(static_cast(particle->unknown_0050) / 20.0f) * particle->unknown_000C) + baseAngle) % 360; + if (particle->unknown_000C == 20) { + angle = static_cast(baseAngle); + } + + const int tilt = particle->unknown_004C; + const float radius = particle->unknown_00C0; + vector3d points[2] = {}; + points[0].x = particle->scale * g_cosTable[angle]; + points[0].y = 0.0f; + points[0].z = particle->scale * g_sinTable[angle]; + points[1].x = points[0].x + radius * g_cosTable[tilt] * g_cosTable[angle]; + points[1].y = 0.0f - radius * g_sinTable[tilt]; + points[1].z = points[0].z + radius * g_cosTable[tilt] * g_sinTable[angle]; + + if (particle->unknown_000C >= 1 && particle->unknown_000C <= 20) { + particle->vertices[1].x = points[1].x; + particle->vertices[1].y = points[1].y; + particle->vertices[1].z = points[1].z; + particle->vertices[3].x = points[0].x; + particle->vertices[3].y = points[0].y; + particle->vertices[3].z = points[0].z; + particle->vertices[0].x = this->lastInner[1].x; + particle->vertices[0].y = this->lastInner[1].y; + particle->vertices[0].z = this->lastInner[1].z; + particle->vertices[2].x = this->lastInner[0].x; + particle->vertices[2].y = this->lastInner[0].y; + particle->vertices[2].z = this->lastInner[0].z; + } + + this->lastInner[0] = points[0]; + this->lastInner[1] = points[1]; + this->particles.push_back(particle); + } +} + // OFFSET: 0x007021A0 // FUNCTION: fn_07003 void CFriggSongEffect::Slot12() { this->AddEvent(0, "effect\\wm_frigg_song.wav", 0, 0); } +// OFFSET: 0x007023D0 +// FUNCTION: fn_07004 +bool CFriggSongEffect::Slot06() { + return !this->IsFinished(); +} + // OFFSET: 0x007023E0 // FUNCTION: fn_07005 void CFriggSongEffect::Slot03() { diff --git a/Source/Contents/Effects/FriggSongEffect.h b/Source/Contents/Effects/FriggSongEffect.h index 78f7627d..1853b5d8 100644 --- a/Source/Contents/Effects/FriggSongEffect.h +++ b/Source/Contents/Effects/FriggSongEffect.h @@ -13,8 +13,11 @@ class CFriggSongEffect : public CEffect { public: CFriggSongEffect(); + void Slot01() override; void Slot03() override; void Slot04() override; + void Close() override; + bool Slot06() override; void Slot12() override; /* 00CC */ vector3d lastInner[2];