Changeset 3686 in orxonox.OLD

Timestamp:

Mar 31, 2005, 12:28:28 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: fixed speed issue, was a problem with the current track defined in the debug level

Location:

orxonox/trunk/src

Files:

• defs/debug.h (modified) (1 diff)
• lib/coord/p_node.cc (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)
• world_entities/projectile.cc (modified) (2 diffs)
• world_entities/test_gun.cc (modified) (1 diff)

orxonox/trunk/src/defs/debug.h

@@ -58 +58 @@
 // DEFINE MODULES \\
 #define DEBUG_MODULE_ORXONOX            0
-#define DEBUG_MODULE_WORLD              3
-#define DEBUG_MODULE_PNODE              0
+#define DEBUG_MODULE_WORLD              0
+#define DEBUG_MODULE_PNODE              3
 #define DEBUG_MODULE_WORLD_ENTITY       0
-#define DEBUG_MODULE_COMMAND_NODE       0
+#define DEBUG_MODULE_COMMAND_NODE       3
 #define DEBUG_MODULE_GRAPHICS           0
 #define DEBUG_MODULE_LOAD               0

orxonox/trunk/src/lib/coord/p_node.cc

@@ -422 +422 @@
 {
   if(this->time == 0)
-    return 0;
-  Vector* diff = new Vector();
-  *diff = *this->absCoordinate - *this->lastAbsCoordinate;
-  float x = diff->len();
+    return 1000;
+  Vector diff;
+  diff = *this->absCoordinate - *this->lastAbsCoordinate;
+  float x = diff.len();
   return x / this->time;
 }

orxonox/trunk/src/story_entities/world.cc

@@ -206 +206 @@
       // initializing the TrackManager
       trackManager = TrackManager::getInstance();
-      trackManager->addPoint(Vector(0,0,0));
-      trackManager->addPoint(Vector(100, -40, 5));
-      trackManager->addPoint(Vector(200,-40,-8));
-      trackManager->addPoint(Vector(250, -35, -2));
+      //trackManager->addPoint(Vector(0,0,0));
+      trackManager->addPoint(Vector(150, -35, 5));
+      trackManager->addPoint(Vector(200,-35, 5));
+      trackManager->addPoint(Vector(250, -35, 5));
       trackManager->addPoint(Vector(320,-33,-.55));
-      trackManager->setDuration(3);
+      trackManager->setDuration(2);
       trackManager->setSavePoint();
+
       trackManager->addPoint(Vector(410, 0, 0));
       trackManager->addPoint(Vector(510, 20, -10));

orxonox/trunk/src/world_entities/player.cc

@@ -52 +52 @@
   acceleration = 10.0;
   //weapons:
-  Weapon* wp = new TestGun(this, new Vector(), new Quaternion());
+  Weapon* wp = new TestGun(this, new Vector(-1.1, 0.0, 2.6), new Quaternion());
   this->weapons->add(wp);
   this->activeWeapon = wp;  

orxonox/trunk/src/world_entities/projectile.cc

@@ -99 +99 @@
 void Projectile::tick (float time) 
 {
-  this->speed = this->weapon->getSpeed() * 3;  
-  this->shiftCoor(*this->flightDirection * this->speed * time);
-  //printf("current speed is: %f\n", this->speed);
+  this->speed = this->weapon->getSpeed() * 3; 
+  Vector v;
+  v = *this->flightDirection * this->speed * time;
+  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;
@@ -110 +116 @@
       PRINTF(5)("FINALIZE=============================================================\n");
       this->finalize();
+      this->currentLifeTime = 0.0f;
     }
 }

orxonox/trunk/src/world_entities/test_gun.cc

@@ -132 +132 @@
 {
   this->localTime += time;
+  //this->debug();
+  //printf("TEST_GUN: this speed is: %f\n", this->getSpeed());
 }