X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fparticlesystem.cpp;h=76846966aac6727fa4f6224fb9d0f0eb1592646f;hb=78ac7aef674f518549f96160c6354b589553f952;hp=dcbd90fc26604e49d4647ada38ec342b9bf8164f;hpb=08813a74da6ac1fd045a105e4e8105f1d7f716f0;p=supertux.git

diff --git a/src/object/particlesystem.cpp b/src/object/particlesystem.cpp
index dcbd90fc2..76846966a 100644
--- a/src/object/particlesystem.cpp
+++ b/src/object/particlesystem.cpp
@@ -16,14 +16,18 @@
 
 #include "object/particlesystem.hpp"
 
-#include <cmath>
+#include <math.h>
 
 #include "math/random_generator.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "video/drawing_context.hpp"
 
 ParticleSystem::ParticleSystem(float max_particle_size) :
-  max_particle_size(max_particle_size)
+  max_particle_size(max_particle_size),
+  z_pos(),
+  particles(),
+  virtual_width(),
+  virtual_height()
 {
   virtual_width = SCREEN_WIDTH + max_particle_size * 2;
   virtual_height = SCREEN_HEIGHT + max_particle_size *2;
@@ -68,150 +72,4 @@ void ParticleSystem::draw(DrawingContext& context)
   context.pop_transform();
 }
 
-SnowParticleSystem::SnowParticleSystem()
-{
-  snowimages[0] = new Surface("images/objects/particles/snow2.png");
-  snowimages[1] = new Surface("images/objects/particles/snow1.png");
-  snowimages[2] = new Surface("images/objects/particles/snow0.png");
-
-  virtual_width = SCREEN_WIDTH * 2;
-
-  // create some random snowflakes
-  size_t snowflakecount = size_t(virtual_width/10.0);
-  for(size_t i=0; i<snowflakecount; ++i) {
-    SnowParticle* particle = new SnowParticle;
-    int snowsize = systemRandom.rand(3);
-
-    particle->pos.x = systemRandom.randf(virtual_width);
-    particle->pos.y = systemRandom.randf(SCREEN_HEIGHT);
-    particle->anchorx = particle->pos.x + (systemRandom.randf(-0.5, 0.5) * 16);
-    particle->drift_speed = systemRandom.randf(-0.5, 0.5) * 0.3;
-    particle->wobble = 0.0;
-
-    particle->texture = snowimages[snowsize];
-
-    particle->speed = 1 + (2 - snowsize)/2 + systemRandom.randf(1.8);
-    particle->speed *= 20; // gravity
-
-    particles.push_back(particle);
-  }
-}
-
-void
-SnowParticleSystem::parse(const Reader& reader)
-{
-  reader.get("z-pos", z_pos);
-}
-
-SnowParticleSystem::~SnowParticleSystem()
-{
-  for(int i=0;i<3;++i)
-    delete snowimages[i];
-}
-
-void SnowParticleSystem::update(float elapsed_time)
-{
-  std::vector<Particle*>::iterator i;
-
-  for(i = particles.begin(); i != particles.end(); ++i) {
-    SnowParticle* particle = (SnowParticle*) *i;
-    float anchor_delta;
-
-    particle->pos.y += particle->speed * elapsed_time;
-    particle->pos.x += particle->wobble * elapsed_time /* * particle->speed * 0.125*/;
-
-    anchor_delta = (particle->anchorx - particle->pos.x);
-    particle->wobble += (4 * anchor_delta * 0.05) + systemRandom.randf(-0.5, 0.5);
-    particle->wobble *= 0.99f;
-    particle->anchorx += particle->drift_speed * elapsed_time;
-  }
-}
-
-//FIXME: Sometimes both ghosts have the same image
-//       Ghosts don't change their movement pattern - not random
-GhostParticleSystem::GhostParticleSystem()
-{
-  ghosts[0] = new Surface("images/objects/particles/ghost0.png");
-  ghosts[1] = new Surface("images/objects/particles/ghost1.png");
-
-  virtual_width = SCREEN_WIDTH * 2;
-
-  // create two ghosts
-  size_t ghostcount = 2;
-  for(size_t i=0; i<ghostcount; ++i) {
-    GhostParticle* particle = new GhostParticle;
-    particle->pos.x = systemRandom.randf(virtual_width);
-    particle->pos.y = systemRandom.randf(SCREEN_HEIGHT);
-    int size = systemRandom.rand(2);
-    particle->texture = ghosts[size];
-    particle->speed = systemRandom.randf(std::max(50, (size * 10)), 180 + (size * 10));
-    particles.push_back(particle);
-  }
-}
-
-void
-GhostParticleSystem::parse(const Reader& reader)
-{
-  reader.get("z-pos", z_pos);
-}
-
-GhostParticleSystem::~GhostParticleSystem()
-{
-  for(int i=0;i<2;++i)
-    delete ghosts[i];
-}
-
-void GhostParticleSystem::update(float elapsed_time)
-{
-  std::vector<Particle*>::iterator i;
-  for(i = particles.begin(); i != particles.end(); ++i) {
-    GhostParticle* particle = (GhostParticle*) *i;
-    particle->pos.y -= particle->speed * elapsed_time;
-    particle->pos.x -= particle->speed * elapsed_time;
-    if(particle->pos.y > SCREEN_HEIGHT) {
-      particle->pos.y = fmodf(particle->pos.y , virtual_height);
-      particle->pos.x = systemRandom.rand(static_cast<int>(virtual_width));
-    }
-  }
-}
-
-CloudParticleSystem::CloudParticleSystem()
-  : ParticleSystem(128)
-{
-  cloudimage = new Surface("images/objects/particles/cloud.png");
-
-  virtual_width = 2000.0;
-
-  // create some random clouds
-  for(size_t i=0; i<15; ++i) {
-    CloudParticle* particle = new CloudParticle;
-    particle->pos.x = systemRandom.rand(static_cast<int>(virtual_width));
-    particle->pos.y = systemRandom.rand(static_cast<int>(virtual_height));
-    particle->texture = cloudimage;
-    particle->speed = -systemRandom.randf(25.0, 54.0);
-
-    particles.push_back(particle);
-  }
-}
-
-void
-CloudParticleSystem::parse(const Reader& reader)
-{
-  reader.get("z-pos", z_pos);
-}
-
-CloudParticleSystem::~CloudParticleSystem()
-{
-  delete cloudimage;
-}
-
-void CloudParticleSystem::update(float elapsed_time)
-{
-  std::vector<Particle*>::iterator i;
-  for(i = particles.begin(); i != particles.end(); ++i) {
-    CloudParticle* particle = (CloudParticle*) *i;
-    particle->pos.x += particle->speed * elapsed_time;
-  }
-}
-
 /* EOF */