Changeset 5483 in orxonox.OLD

Timestamp:

Nov 4, 2005, 1:51:35 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: better banking of the player, and memory leak fix

Location:

trunk/src

Files:

• util/loading/resource_manager.cc (modified) (1 diff)
• world_entities/player.cc (modified) (2 diffs)

trunk/src/util/loading/resource_manager.cc

@@ -156 +156 @@
     return true;
   }
+  delete[] realDir;
   return false;
 }

trunk/src/world_entities/player.cc

@@ -286 +286 @@
   if( this->bDown && this->getRelCoor().x > -5)
     accel = accel -(direction*acceleration);
-  if( this->bLeft)
-  {
-    if( TrackManager::getInstance()->getWidth() > -this->getRelCoor().z*2)
+  if( this->bLeft && TrackManager::getInstance()->getWidth() > -this->getRelCoor().z*2)
       accel = accel - (orthDirection*acceleration);
-    else
-      this->setRelDirSoft(Quaternion(0, Vector(1,0,0)), 5);
-  }
-  if( this->bRight)
-  {
-   if (TrackManager::getInstance()->getWidth() > this->getRelCoor().z*2)
-    accel = accel + (orthDirection*acceleration);
-   else
-     this->setRelDirSoft(Quaternion(0, Vector(1,0,0)), 5);
-  }
+  if( this->bRight && TrackManager::getInstance()->getWidth() > this->getRelCoor().z*2)
+     accel = accel + (orthDirection*acceleration);
   if( this->bAscend ) { /* FIXME */ }
   if( this->bDescend) {/* FIXME */} /* @todo up and down player movement */
 
   Vector move = accel * time;
+
+  if (accel.z < 0)
+    this->setRelDirSoft(Quaternion(-.4, Vector(1,0,0)), 5);
+  else if (accel.z > 0)
+    this->setRelDirSoft(Quaternion(.4, Vector(1,0,0)), 5);
+  else
+    this->setRelDirSoft(Quaternion(0, Vector(1,0,0)), 5);
   this->shiftCoor (move);
 }
@@ -329 +326 @@
       this->bDown = event.bPressed;
   else if( event.type == KeyMapper::PEV_RIGHT)
-  {
       this->bRight= event.bPressed;
-      if (event.bPressed)
-        this->setRelDirSoft(Quaternion(.4, Vector(1,0,0)), 5);
-      else
-        this->setRelDirSoft(Quaternion(0, Vector(1,0,0)), 5);
-  }
   else if( event.type == KeyMapper::PEV_LEFT)
-  {
       this->bLeft = event.bPressed;
-      if (event.bPressed)
-        this->setRelDirSoft(Quaternion(-.4, Vector(1,0,0)), 5);
-      else
-        this->setRelDirSoft(Quaternion(0, Vector(1,0,0)), 5);
-  }
   else if( event.type == KeyMapper::PEV_FIRE1)
       this->bFire = event.bPressed;