[Pingus-CVS] CVS: Games/Pingus/src/particles explosive_particle.cxx,1.2,1.3 particle.hxx,1.5,1.6 particle_cache.cxx,1.3,1.4 particle_holder.cxx,1.4,1.5

[torangan]

Update of /usr/local/cvsroot/Games/Pingus/src/particles
In directory dark:/tmp/cvs-serv10023/particles

Modified Files:
        explosive_particle.cxx particle.hxx particle_cache.cxx 
        particle_holder.cxx 
Log Message:
replaced CL_Vector with a smaller Vector class


Index: explosive_particle.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/particles/explosive_particle.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- explosive_particle.cxx      4 Sep 2002 14:55:12 -0000       1.2
+++ explosive_particle.cxx      28 Sep 2002 11:52:25 -0000      1.3
@@ -40,9 +40,9 @@
 void 
 ExplosiveParticle::update(float delta)
 {
-  CL_Vector new_pos = pos + velocity * delta;
+  Vector new_pos = pos + velocity * delta;
   
-  CL_Vector incr = pos - new_pos;
+  Vector incr = pos - new_pos;
   incr.normalize ();
 
   // FIXME: This thing needs to be more abstract, we just need it far

Index: particle.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/particles/particle.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- particle.hxx        27 Sep 2002 11:26:49 -0000      1.5
+++ particle.hxx        28 Sep 2002 11:52:25 -0000      1.6
@@ -21,7 +21,7 @@
 #ifndef HEADER_PINGUS_PARTICLES_PARTICLE_HXX
 #define HEADER_PINGUS_PARTICLES_PARTICLE_HXX
 
-#include <ClanLib/Core/Math/cl_vector.h>
+#include "../vector.hxx"
 #include <ClanLib/Display/Display/surface.h>
 
 class Particle
@@ -30,12 +30,12 @@
   CL_Surface surface;
   
   /// The current position of the particle
-  CL_Vector pos;
+  Vector pos;
   
   /// The velocity of the particle
-  CL_Vector velocity;
+  Vector velocity;
 
-  CL_Vector force;
+  Vector force;
   int livetime;
   
 public:

Index: particle_cache.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/particles/particle_cache.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- particle_cache.cxx  17 Aug 2002 17:56:24 -0000      1.3
+++ particle_cache.cxx  28 Sep 2002 11:52:25 -0000      1.4
@@ -17,6 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <iostream>
 #include "pingu_particle.hxx"
 #include "particle_cache.hxx"
 

Index: particle_holder.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/particles/particle_holder.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- particle_holder.cxx 4 Sep 2002 19:40:20 -0000       1.4
+++ particle_holder.cxx 28 Sep 2002 11:52:26 -0000      1.5
@@ -17,6 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <iostream>
 #include "../globals.hxx"
 #include "../graphic_context.hxx"
 #include "../algo.hxx"
@@ -24,18 +25,18 @@
 
 #include "particle_holder.hxx"
 
-ParticleHolder::ParticleHolder()
+ParticleHolder::ParticleHolder ()
 {
   init_particles();
 }
 
-ParticleHolder::~ParticleHolder()
+ParticleHolder::~ParticleHolder ()
 {
   std::cout << "ParticleHolder:~ParticleHolder" << std::endl;
 }
 
 void
-ParticleHolder::update(float delta)
+ParticleHolder::update (float delta)
 {
   for(std::list<Particle*>::iterator i = this->begin(); i != this->end(); ++i) 
     {
@@ -52,7 +53,7 @@
 }
 
 void
-ParticleHolder::draw_offset(int x, int y, float s) // const
+ParticleHolder::draw_offset (int x, int y, float s) // const
 {
   // FIXME: obsolete
   for(std::list<Particle*>::iterator i = this->begin(); i != this->end(); ++i)