From 0b9e50a7116a9e6e2256df5aacf84027b1242ed2 Mon Sep 17 00:00:00 2001 From: bsxf47 Date: Thu, 5 Oct 2023 19:39:41 +0200 Subject: [PATCH] MagicFlare: Fix code style --- src/graphics/particle/MagicFlare.cpp | 84 ++++++++++++++-------------- src/graphics/particle/MagicFlare.h | 8 +-- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/graphics/particle/MagicFlare.cpp b/src/graphics/particle/MagicFlare.cpp index 78622b2938..55c9467041 100644 --- a/src/graphics/particle/MagicFlare.cpp +++ b/src/graphics/particle/MagicFlare.cpp @@ -42,10 +42,10 @@ #include "math/RandomVector.h" struct FLARETC { - TextureContainer* lumignon; - TextureContainer* lumignon2; - TextureContainer* plasm; - TextureContainer* shine[10]; + TextureContainer * lumignon; + TextureContainer * lumignon2; + TextureContainer * plasm; + TextureContainer * shine[10]; }; static FLARETC g_magicFlareTextures; @@ -69,9 +69,9 @@ class MagicFlare { void update(bool isMagicCastKeyPressed); void clear(); - void init2DPos(const Vec2f& pos); - void init3DPos(const Vec2f& pos); - TextureContainer* getTexContainer(); + void init2DPos(const Vec2f & pos); + void init3DPos(const Vec2f & pos); + TextureContainer * getTexContainer(); private: short m_currentShineTex = 1; @@ -142,13 +142,13 @@ void MagicFlare::clear() { m_currentShineTex = 1; } -void MagicFlare::init2DPos(const Vec2f& pos) { +void MagicFlare::init2DPos(const Vec2f & pos) { pos2D.x = pos.x - Random::getf(0.f, 4.f); pos2D.y = pos.y - Random::getf(0.f, 4.f); } -void MagicFlare::init3DPos(const Vec2f& pos) { +void MagicFlare::init3DPos(const Vec2f & pos) { if(!m_isBookFlare) { if(io) { @@ -165,9 +165,9 @@ void MagicFlare::init3DPos(const Vec2f& pos) { } } -TextureContainer* MagicFlare::getTexContainer() { +TextureContainer * MagicFlare::getTexContainer() { - TextureContainer* tc = nullptr; + TextureContainer * tc = nullptr; switch(type) { case 2: tc = g_magicFlareTextures.lumignon; break; case 3: tc = g_magicFlareTextures.lumignon2; break; @@ -189,19 +189,19 @@ class MagicFlareContainer { class iterator { using iterator_category = std::forward_iterator_tag; public: - iterator(MagicFlare* ptr) : m_ptr(ptr) {} + iterator(MagicFlare * ptr) : m_ptr(ptr) {} iterator operator++() { ++m_ptr; return *this; } iterator operator++(int a) { a++; iterator tmp = *this; ++(*this); return tmp; } - MagicFlare* operator->() { return m_ptr; } - MagicFlare& operator*() const { return *m_ptr; } + MagicFlare * operator->() { return m_ptr; } + MagicFlare & operator*() const { return *m_ptr; } - friend bool operator== (const iterator& a, const iterator& b) { return a.m_ptr == b.m_ptr; } - friend bool operator!= (const iterator& a, const iterator& b) { return a.m_ptr != b.m_ptr; } + friend bool operator== (const iterator & a, const iterator & b) { return a.m_ptr == b.m_ptr; } + friend bool operator!= (const iterator & a, const iterator & b) { return a.m_ptr != b.m_ptr; } private: - MagicFlare* m_ptr; + MagicFlare * m_ptr; }; size_t validFlareCount(); - MagicFlare& newFlare(); + MagicFlare & newFlare(); iterator begin() { return iterator(&m_flares[0]); } iterator end() { return iterator(&m_flares[m_magicFlaresMax]); } @@ -215,10 +215,10 @@ class MagicFlareContainer { class MagicFlareHandler { public: MagicFlareHandler(); - void addFlare(const Vec2f& pos, float sm, bool useVariedFlares, Entity* io, bool bookDraw); - void addFlareLine(const Vec2f& fromPos, const Vec2f& toPos, Entity* io); + void addFlare(const Vec2f & pos, float sm, bool useVariedFlares, Entity * io, bool bookDraw); + void addFlareLine(const Vec2f & fromPos, const Vec2f & toPos, Entity * io); long countWithoutIO(); - void removeEntityPtrFromFlares(const Entity* entity); + void removeEntityPtrFromFlares(const Entity * entity); void init(); void removeAll(); void update(); @@ -229,7 +229,7 @@ class MagicFlareHandler { Color3f newFlareColor(); void loadTextures(); - void createParticleDefs(const MagicFlare& flare); + void createParticleDefs(const MagicFlare & flare); }; static MagicFlareHandler g_magicFlares; @@ -241,7 +241,7 @@ MagicFlareHandler::MagicFlareHandler() size_t MagicFlareContainer::validFlareCount() { size_t count = 0; - for(auto& flare : m_flares) { + for(auto & flare : m_flares) { if(flare.isValid) { count++; } @@ -249,7 +249,7 @@ size_t MagicFlareContainer::validFlareCount() { return count; } -MagicFlare& MagicFlareContainer::newFlare() { +MagicFlare & MagicFlareContainer::newFlare() { size_t index = findUsableIndex(); return m_flares[index]; @@ -298,7 +298,7 @@ Color3f MagicFlareHandler::newFlareColor() { return newColor; } -void MagicFlareHandler::createParticleDefs(const MagicFlare& flare) { +void MagicFlareHandler::createParticleDefs(const MagicFlare & flare) { for(unsigned int kk = 0; kk < 3; kk++) { @@ -306,7 +306,7 @@ void MagicFlareHandler::createParticleDefs(const MagicFlare& flare) { continue; } - PARTICLE_DEF* pd = createParticle(true); + PARTICLE_DEF * pd = createParticle(true); if(!pd) { break; } @@ -337,9 +337,9 @@ void MagicFlareHandler::createParticleDefs(const MagicFlare& flare) { } } -void MagicFlareHandler::addFlare(const Vec2f& pos, float sm, bool useVariedFlares, Entity* io, bool bookDraw) { +void MagicFlareHandler::addFlare(const Vec2f & pos, float sm, bool useVariedFlares, Entity * io, bool bookDraw) { - MagicFlare& flare = m_flares.newFlare(); + MagicFlare & flare = m_flares.newFlare(); flare.isValid = true; flare.m_isBookFlare = bookDraw; @@ -369,7 +369,7 @@ void MagicFlareHandler::addFlare(const Vec2f& pos, float sm, bool useVariedFlare createParticleDefs(flare); } -void MagicFlareHandler::addFlareLine(const Vec2f& fromPos, const Vec2f& toPos, Entity* io) { +void MagicFlareHandler::addFlareLine(const Vec2f & fromPos, const Vec2f & toPos, Entity * io) { static const int FLARELINESTEP = 7; static const int FLARELINERND = 6; @@ -409,7 +409,7 @@ void MagicFlareHandler::addFlareLine(const Vec2f& fromPos, const Vec2f& toPos, E long MagicFlareHandler::countWithoutIO() { long count = 0; - for(auto &flare : m_flares) { + for(auto & flare : m_flares) { if(flare.isValid && !flare.io) { count++; } @@ -418,9 +418,9 @@ long MagicFlareHandler::countWithoutIO() { return count; } -void MagicFlareHandler::removeEntityPtrFromFlares(const Entity* entity) { +void MagicFlareHandler::removeEntityPtrFromFlares(const Entity * entity) { - for(auto& flare : m_flares) { + for(auto & flare : m_flares) { if(flare.isValid && flare.io == entity) { flare.io = nullptr; } @@ -429,7 +429,7 @@ void MagicFlareHandler::removeEntityPtrFromFlares(const Entity* entity) { void MagicFlareHandler::init() { - for(auto &flare : m_flares) { + for(auto & flare : m_flares) { flare.isValid = false; } @@ -438,7 +438,7 @@ void MagicFlareHandler::init() { void MagicFlareHandler::removeAll() { - for(auto& flare : m_flares) { + for(auto & flare : m_flares) { flare.clear(); } } @@ -453,15 +453,15 @@ void MagicFlareHandler::update() { RenderMaterial mat; mat.setBlendType(RenderMaterial::Additive); - EERIE_LIGHT* light = lightHandleGet(torchLightHandle); + EERIE_LIGHT * light = lightHandleGet(torchLightHandle); - for(auto& flare : m_flares) { + for(auto & flare : m_flares) { if(!flare.isValid) { continue; } - TextureContainer* surf = flare.getTexContainer(); + TextureContainer * surf = flare.getTexContainer(); mat.setTexture(surf); @@ -469,7 +469,7 @@ void MagicFlareHandler::update() { light->rgb = componentwise_max(light->rgb, flare.currentColor); - EERIE_LIGHT* el = lightHandleGet(flare.dynlight); + EERIE_LIGHT * el = lightHandleGet(flare.dynlight); if(el) { el->pos = flare.pos3D; el->rgb = flare.currentColor; @@ -543,17 +543,17 @@ void AddFlare(const Vec2f & pos, float sm, bool useVariedFlares, Entity * io, bo g_magicFlares.addFlare(pos, sm, useVariedFlares, io, bookDraw); } -void AddBookFlare(const Vec2f& pos, float sm, Entity* io) { +void AddBookFlare(const Vec2f & pos, float sm, Entity * io) { g_magicFlares.addFlare(pos, sm, false, io, true); } -void AddNPCFlare(const Vec2f& pos, float sm, Entity* io) { +void AddNPCFlare(const Vec2f & pos, float sm, Entity * io) { g_magicFlares.addFlare(pos, sm, false, io, false); } -void AddPlayerCastFlare(const Vec2f& pos, float sm) { +void AddPlayerCastFlare(const Vec2f & pos, float sm) { if(Random::getf() > 0.6f) g_magicFlares.addFlare(pos, sm, true, nullptr, false); @@ -561,7 +561,7 @@ void AddPlayerCastFlare(const Vec2f& pos, float sm) { g_magicFlares.addFlare(pos, sm, false, nullptr, false); } -void FlareLine(const Vec2f& fromPos, const Vec2f& toPos, Entity* io) { +void FlareLine(const Vec2f & fromPos, const Vec2f & toPos, Entity * io) { g_magicFlares.addFlareLine(fromPos, toPos, io); } diff --git a/src/graphics/particle/MagicFlare.h b/src/graphics/particle/MagicFlare.h index 203cce95e2..4098333e14 100644 --- a/src/graphics/particle/MagicFlare.h +++ b/src/graphics/particle/MagicFlare.h @@ -30,11 +30,11 @@ long MagicFlareCountWithoutIO(); void ARX_MAGICAL_FLARES_FirstInit(); void ARX_MAGICAL_FLARES_KillAll(); void MagicFlareChangeColor(); -void AddBookFlare(const Vec2f& pos, float sm, Entity* io); -void AddNPCFlare(const Vec2f& pos, float sm, Entity* io); -void AddPlayerCastFlare(const Vec2f& pos, float sm); +void AddBookFlare(const Vec2f & pos, float sm, Entity * io); +void AddNPCFlare(const Vec2f & pos, float sm, Entity * io); +void AddPlayerCastFlare(const Vec2f & pos, float sm); void AddFlare(const Vec2f & pos, float sm, bool useVariedFlares, Entity * io = nullptr, bool bookDraw = false); -void FlareLine(const Vec2f& pos0, const Vec2f& pos1, Entity * io = nullptr); +void FlareLine(const Vec2f & pos0, const Vec2f & pos1, Entity * io = nullptr); void ARX_MAGICAL_FLARES_Update(); #endif // ARX_GRAPHICS_PARTICLE_MAGICFLARE_H