diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/particle.hpp | 13 | ||||
| -rw-r--r-- | include/weather.hpp | 6 |
2 files changed, 13 insertions, 6 deletions
diff --git a/include/particle.hpp b/include/particle.hpp index d9aa29f..4d42b39 100644 --- a/include/particle.hpp +++ b/include/particle.hpp @@ -9,7 +9,8 @@ enum class ParticleType : char { Drop, - Confetti + Confetti, + SmallBlast }; struct Particle { @@ -18,8 +19,8 @@ struct Particle { ParticleType type; int timeLeft; - Particle(vec2 p, ParticleType t = ParticleType::Drop) - : location(p), type(t), timeLeft(3000) {} // TODO times + Particle(vec2 p, ParticleType t = ParticleType::Drop, int tl = 3000) + : location(p), type(t), timeLeft(tl) {} // TODO times } __attribute__ ((packed)); class ParticleSystem : public entityx::System<ParticleSystem> { @@ -28,10 +29,10 @@ private: bool max; public: - ParticleSystem(int count = 1024, bool m = false); + ParticleSystem(int count = 2048, bool m = false); - void add(const vec2& pos, const ParticleType& type); - void addMultiple(const int& count, const ParticleType& type, std::function<vec2(void)> f); + void add(const vec2& pos, const ParticleType& type, const int& timeleft = 3000); + void addMultiple(const int& count, const ParticleType& type, std::function<vec2(void)> f, const int& timeleft = 3000); void render(void) const; void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) override; diff --git a/include/weather.hpp b/include/weather.hpp index 3aac2e6..c348c15 100644 --- a/include/weather.hpp +++ b/include/weather.hpp @@ -52,6 +52,12 @@ public: } break; // TODO case Weather::Snowy: + if (newPartDelay++ == 4) { + newPartDelay = 0; + partSystem.add(vec2(offset.x - game::SCREEN_WIDTH / 2 + randGet() % game::SCREEN_WIDTH, + offset.y + game::SCREEN_HEIGHT / 2 + 100), + ParticleType::Confetti, 6000); + } break; // TODO default: break; |