Changeset 6627 in orxonox.OLD for trunk

Timestamp:

Jan 20, 2006, 2:43:55 AM (19 years ago)

Author:

bensch

Message:

trunk: valgrind sweep

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• src/lib/math/quaternion.h (modified) (1 diff)
• src/lib/particles/particle_emitter.cc (modified) (2 diffs)
• src/world_entities/projectiles/guided_missile.cc (modified) (2 diffs)
• src/world_entities/projectiles/rocket.cc (modified) (2 diffs)

trunk/configure.ac

@@ -525 +525 @@
 
 #--------#
-# FFmpeg # 
+# FFmpeg #
 #--------#
 # checking for FFmpeg-headers

trunk/src/lib/math/quaternion.h

@@ -43 +43 @@
   Quaternion (float m[4][4]);
   /** turns a rotation along an axis into a Quaternion @param angle: the amount of radians to rotate @param axis: the axis to rotate around */
-  inline Quaternion (float angle, const Vector& axis) { w = cos(angle/2); v = axis * sin(angle/2); }
+  inline Quaternion (float angle, const Vector& axis) { w = cos(angle/2.0); v = axis * sin(angle/2.0); }
   Quaternion (const Vector& dir, const Vector& up);
   Quaternion (float roll, float pitch, float yaw);

trunk/src/lib/particles/particle_emitter.cc

@@ -42 +42 @@
   this->setEmissionRate(emissionRate);
   this->setEmissionVelocity(velocity);
-
 }
 
@@ -79 +78 @@
   this->setEmissionRate(PARTICLE_EMITTER_DEFAULT_EMISSION_RATE);
   this->setSize(PARTICLE_EMITTER_DEFAULT_SIZE);
+  this->setEmissionMomentum(0);
+  this->setEmissionVelocity(1.0);
+  this->setSpread(M_PI);
 
   this->system = NULL;

trunk/src/world_entities/projectiles/guided_missile.cc

@@ -60 +60 @@
 
   /* this is normaly done by World.cc by deleting the ParticleEngine */
-  if (GuidedMissile::trailParticles != NULL && ClassList::getList(CL_TEST_BULLET)->size() <= 1)
+  if (GuidedMissile::trailParticles != NULL && ClassList::getList(CL_GUIDED_MISSILE)->size() <= 1)
   {
     if (ClassList::exists(GuidedMissile::trailParticles, CL_PARTICLE_SYSTEM))
@@ -66 +66 @@
     GuidedMissile::trailParticles = NULL;
   }
-  if (GuidedMissile::explosionParticles != NULL && ClassList::getList(CL_TEST_BULLET)->size() <= 1)
+  if (GuidedMissile::explosionParticles != NULL && ClassList::getList(CL_GUIDED_MISSILE)->size() <= 1)
   {
     if (ClassList::exists(GuidedMissile::explosionParticles, CL_PARTICLE_SYSTEM))

trunk/src/world_entities/projectiles/rocket.cc

@@ -59 +59 @@
 
   /* this is normaly done by World.cc by deleting the ParticleEngine */
-  if (Rocket::trailParticles != NULL && ClassList::getList(CL_TEST_BULLET)->size() <= 1)
+  if (Rocket::trailParticles != NULL && ClassList::getList(CL_ROCKET)->size() <= 1)
   {
     if (ClassList::exists(Rocket::trailParticles, CL_PARTICLE_SYSTEM))
@@ -65 +65 @@
     Rocket::trailParticles = NULL;
   }
-  if (Rocket::explosionParticles != NULL && ClassList::getList(CL_TEST_BULLET)->size() <= 1)
+  if (Rocket::explosionParticles != NULL && ClassList::getList(CL_ROCKET)->size() <= 1)
   {
     if (ClassList::exists(Rocket::explosionParticles, CL_PARTICLE_SYSTEM))