From 1ee62de5ae283068baa8275a01d2245fd2cb7759 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 18 May 2014 20:11:02 +0300 Subject: Move particlevector into separate file. --- src/CMakeLists.txt | 2 + src/Makefile.am | 2 + src/being/actorsprite.h | 1 + src/particle/particlecontainer.cpp | 76 +-------------------------- src/particle/particlecontainer.h | 104 ++++++++++++------------------------- src/particle/particlevector.cpp | 99 +++++++++++++++++++++++++++++++++++ src/particle/particlevector.h | 66 +++++++++++++++++++++++ 7 files changed, 206 insertions(+), 144 deletions(-) create mode 100644 src/particle/particlevector.cpp create mode 100644 src/particle/particlevector.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1443f2cdf..e757f3e6d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -832,6 +832,8 @@ SET(SRCS particle/particleinfo.h particle/particlelist.cpp particle/particlelist.h + particle/particlevector.cpp + particle/particlevector.h party.cpp party.h being/playerignorestrategy.h diff --git a/src/Makefile.am b/src/Makefile.am index a5b54c0a1..18b4df265 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -934,6 +934,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ particle/particleinfo.h \ particle/particlelist.cpp \ particle/particlelist.h \ + particle/particlevector.cpp \ + particle/particlevector.h \ party.cpp \ party.h \ being/playerignorestrategy.h \ diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h index 243fbd8d0..bad6ee219 100644 --- a/src/being/actorsprite.h +++ b/src/being/actorsprite.h @@ -35,6 +35,7 @@ #include "particle/particlecontainer.h" #include "particle/particlelist.h" +#include "particle/particlevector.h" #include #include diff --git a/src/particle/particlecontainer.cpp b/src/particle/particlecontainer.cpp index 68e0c9d6c..c537a163b 100644 --- a/src/particle/particlecontainer.cpp +++ b/src/particle/particlecontainer.cpp @@ -20,9 +20,10 @@ * along with this program. If not, see . */ -#include "particle/particle.h" #include "particle/particlecontainer.h" +#include "particle/particle.h" + #include "utils/delete2.h" #include "debug.h" @@ -54,76 +55,3 @@ void ParticleContainer::moveTo(const float x, const float y) if (mNext) mNext->moveTo(x, y); } - -// -- particle vector ---------------------------------------- - -ParticleVector::ParticleVector(ParticleContainer *const parent, - const bool delParent) : - ParticleContainer(parent, delParent), - mIndexedElements() -{} - -ParticleVector::~ParticleVector() -{} - -void ParticleVector::setLocally(const int index, Particle *const particle) -{ - if (index < 0) - return; - - delLocally(index); - - if (mIndexedElements.size() <= static_cast(index)) - mIndexedElements.resize(index + 1, nullptr); - - if (particle) - particle->disableAutoDelete(); - mIndexedElements[index] = particle; -} - -void ParticleVector::delLocally(const int index) -{ - if (index < 0) - return; - - if (mIndexedElements.size() <= static_cast(index)) - return; - - Particle *const p = mIndexedElements[index]; - if (p) - { - mIndexedElements[index] = nullptr; - p->kill(); - } -} - -void ParticleVector::clearLocally() -{ - for (unsigned int i = 0; - i < static_cast(mIndexedElements.size()); - i++) - { - delLocally(i); - } -} - -void ParticleVector::moveTo(const float x, const float y) -{ - ParticleContainer::moveTo(x, y); - - for (std::vector::iterator it = mIndexedElements.begin(); - it != mIndexedElements.end(); ++it) - { - Particle *const p = *it; - if (p) - { - p->moveTo(x, y); - - if (p->isExtinct()) - { - p->kill(); - *it = nullptr; - } - } - } -} diff --git a/src/particle/particlecontainer.h b/src/particle/particlecontainer.h index 81037ce3a..6128688b6 100644 --- a/src/particle/particlecontainer.h +++ b/src/particle/particlecontainer.h @@ -23,13 +23,8 @@ #ifndef PARTICLE_PARTICLECONTAINER_H #define PARTICLE_PARTICLECONTAINER_H -#include -#include - #include "localconsts.h" -class Particle; - /** * Set of particle effects. May be stacked with other ParticleContainers. All * operations herein affect such stacked containers, unless the operations end @@ -37,71 +32,40 @@ class Particle; */ class ParticleContainer { -public: - /** - * Constructs a new particle container and assumes responsibility for - * its parent (for all operations defined herein, except when ending in `Locally') - * - * delParent means that the destructor should also free the parent. - */ - explicit ParticleContainer(ParticleContainer *const parent = nullptr, - const bool delParent = true); - - A_DELETE_COPY(ParticleContainer) - - virtual ~ParticleContainer(); - - /** - * Kills and removes all particle effects - */ - void clear(); - - /** - * Kills and removes all particle effects (only in this container) - */ - virtual void clearLocally() - { } - - /** - * Sets the positions of all elements - */ - virtual void moveTo(const float x, const float y); - -protected: - ParticleContainer *mNext; /**< Contained container, if any */ - bool mDelParent; /**< Delete mNext in destructor */ -}; - -/** - * Particle container with indexing facilities - */ -class ParticleVector final : public ParticleContainer -{ -public: - explicit ParticleVector(ParticleContainer *const parent = nullptr, - const bool delParent = true); - - A_DELETE_COPY(ParticleVector) - - ~ParticleVector(); - - /** - * Sets a particle at a specified index. Kills the previous particle - * there, if needed. - */ - void setLocally(const int index, Particle *const particle); - - /** - * Removes a particle at a specified index - */ - void delLocally(const int index); - - void clearLocally() override final; - - void moveTo(const float x, const float y) override final; - -protected: - std::vector mIndexedElements; + public: + /** + * Constructs a new particle container and assumes responsibility for + * its parent (for all operations defined herein, + * except when ending in `Locally') + * + * delParent means that the destructor should also free the parent. + */ + explicit ParticleContainer(ParticleContainer *const parent = nullptr, + const bool delParent = true); + + A_DELETE_COPY(ParticleContainer) + + virtual ~ParticleContainer(); + + /** + * Kills and removes all particle effects + */ + void clear(); + + /** + * Kills and removes all particle effects (only in this container) + */ + virtual void clearLocally() + { } + + /** + * Sets the positions of all elements + */ + virtual void moveTo(const float x, const float y); + + protected: + ParticleContainer *mNext; /**< Contained container, if any */ + bool mDelParent; /**< Delete mNext in destructor */ }; #endif // PARTICLE_PARTICLECONTAINER_H diff --git a/src/particle/particlevector.cpp b/src/particle/particlevector.cpp new file mode 100644 index 000000000..3a0b7f3f6 --- /dev/null +++ b/src/particle/particlevector.cpp @@ -0,0 +1,99 @@ +/* + * The ManaPlus Client + * Copyright (C) 2008-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "particle/particle.h" +#include "particle/particlevector.h" + +#include "utils/delete2.h" + +#include "debug.h" + +ParticleVector::ParticleVector(ParticleContainer *const parent, + const bool delParent) : + ParticleContainer(parent, delParent), + mIndexedElements() +{} + +ParticleVector::~ParticleVector() +{} + +void ParticleVector::setLocally(const int index, Particle *const particle) +{ + if (index < 0) + return; + + delLocally(index); + + if (mIndexedElements.size() <= static_cast(index)) + mIndexedElements.resize(index + 1, nullptr); + + if (particle) + particle->disableAutoDelete(); + mIndexedElements[index] = particle; +} + +void ParticleVector::delLocally(const int index) +{ + if (index < 0) + return; + + if (mIndexedElements.size() <= static_cast(index)) + return; + + Particle *const p = mIndexedElements[index]; + if (p) + { + mIndexedElements[index] = nullptr; + p->kill(); + } +} + +void ParticleVector::clearLocally() +{ + for (unsigned int i = 0; + i < static_cast(mIndexedElements.size()); + i++) + { + delLocally(i); + } +} + +void ParticleVector::moveTo(const float x, const float y) +{ + ParticleContainer::moveTo(x, y); + + for (std::vector::iterator it = mIndexedElements.begin(); + it != mIndexedElements.end(); ++it) + { + Particle *const p = *it; + if (p) + { + p->moveTo(x, y); + + if (p->isExtinct()) + { + p->kill(); + *it = nullptr; + } + } + } +} diff --git a/src/particle/particlevector.h b/src/particle/particlevector.h new file mode 100644 index 000000000..25fe8f3bb --- /dev/null +++ b/src/particle/particlevector.h @@ -0,0 +1,66 @@ +/* + * The ManaPlus Client + * Copyright (C) 2008-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef PARTICLE_PARTICLEVECTOR_H +#define PARTICLE_PARTICLEVECTOR_H + +#include "particle/particlecontainer.h" + +#include + +#include "localconsts.h" + +class Particle; + +/** + * Particle container with indexing facilities + */ +class ParticleVector final : public ParticleContainer +{ + public: + explicit ParticleVector(ParticleContainer *const parent = nullptr, + const bool delParent = true); + + A_DELETE_COPY(ParticleVector) + + ~ParticleVector(); + + /** + * Sets a particle at a specified index. Kills the previous particle + * there, if needed. + */ + void setLocally(const int index, Particle *const particle); + + /** + * Removes a particle at a specified index + */ + void delLocally(const int index); + + void clearLocally() override final; + + void moveTo(const float x, const float y) override final; + + protected: + std::vector mIndexedElements; +}; + +#endif // PARTICLE_PARTICLEVECTOR_H -- cgit v1.2.3-60-g2f50