Changeset 5482 in orxonox.OLD

Timestamp:

Nov 3, 2005, 10:33:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: VERY simplistic Banking of the Player

Location:

trunk/src

Files:

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

trunk/src/subprojects/collision_detection/collision_detection.cc

@@ -255 +255 @@
   {
     if( likely(drawModel))
-    entity->draw();
+      entity->draw();
     entity->drawBVTree(depth, drawMode);
     printf("%i, %i\n", depth, drawMode);

trunk/src/util/loading/resource_manager.cc

@@ -156 +156 @@
     return true;
   }
+  return false;
 }
 

trunk/src/world_entities/player.cc

@@ -286 +286 @@
   if( this->bDown && this->getRelCoor().x > -5)
     accel = accel -(direction*acceleration);
-  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->bLeft)
+  {
+    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)
+  {
+   if (TrackManager::getInstance()->getWidth() > this->getRelCoor().z*2)
     accel = accel + (orthDirection*acceleration);
+   else
+     this->setRelDirSoft(Quaternion(0, Vector(1,0,0)), 5);
+  }
   if( this->bAscend ) { /* FIXME */ }
   if( this->bDescend) {/* FIXME */} /* @todo up and down player movement */
@@ -319 +329 @@
       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;

trunk/src/world_entities/world_entity.cc

@@ -105 +105 @@
     delete this->obbTree;
 
-  if (this->model)
+  if (this->model != NULL)
   {
     PRINTF(4)("creating obb tree\n");