Changeset 3675 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Mar 30, 2005, 5:20:21 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: glmenu progressbar corrected, pnode modifications

Location:

orxonox/trunk/src/world_entities

Files:

• player.cc (modified) (1 diff)
• projectile.cc (modified) (1 diff)
• test_gun.cc (modified) (2 diffs)

orxonox/trunk/src/world_entities/player.cc

@@ -178 +178 @@
   //orthDirection = orthDirection.cross (direction);
 
-  if( this->bUp && this->getRelCoor().x < 20)
+  if( this->bUp && this->getRelCoor()->x < 20)
     accel = accel+(direction*acceleration);
-  if( this->bDown && this->getRelCoor().x > -5)
+  if( this->bDown && this->getRelCoor()->x > -5)
     accel = accel-(direction*acceleration);
-  if( this->bLeft &&  TrackManager::getInstance()->getWidth() > -this->getRelCoor().z*2)
+  if( this->bLeft &&  TrackManager::getInstance()->getWidth() > -this->getRelCoor()->z*2)
     accel = accel - (orthDirection*acceleration); 
-  if( this->bRight &&  TrackManager::getInstance()->getWidth() > this->getRelCoor().z*2)
+  if( this->bRight &&  TrackManager::getInstance()->getWidth() > this->getRelCoor()->z*2)
     accel = accel + (orthDirection*acceleration);
   if( this->bAscend )

orxonox/trunk/src/world_entities/projectile.cc

@@ -101 +101 @@
   if( this->ttl < this->currentLifeTime)
     {
-      *this->flightDirection = *this->flightDirection * this->speed;
+      *this->flightDirection = *this->flightDirection * this->speed * time;
       this->shiftCoor(this->flightDirection);
       this->flightDirection->debug();

orxonox/trunk/src/world_entities/test_gun.cc

@@ -84 +84 @@
   //printf("TestGun::fire() - firing weapon now ---------------------------\n");
   Projectile* pj = new Projectile();
+
   Vector* v = new Vector();
   *v = this->getAbsCoor();
@@ -93 +94 @@
   pj->setFlightDirection(q);
   //pj->setSpeed(this->getSpeed() * 0.025);
+