Changeset 3670 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Mar 30, 2005, 12:43:15 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: currently working on orxonox weapon system. still got problem with the speed! flushing state

Location:

orxonox/trunk/src

Files:

• garbage_collector.cc (modified) (1 diff)
• story_entities/world.cc (modified) (2 diffs)
• world_entities/projectile.cc (modified) (3 diffs)
• world_entities/test_gun.cc (modified) (2 diffs)

orxonox/trunk/src/garbage_collector.cc

@@ -136 +136 @@
           /* second remove out of pnode tree */
           entity->remove();
+          /* then finaly delete reference */
           delete entity;
         }
       entity = iterator->nextElement();
     }
+
   PRINTF(3)("= collected %i unused objects\n", counter);
   PRINTF(3)("=============================\n");
-  
-  
-
 
   /* reset time to count again up to this->delay */

orxonox/trunk/src/story_entities/world.cc

@@ -329 +329 @@
 
            
+            /*
             Vector* es = new Vector (10, 5, 0);
             Quaternion* qs = new Quaternion ();
@@ -334 +335 @@
             pr->setName("primitive");
             this->spawn(pr, this->localPlayer, es, qs, PNODE_MOVEMENT);
-           
+            */
 
             /*monitor progress*/

orxonox/trunk/src/world_entities/projectile.cc

@@ -38 +38 @@
   this->currentLifeTime = 0.0f;
   this->ttl = 1.0f;
-  this->speed = 1.1f;
+  this->speed = 2.0f;
 }
 
@@ -84 +84 @@
 
 /**
+   \brief sets the speed of the projectile
+*/
+void Projectile::setSpeed(float speed)
+{
+  this->speed = speed;
+  printf("Projectile::setting speed to: %f\n", this->speed);
+}
+
+/**
    \brief signal tick, time dependent things will be handled here
    \param time since last tick
@@ -92 +101 @@
   if( this->ttl < this->currentLifeTime)
     {
-      *this->flightDirection = *this->flightDirection * speed;
+      *this->flightDirection = *this->flightDirection * this->speed;
       this->shiftCoor(this->flightDirection);
+      this->flightDirection->debug();
       return;
     }

orxonox/trunk/src/world_entities/test_gun.cc

@@ -82 +82 @@
 void TestGun::fire()
 {
-  printf("TestGun::fire() - firing weapon now ---------------------------\n");
+  //printf("TestGun::fire() - firing weapon now ---------------------------\n");
   Projectile* pj = new Projectile();
   Vector* v = new Vector();
@@ -92 +92 @@
 
   pj->setFlightDirection(q);
+  //pj->setSpeed(this->getSpeed() * 0.025);
 
-  printf("TestGun::current speed is: %f", this->getSpeed());
 
   this->worldEntities->add(pj);