diff --git a/Source/Contents/Effects/EffectResourceSwitcher.cpp b/Source/Contents/Effects/EffectResourceSwitcher.cpp index fbe8725fa..021465724 100644 --- a/Source/Contents/Effects/EffectResourceSwitcher.cpp +++ b/Source/Contents/Effects/EffectResourceSwitcher.cpp @@ -287,7 +287,7 @@ void CEZ2STREffectEx::Open() { return; } - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); particle->m_actorId = this->actor; particle->Load(info->name); diff --git a/Source/Contents/Effects/Particles/EZ2STREffect.cpp b/Source/Contents/Effects/Particles/EZ2STREffect.cpp index 4b03b9539..50ce278c9 100644 --- a/Source/Contents/Effects/Particles/EZ2STREffect.cpp +++ b/Source/Contents/Effects/Particles/EZ2STREffect.cpp @@ -5760,7 +5760,7 @@ void CEZ2STRScreenEffect::Open() { particle->m_loop = true; } - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->particle = particle; this->InitParticle(particle, this->id); diff --git a/Source/Contents/Effects/Particles/Particle.cpp b/Source/Contents/Effects/Particles/Particle.cpp index 849ef2cbc..f1f724a03 100644 --- a/Source/Contents/Effects/Particles/Particle.cpp +++ b/Source/Contents/Effects/Particles/Particle.cpp @@ -738,7 +738,7 @@ static __forceinline void ResetParticle(CParticle& particle) { particle.corners[i].z = 0; } - InitParticleQuad(particle.vertices); + particle.InitParticleQuad(particle.vertices); particle.submit = SubmitParticlePrimitive; } @@ -808,7 +808,7 @@ void CParticle::SetQuad(RenderVertex* vertices, float top, float bottom, float l // OFFSET: 0x00B3FC80 // FUNCTION: fn_18837 -void InitParticleQuad(RenderVertex* vertices) { +void CParticle::InitParticleQuad(RenderVertex* vertices) { vertices[0].x = -1.0f; vertices[0].y = 1.0f; vertices[0].z = 1.0f; diff --git a/Source/Contents/Effects/Particles/Particle.h b/Source/Contents/Effects/Particles/Particle.h index 84736c155..767ab5cf6 100644 --- a/Source/Contents/Effects/Particles/Particle.h +++ b/Source/Contents/Effects/Particles/Particle.h @@ -51,6 +51,7 @@ public: void Reset(); void SetQuad(RenderVertex* vertices, float top, float bottom, float left, float right); + void InitParticleQuad(RenderVertex* vertices); void Render(bool billboard, float top, float bottom, float left, float right, bool unused, bool depth); void Render(const ParticleQuad& quad); void SetColor(short redValue, short greenValue, short blueValue); @@ -166,7 +167,6 @@ public: /* 3FF4 */ int padding_3FF4; }; -void InitParticleQuad(RenderVertex* vertices); float RandomRange(float minimum, float maximum); vector2d RandomDiscPoint(float x, float y, long long radius); std::string EmitterKey(std::string effect, std::string emitter); diff --git a/Source/Contents/Effects/Skills/BindTrapEffect.cpp b/Source/Contents/Effects/Skills/BindTrapEffect.cpp index 004ba87b7..091fdc2b3 100644 --- a/Source/Contents/Effects/Skills/BindTrapEffect.cpp +++ b/Source/Contents/Effects/Skills/BindTrapEffect.cpp @@ -33,7 +33,7 @@ void CBindTrapEffect::AddParticle(int index) { particle->angleBits = 0; particle->phaseParameter = 0; particle->scale = static_cast(index) * 6.0f + 9.0f; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->particles.push_back(particle); } diff --git a/Source/Contents/Effects/Skills/ChargingPierceEffect.cpp b/Source/Contents/Effects/Skills/ChargingPierceEffect.cpp index d66004d1e..e7104ab61 100644 --- a/Source/Contents/Effects/Skills/ChargingPierceEffect.cpp +++ b/Source/Contents/Effects/Skills/ChargingPierceEffect.cpp @@ -223,7 +223,7 @@ void CChargingPierceEffect::OnProcess() { spark->SetTexture("effect\\new_chargingpierce\\cha_orb.bmp"); spark->scale = 1.5f; spark->depthOffset = 0.035f; - InitParticleQuad(spark->vertices); + spark->InitParticleQuad(spark->vertices); this->sparks[index] = spark; } } diff --git a/Source/Contents/Effects/Skills/CommonFloorEffect.cpp b/Source/Contents/Effects/Skills/CommonFloorEffect.cpp index 09ad53621..6ce78bee9 100644 --- a/Source/Contents/Effects/Skills/CommonFloorEffect.cpp +++ b/Source/Contents/Effects/Skills/CommonFloorEffect.cpp @@ -54,7 +54,7 @@ void CCommonFloorEffect::Open() { particle->phaseParameter = angle; particle->speedParameter = 6.0f; particle->scale = 15.0f; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->particles.push_back(particle); } } @@ -75,7 +75,7 @@ void CCommonFloorEffect::ResetParticles() { particle->alpha = *reinterpret_cast(this->alphaParameters); particle->sourceBlend = 5; particle->destinationBlend = 7; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); particle->elapsedFrames = 0; } } diff --git a/Source/Contents/Effects/Skills/ElectricEffect.cpp b/Source/Contents/Effects/Skills/ElectricEffect.cpp index f0b9aac1a..25d1bad7b 100644 --- a/Source/Contents/Effects/Skills/ElectricEffect.cpp +++ b/Source/Contents/Effects/Skills/ElectricEffect.cpp @@ -38,7 +38,7 @@ void CElectricEffect::AddBolt(int tilt) { particle->scale = 0.0f; *reinterpret_cast(&particle->angleBits) = spin; particle->angleParameter = 0; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->bolts.push_back(particle); float* arc = &particle->animationParameter; diff --git a/Source/Contents/Effects/Skills/EvilsPawEffect.cpp b/Source/Contents/Effects/Skills/EvilsPawEffect.cpp index de7f7b77d..0441e65cc 100644 --- a/Source/Contents/Effects/Skills/EvilsPawEffect.cpp +++ b/Source/Contents/Effects/Skills/EvilsPawEffect.cpp @@ -39,7 +39,7 @@ void CEvilsPawEffect::Open() { particle->offsetZ = this->offset.z; particle->sourceBlend = 5; particle->destinationBlend = 6; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->particles.push_back(particle); } diff --git a/Source/Contents/Effects/Skills/FlowerCastingEffect.cpp b/Source/Contents/Effects/Skills/FlowerCastingEffect.cpp index 2ff81a0f9..370f99a0a 100644 --- a/Source/Contents/Effects/Skills/FlowerCastingEffect.cpp +++ b/Source/Contents/Effects/Skills/FlowerCastingEffect.cpp @@ -80,7 +80,7 @@ void CFlowerCastingEffect::AddRing(int kind) { particle->SetColor(100, 100, 255); particle->animationParameter = 0.0f; *reinterpret_cast(particle->animationParameters) = particle->speedParameter; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->particles.push_back(particle); } } diff --git a/Source/Contents/Effects/Skills/FortuneKissEffect.cpp b/Source/Contents/Effects/Skills/FortuneKissEffect.cpp index 3a5a9ba85..5162e2f21 100644 --- a/Source/Contents/Effects/Skills/FortuneKissEffect.cpp +++ b/Source/Contents/Effects/Skills/FortuneKissEffect.cpp @@ -37,7 +37,7 @@ void CFortuneKiss::Open() { const int drift = rand() % 5; *reinterpret_cast(particle->animationParameters) = 0.0f; particle->animationParameter = -5.0f - static_cast(drift); - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->angle = rand() % 359; this->particles.push_back(particle); } diff --git a/Source/Contents/Effects/Skills/HealEffect.cpp b/Source/Contents/Effects/Skills/HealEffect.cpp index 494fc961c..bbd206236 100644 --- a/Source/Contents/Effects/Skills/HealEffect.cpp +++ b/Source/Contents/Effects/Skills/HealEffect.cpp @@ -48,7 +48,7 @@ void CHealEffect::AddSparks(int kind) { particle->offsetX = static_cast(driftX - 6); particle->offsetZ = static_cast(driftZ - 6); particle->SetColor(220, 250, 220); - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->sparkParticles.push_back(particle); switch (kind) { @@ -181,7 +181,7 @@ void CHealEffect::AddColumn(int kind) { break; } - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->columnParticles.push_back(particle); } } @@ -246,7 +246,7 @@ void CHealEffect::AddCone(int kind) { break; } - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->coneParticles.push_back(particle); } } diff --git a/Source/Contents/Effects/Skills/HitLineEffect.cpp b/Source/Contents/Effects/Skills/HitLineEffect.cpp index af01dd014..8f4cdd4f1 100644 --- a/Source/Contents/Effects/Skills/HitLineEffect.cpp +++ b/Source/Contents/Effects/Skills/HitLineEffect.cpp @@ -54,7 +54,7 @@ void CHitLineEffect::Open() { (&particle->animationState)[index] = 0; (&particle->animationParameter)[index] = 0.0f; } - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->particles.push_back(particle); } } diff --git a/Source/Contents/Effects/Skills/Level99Effect.cpp b/Source/Contents/Effects/Skills/Level99Effect.cpp index 37da9ff2b..7b4f080f5 100644 --- a/Source/Contents/Effects/Skills/Level99Effect.cpp +++ b/Source/Contents/Effects/Skills/Level99Effect.cpp @@ -60,7 +60,7 @@ void CLevel99Effect::AddRings() { particle->scale = static_cast(row) * 0.2f + 3.9f; particle->phaseParameter = tilt; particle->animationParameter = 0.0f; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->sprites.push_back(particle); if (particle) { @@ -145,7 +145,7 @@ void CLevel99Effect::Open() { *reinterpret_cast(&particle->angleBits) = static_cast(angle); particle->phaseParameter = tilt; particle->scale = 9.0f; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->sparkles.push_back(particle); } diff --git a/Source/Contents/Effects/Skills/LightSphereEffect.cpp b/Source/Contents/Effects/Skills/LightSphereEffect.cpp index 3fa5a61f0..26efb2e20 100644 --- a/Source/Contents/Effects/Skills/LightSphereEffect.cpp +++ b/Source/Contents/Effects/Skills/LightSphereEffect.cpp @@ -97,7 +97,7 @@ void CLightSphereEffect::CreateRayParticles(int param) { } } - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->rays.push_back(particle); } } @@ -146,7 +146,7 @@ void CLightSphereEffect::Open() { break; } - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->spheres.push_back(particle); } } diff --git a/Source/Contents/Effects/Skills/MagicFloorEffect.cpp b/Source/Contents/Effects/Skills/MagicFloorEffect.cpp index 3a69e80e1..070dd4df1 100644 --- a/Source/Contents/Effects/Skills/MagicFloorEffect.cpp +++ b/Source/Contents/Effects/Skills/MagicFloorEffect.cpp @@ -41,7 +41,7 @@ void CMagicFloorEffect::AddFloors() { *reinterpret_cast(&particle->angleBits) = 0.0f; particle->phaseParameter = 0; particle->scale = 30.0f; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->floors.push_back(particle); } } @@ -79,7 +79,7 @@ void CMagicFloorEffect::AddClouds(int layer) { particle->scale = 22.0f; } - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->particles.push_back(particle); } } @@ -124,7 +124,7 @@ void CMagicFloorEffect::ResetParticles() { particle->alpha = *reinterpret_cast(this->alphaParameters); particle->sourceBlend = 5; particle->destinationBlend = 7; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); particle->elapsedFrames = 0; } } diff --git a/Source/Contents/Effects/Skills/MapChainEffect.cpp b/Source/Contents/Effects/Skills/MapChainEffect.cpp index 58c69e2ea..328263c6c 100644 --- a/Source/Contents/Effects/Skills/MapChainEffect.cpp +++ b/Source/Contents/Effects/Skills/MapChainEffect.cpp @@ -36,7 +36,7 @@ void CMapChainEffect::CreateChainParticles(int param) { particle->animationParameter = -14.0f; *reinterpret_cast(particle->animationParameters) = 1.0f; particle->destinationBlend = 6; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); particle->SetTexture("effect\\hero_005.tga"); this->particles.push_back(particle); } @@ -62,7 +62,7 @@ void CMapChainEffect::CreateChainParticles(int param) { *reinterpret_cast(particle->animationParameters) = 1.0f; particle->sourceBlend = 5; particle->destinationBlend = 7; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); particle->SetTexture("effect\\hero_005.tga"); this->particles.push_back(particle); } @@ -107,7 +107,7 @@ void CMapChainEffect::ResetParticles() { *reinterpret_cast(particle->animationParameters) = *reinterpret_cast(base + 0x60); particle->sourceBlend = 5; particle->destinationBlend = 7; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); particle->elapsedFrames = 0; } } diff --git a/Source/Contents/Effects/Skills/MapMagicZoneEffect.cpp b/Source/Contents/Effects/Skills/MapMagicZoneEffect.cpp index c4a9da5de..0a10c7ed5 100644 --- a/Source/Contents/Effects/Skills/MapMagicZoneEffect.cpp +++ b/Source/Contents/Effects/Skills/MapMagicZoneEffect.cpp @@ -41,7 +41,7 @@ void CMapMagicZoneEffect::AddSpinner(int kind) { particle->scale = 30.0f; particle->phaseParameter = 0; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->spinners.push_back(particle); } } @@ -85,7 +85,7 @@ void CMapMagicZoneEffect::Open() { *reinterpret_cast(&particle->angleBits) = 0.0f; particle->alpha = 25; particle->animationParameter = -1.0f; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->petals.push_back(particle); } @@ -110,7 +110,7 @@ void CMapMagicZoneEffect::Open() { particle->scale = static_cast(row) * 0.2f + 12.9f; particle->phaseParameter = height; particle->animationParameter = 0.0f; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->ribbon.push_back(particle); } } diff --git a/Source/Contents/Effects/Skills/MonsterSkillEffects.cpp b/Source/Contents/Effects/Skills/MonsterSkillEffects.cpp index 79111efaa..9a5e673be 100644 --- a/Source/Contents/Effects/Skills/MonsterSkillEffects.cpp +++ b/Source/Contents/Effects/Skills/MonsterSkillEffects.cpp @@ -624,7 +624,7 @@ void CWarningPlaneEffect::AddPlane(vector3d position) { particle->position.x = position.x; particle->position.y = position.y; particle->position.z = position.z; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->emitters.push_back(particle); } } @@ -670,7 +670,7 @@ void CCylinderEffect::Open() { particle->columnIndex = static_cast(i); particle->rowIndex = 0; particle->groupIndex = 1; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); particle->angleBits = 0; if (this->id == 2077) { particle->SetTexture("effect\\nipelheim\\nipelheim_cast\\nip_cast.tga"); @@ -933,7 +933,7 @@ void CFallenAngelEffect::Open() { AsParticle(this->emitter)->Restart(); } - InitParticleQuad(AsParticle(this->emitter)->vertices); + AsParticle(this->emitter)->InitParticleQuad(AsParticle(this->emitter)->vertices); this->startX = this->position[0]; this->startY = this->position[1]; this->startZ = this->position[2]; @@ -1136,7 +1136,7 @@ CParticle* CFootprintEffect::SpawnFootprint() { particle->destinationBlend = 6; particle->speedParameter = static_cast(*reinterpret_cast(this->alphaParameters)) / static_cast(this->effectLifetime * 60); particle->SetTexture(texture); - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); const float angle = ScreenAngle(&this->lastPosition.x, this->position, static_cast(g_modeMgr.GetGameMode())->camera->frame.view.values) + 90.0f; @@ -1816,7 +1816,7 @@ void CDropItemEffect::Open() { return; } - InitParticleQuad(AsParticle(emitter)->vertices); + AsParticle(emitter)->InitParticleQuad(AsParticle(emitter)->vertices); this->emitters.push_back(emitter); } @@ -2123,7 +2123,7 @@ void CNewCloudKillEffect::OnProcess() { *reinterpret_cast(&particle->angleBits) = 0.0f; particle->elapsedFrames = 60; particle->animationState = 0; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); } if (CEZ2STRParticle* particle = AsParticle(*it)) { @@ -2660,7 +2660,7 @@ void CRandomOptEffect::Init() { break; } - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->particles.push_back(particle); if (particle) { @@ -2806,7 +2806,7 @@ void CRichsCoinEffect::Open() { particle->SetTexture("effect\\rl_richs_coin_b\\rcoin1.bmp"); particle->animationParameter = static_cast(360 / count * i) / 180.0f * 3.141592f - 10.0f; reinterpret_cast(particle->animationParameters) = 0.0f; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->particles.push_back(particle); } } @@ -2825,7 +2825,7 @@ void CRichsCoinEffect::Open() { scale.SetScale(1.5f, 1.5f, 1.0f); particle->transform = scale; particle->alpha = 70; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->coins.push_back(particle); } } @@ -3244,7 +3244,7 @@ void CNewCloudKillEffect::ResetMistParticle(CParticle* particle) { *reinterpret_cast(particle->effectParameters) = ClampedRandom(50) + 150; particle->animationState = 0; particle->elapsedFrames = 0; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); const int spread = ClampedRandom(15) + 2; const int angle = ClampedRandom(360); @@ -3274,7 +3274,7 @@ void CNewCloudKillEffect::Open() { circle->angleBits = 0; circle->elapsedFrames = 60; circle->animationState = 0; - InitParticleQuad(circle->vertices); + circle->InitParticleQuad(circle->vertices); this->circleEmitters.push_back(circleEmitter); } @@ -3351,7 +3351,7 @@ void CNewCloudKillEffect::ResetCloudParticle(CParticle* particle) { particle->scale = static_cast(ClampedRandom(31)) * 0.1f + 2.0f; particle->speedParameter = static_cast(ClampedRandom(31)) * 0.01f + 0.05f; particle->animationState = 0; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); } // OFFSET: 0x0071DC70 @@ -3366,7 +3366,7 @@ void CNewCloudKillEffect::ResetLightning(CParticle* particle) { particle->offsetX = static_cast(ClampedRandom(10)) - 5.0f; particle->offsetY = -10.0f; particle->elapsedFrames = 0; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); } // OFFSET: 0x0071DD80 @@ -3375,7 +3375,7 @@ void CNewCloudKillEffect::ResetSmokeParticle(CParticle* particle) { particle->alpha = 0; particle->animationState = 0; particle->elapsedFrames = 0; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); particle->scale = static_cast(ClampedRandom(51)) * 0.1f + 7.0f; particle->offsetY = particle->scale * -0.5f; @@ -4745,7 +4745,7 @@ void CGravityControlEffect::Open() { if (particle) { particle->m_loop = true; particle->Open("WL_TELEKINESIS_INTENSE.str"); - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->target = reinterpret_cast(particle); } break; diff --git a/Source/Contents/Effects/Skills/NyanggrassEffect.cpp b/Source/Contents/Effects/Skills/NyanggrassEffect.cpp index 0aaf30107..fa7143023 100644 --- a/Source/Contents/Effects/Skills/NyanggrassEffect.cpp +++ b/Source/Contents/Effects/Skills/NyanggrassEffect.cpp @@ -163,7 +163,7 @@ void CNyanggrassEffect::Open() { effect->position.x = static_cast((column - half) * 5) + origin.x; effect->position.y = origin.y; effect->position.z = static_cast((row - half) * 5) + origin.z; - InitParticleQuad(effect->vertices); + effect->InitParticleQuad(effect->vertices); effect->Open("su_nyanggrass\\su_nyanggrass.str"); this->particles.push_back(particle); } diff --git a/Source/Contents/Effects/Skills/PokJukEffect.cpp b/Source/Contents/Effects/Skills/PokJukEffect.cpp index 84dd41364..51867e06d 100644 --- a/Source/Contents/Effects/Skills/PokJukEffect.cpp +++ b/Source/Contents/Effects/Skills/PokJukEffect.cpp @@ -37,7 +37,7 @@ void CPokJukEffect::SpawnParticles() { particle->scale = static_cast(ClampedRandom(100)) * 0.004f + 0.4f; particle->angleParameter = ClampedRandom(360); particle->phaseParameter = ClampedRandom(360); - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->particles.push_back(particle); const int index = column + rowStart; diff --git a/Source/Contents/Effects/Skills/PowderingEffect.cpp b/Source/Contents/Effects/Skills/PowderingEffect.cpp index 1b0d8a77d..b06a88813 100644 --- a/Source/Contents/Effects/Skills/PowderingEffect.cpp +++ b/Source/Contents/Effects/Skills/PowderingEffect.cpp @@ -74,7 +74,7 @@ void CPowderingEffect::Open() { particle->offsetZ = static_cast(offsetZ); this->InitSmokeParticle(particle); - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->smokeParticles.push_back(particle); } @@ -95,7 +95,7 @@ void CPowderingEffect::Open() { particle->SetAction("이팩트\\particle2.act"); this->InitSpriteParticle(particle); - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->spriteParticles.push_back(particle); } } diff --git a/Source/Contents/Effects/Skills/RainbowEffect.cpp b/Source/Contents/Effects/Skills/RainbowEffect.cpp index 13e6905d7..56fc42526 100644 --- a/Source/Contents/Effects/Skills/RainbowEffect.cpp +++ b/Source/Contents/Effects/Skills/RainbowEffect.cpp @@ -39,7 +39,7 @@ void CRainbowEffect::Open() { particle->angleParameter = 180; particle->angleBits = 0; particle->phaseParameter = angle; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->bands.push_back(particle); } } diff --git a/Source/Contents/Effects/Skills/RectUpEffect.cpp b/Source/Contents/Effects/Skills/RectUpEffect.cpp index eb5b13fe6..907370eaa 100644 --- a/Source/Contents/Effects/Skills/RectUpEffect.cpp +++ b/Source/Contents/Effects/Skills/RectUpEffect.cpp @@ -177,7 +177,7 @@ void CRectUpEffect::Open() { particle->phaseParameter = 0; } this->InitParticle(particle); - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->particles.push_back(particle); } } diff --git a/Source/Contents/Effects/Skills/RedLineEffect.cpp b/Source/Contents/Effects/Skills/RedLineEffect.cpp index 0f5a5e6ba..fbca51d34 100644 --- a/Source/Contents/Effects/Skills/RedLineEffect.cpp +++ b/Source/Contents/Effects/Skills/RedLineEffect.cpp @@ -46,7 +46,7 @@ void CRedLineEffect::CreateLines(int layer) { particle->offsetY = 0.0f; particle->elapsedFrames = life; particle->animationParameter = static_cast(layer); - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->lines.push_back(particle); } } diff --git a/Source/Contents/Effects/Skills/RichManKim.cpp b/Source/Contents/Effects/Skills/RichManKim.cpp index ba59b56ae..2405228ad 100644 --- a/Source/Contents/Effects/Skills/RichManKim.cpp +++ b/Source/Contents/Effects/Skills/RichManKim.cpp @@ -36,7 +36,7 @@ void CRichManKim::Open() { particle->animationParameter = -5.0f - static_cast(rand() % 5); *reinterpret_cast(particle->animationParameters) = 0.0f; particle->SetColor(200, 200, 200); - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->angleIndex = rand() % 359; this->particles.push_back(particle); } diff --git a/Source/Contents/Effects/Skills/SaintCastingEffect.cpp b/Source/Contents/Effects/Skills/SaintCastingEffect.cpp index 9cb6a39f7..c05c202c4 100644 --- a/Source/Contents/Effects/Skills/SaintCastingEffect.cpp +++ b/Source/Contents/Effects/Skills/SaintCastingEffect.cpp @@ -77,7 +77,7 @@ void CSaintCastingEffect::AddRing(const char* texture, int alpha) { break; } - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->particles.push_back(particle); } } diff --git a/Source/Contents/Effects/Skills/SoulCollectEffect.cpp b/Source/Contents/Effects/Skills/SoulCollectEffect.cpp index 5792aaca3..9e80f021b 100644 --- a/Source/Contents/Effects/Skills/SoulCollectEffect.cpp +++ b/Source/Contents/Effects/Skills/SoulCollectEffect.cpp @@ -60,7 +60,7 @@ void CSoulCollectEffect::Open() { } else if (layer == 1) { particle->depthOffset = 0.00002f; } - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->particles.push_back(particle); } } diff --git a/Source/Contents/Effects/Skills/SoulUnityEffect.cpp b/Source/Contents/Effects/Skills/SoulUnityEffect.cpp index 196df00b9..110d0579d 100644 --- a/Source/Contents/Effects/Skills/SoulUnityEffect.cpp +++ b/Source/Contents/Effects/Skills/SoulUnityEffect.cpp @@ -41,7 +41,7 @@ void CSoulUnityEffect::Open() { particle->groupIndex = 1; particle->scale = 2.5f; particle->depthOffset = 0.035f; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->particles.push_back(particle); } } diff --git a/Source/Contents/Effects/Skills/SphereWind2Effect.cpp b/Source/Contents/Effects/Skills/SphereWind2Effect.cpp index 11109442d..9c4ce94e7 100644 --- a/Source/Contents/Effects/Skills/SphereWind2Effect.cpp +++ b/Source/Contents/Effects/Skills/SphereWind2Effect.cpp @@ -56,7 +56,7 @@ void CSphereWind2Effect::Open() { *reinterpret_cast(particle->animationParameters) = static_cast(speed); particle->SetTexture("effect\\fire_ivy.bmp"); particle->SetColor(255, 89, 182); - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->particles.push_back(particle); } diff --git a/Source/Contents/Effects/Skills/SphereWindEffect.cpp b/Source/Contents/Effects/Skills/SphereWindEffect.cpp index ce6ed92d2..25718dc8a 100644 --- a/Source/Contents/Effects/Skills/SphereWindEffect.cpp +++ b/Source/Contents/Effects/Skills/SphereWindEffect.cpp @@ -56,7 +56,7 @@ void CSphereWindEffect::Open() { particle->angleParameter = spread; particle->animationParameter = -14.0f; *reinterpret_cast(particle->animationParameters) = static_cast(spin); - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->particles.push_back(particle); if (id == 346) { diff --git a/Source/Contents/Effects/Skills/StormKickEffect.cpp b/Source/Contents/Effects/Skills/StormKickEffect.cpp index e967c6941..998788aa3 100644 --- a/Source/Contents/Effects/Skills/StormKickEffect.cpp +++ b/Source/Contents/Effects/Skills/StormKickEffect.cpp @@ -76,7 +76,7 @@ void CStormKickEffect::CreateStorms(int layer) { break; } - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->storms.push_back(particle); this->UpdateStorm(particle); } @@ -120,7 +120,7 @@ void CStormKickEffect::CreateClouds(int layer) { particle->scale = 5.0f - ring; } - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->clouds.push_back(particle); } diff --git a/Source/Contents/Effects/Skills/SunStanceEffect.cpp b/Source/Contents/Effects/Skills/SunStanceEffect.cpp index 596d31664..cb346b89f 100644 --- a/Source/Contents/Effects/Skills/SunStanceEffect.cpp +++ b/Source/Contents/Effects/Skills/SunStanceEffect.cpp @@ -66,7 +66,7 @@ void CSunStanceEffect::Open() { particle->alpha = 255; particle->scale = 3.0f; particle->animationParameter = static_cast(index) * 2.0943947f; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->particles.push_back(particle); } } diff --git a/Source/Contents/Effects/Skills/TalismanMarkEffect.cpp b/Source/Contents/Effects/Skills/TalismanMarkEffect.cpp index ccf7203db..dc733e633 100644 --- a/Source/Contents/Effects/Skills/TalismanMarkEffect.cpp +++ b/Source/Contents/Effects/Skills/TalismanMarkEffect.cpp @@ -87,7 +87,7 @@ void CTalismanMarkEffect::PlayEnd() { particle->columnIndex = index; particle->rowIndex = 0; particle->groupIndex = 1; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); particle->m_actorId = this->actor; particle->Load(s_talismanEndEffects.at(index)); particle->phaseParameter = angle; @@ -111,7 +111,7 @@ void CTalismanMarkEffect::Open() { particle->columnIndex = i; particle->rowIndex = 0; particle->groupIndex = 1; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); particle->m_actorId = this->actor; particle->Load(s_talismanStartEffects.at(i)); particle->phaseParameter = (i / 2 + i % 2 * 2) * 90; @@ -150,7 +150,7 @@ void CTalismanMarkEffect::OnProcess() { particle->columnIndex = index; particle->rowIndex = 0; particle->groupIndex = 1; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); particle->m_actorId = this->actor; particle->Load(s_talismanLoopEffects.at(index)); particle->phaseParameter = angle; diff --git a/Source/Contents/Effects/Skills/ThrowEffects.cpp b/Source/Contents/Effects/Skills/ThrowEffects.cpp index 6062e52b3..61dbcb04b 100644 --- a/Source/Contents/Effects/Skills/ThrowEffects.cpp +++ b/Source/Contents/Effects/Skills/ThrowEffects.cpp @@ -508,7 +508,7 @@ void CVolcanoEffect::AddRings() { break; } - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); this->particles.push_back(particle); } diff --git a/Source/Contents/Effects/Skills/WindEffect.cpp b/Source/Contents/Effects/Skills/WindEffect.cpp index a9c05f57f..4185e5bd6 100644 --- a/Source/Contents/Effects/Skills/WindEffect.cpp +++ b/Source/Contents/Effects/Skills/WindEffect.cpp @@ -50,7 +50,7 @@ void CWindEffect::Init() { particle->SetTexture(this->textureName); *reinterpret_cast(&particle->angleBits) = static_cast(segment) * step + static_cast(startAngle); particle->animationState = 0; - InitParticleQuad(particle->vertices); + particle->InitParticleQuad(particle->vertices); particle->effectId = this->id; particle->columnIndex = segment; particle->rowIndex = ring;