Changeset 3708 in orxonox.OLD

Timestamp:

Apr 1, 2005, 1:41:38 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: added testbullet class. some changes in the weapon class to make it look much better and also more performant

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (1 diff)
• world_entities/projectile.cc (modified) (3 diffs)
• world_entities/projectile.h (modified) (1 diff)
• world_entities/test_bullet.cc (added)
• world_entities/test_bullet.h (added)
• world_entities/test_gun.cc (modified) (1 diff)

orxonox/trunk/src/story_entities/world.cc

@@ -351 +351 @@
             tn->addChild(this->localCamera);
             //      localCamera->lookAt(tn);
-            this->localPlayer->setMode(PNODE_ALL);
+            this->localPlayer->setMode(PNODE_ROTATE_MOVEMENT);
             //Vector* cameraOffset = new Vector (0, 5, -10);
             trackManager->condition(2, LEFTRIGHT, this->localPlayer);

orxonox/trunk/src/world_entities/projectile.cc

@@ -62 +62 @@
    tick function
 */
-void Projectile::setFlightDirection(Quaternion* flightDirection)
+void Projectile::setFlightDirection(Quaternion flightDirection)
 {
   if( this->flightDirection == NULL)
     this->flightDirection = new Vector();
   Vector v(1, 0, 0);
-  *this->flightDirection = flightDirection->apply(v);
+  *this->flightDirection = flightDirection.apply(v);
   this->flightDirection->normalize();
 }
@@ -89 +89 @@
 void Projectile::setSpeed(float speed)
 {
-  this->speed = speed * 3;
+  this->speed = speed * 3; /* fix speed settings */
   PRINTF(4)("Projectile::setting speed to: %f\n", this->speed);
 }
@@ -99 +99 @@
 void Projectile::tick (float time) 
 {
-  //this->speed = this->weapon->getSpeed(); 
-  Vector v;
-  v = *this->flightDirection * ( this->speed * time * 1000 + 0.7);
+  Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.7);
   this->shiftCoor(v);
-  //printf("PROJECTILE: current direction is:    (%f, %f, %f)\n",this->flightDirection->x, this->flightDirection->y, this->flightDirection->z );
-  //printf("PROJECTILE: current shift vector is: (%f, %f, %f)\n", v.x, v.y, v.z);
-  //printf("PROJECTILE: current speed is: %f\n", this->speed);
-  //printf("PROJECTILE: current dt is:    %f\n", time);
-  //this->debug();
 
   this->currentLifeTime += time;
   if( this->ttl < this->currentLifeTime)
     {
-      PRINTF(5)("FINALIZE=============================================================\n");
+      PRINTF(5)("FINALIZE==========================\n");
       PRINTF(5)("current life time is: %f/%f\n", this->currentLifeTime, this->ttl);
-      PRINTF(5)("FINALIZE=============================================================\n");
+      PRINTF(5)("FINALIZE===========================\n");
       this->finalize();
       this->currentLifeTime = 0.0f;

orxonox/trunk/src/world_entities/projectile.h

@@ -20 +20 @@
   virtual ~Projectile ();
 
-  void setFlightDirection(Quaternion* flightDirection);
+  void setFlightDirection(Quaternion flightDirection);
   void setSpeed(float speed);
   void setTTL(float ttl);

orxonox/trunk/src/world_entities/test_gun.cc

@@ -85 +85 @@
 {
   if( this->localTime < this->idleTime)
-    return;
-
+    {
+      this->weaponIdle();
+      return;
+    }
   Projectile* pj = new Projectile(this);
 
-  Vector* v = new Vector();
-  *v = this->getAbsCoor();
-  pj->setAbsCoor(v);
-  Quaternion* q = new Quaternion();
-  *q = this->getAbsDir();
-  pj->setAbsDir(q);
+  pj->setAbsCoor(this->getAbsCoor());
+  pj->setAbsDir(this->getAbsDir());
 
-  printf("%f\n",this->getSpeed());
-
-  pj->setFlightDirection(q);
+  pj->setFlightDirection(this->getAbsDir());
   pj->setSpeed(this->getSpeed());