Changeset 8693 in orxonox.OLD

Timestamp:

Jun 21, 2006, 11:33:10 PM (18 years ago)

Author:

patrick

Message:

branches: added new branche terrain copy of trunk

Location:

branches

Files:

• bsp_model/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified) (4 diffs)
• bsp_model/src/lib/graphics/importer/bsp_manager.cc (modified) (2 diffs)
• bsp_model/src/world_entities/creatures/fps_player.cc (modified) (4 diffs)
• terrain (copied) (copied from trunk)

branches/bsp_model/src/lib/collision_reaction/cr_physics_ground_walk.cc

@@ -55 +55 @@
   CollisionEvent* ce = collision->getCollisionEvents().front();
   Vector normal = ce->getGroundNormal();
-  // normal.normalize();
 
-  // put it back
-//   PRINTF(0)("putting it back to lastPos: \n");
-//   this->lastPositions[0].debug();
-//   PRINTF(0)("current pos:\n");
-//   collision->getEntityB()->getAbsCoor().debug();
-  
-  
+
   Vector height = ce->getCollisionPosition() - collision->getEntityB()->getAbsCoor();
   if(ce->getGroundNormal().len() <= 0.1f)
@@ -74 +67 @@
     downspeed++;
     collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() + Vector(0.0,-0.03*downspeed,0.0));
-    
+
   }
   else
@@ -81 +74 @@
     {
       //if(downspeed <= 0) downspeed =1;
-      collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() + Vector(0.0,height.y+3.55,0.0));   
-      //collision->getEntityB()->setVelocity(Vector(0.0,0.0,0.0));    
+      collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() + Vector(0.0,height.y+3.55,0.0));
+      //collision->getEntityB()->setVelocity(Vector(0.0,0.0,0.0));
     }
       downspeed = 0;
   }
-  
+
 
   /*
@@ -93 +86 @@
   collision->getEntityB()->setVelocity(Vector());
   collision->getEntityB()->setAbsCoor(this->lastPositions[1]);
-  
+
   */
 }

branches/bsp_model/src/lib/graphics/importer/bsp_manager.cc

@@ -41 +41 @@
 #include "world_entity.h"
 
+#include "aabb.h"
+
 #include "util/loading/load_param.h"
 #include "util/loading/factory.h"
@@ -942 +944 @@
   this->outputFraction = 1.0f;
 
-
-
-
-  Vector forwardDir = worldEntity->getAbsDirX();
-  forwardDir = forwardDir * 8.0f;
-
-  Vector upDir = worldEntity->getAbsDirY();
-  upDir.x = 0.0;
-  upDir.y = 1.0;
-  upDir.z = 0.0;
+  AABB* box = worldEntity->getModelAABB();
+
+
+  Vector forwardDir;
+  Vector upDir;
   Vector dest;
-  /*
-  dest.x  += forwardDir.x;
-  dest.y  += forwardDir.y;
-  dest.z  += forwardDir.z;
-  */
-  Vector position = worldEntity->getAbsCoor() + upDir*5.0f ;
-  dest = worldEntity->getAbsCoor() - upDir*40.0f; //
-  Vector out = dest;
+  Vector position;
+  Vector out;
+
+  if( box != NULL)
+  {
+    forwardDir = worldEntity->getAbsDirX();
+    forwardDir = forwardDir * 8.0f;
+
+    upDir = worldEntity->getAbsDirY();
+    upDir.x = 0.0;
+    upDir.y = 1.0;
+    upDir.z = 0.0;
+    dest;
+
+    position = worldEntity->getAbsCoor() + box->center + box->axis[1] * box->halfLength[1];
+    dest     = worldEntity->getAbsCoor() + box->center - box->axis[1] * box->halfLength[1];
+    out = dest;
+
+  }
+  else
+  {
+    forwardDir = worldEntity->getAbsDirX();
+    forwardDir = forwardDir * 8.0f;
+
+    upDir = worldEntity->getAbsDirY();
+    upDir.x = 0.0;
+    upDir.y = 1.0;
+    upDir.z = 0.0;
+    dest;
+
+    position = worldEntity->getAbsCoor() + upDir*5.0f;
+    dest = worldEntity->getAbsCoor() - upDir*40.0f; //
+    out = dest;
+
+  }
 
 

branches/bsp_model/src/world_entities/creatures/fps_player.cc

@@ -104 +104 @@
 
   // collision reaction registration
-  //this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
+  this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
 }
 
@@ -210 +210 @@
 
 
-//   if( likely(this->getModel(0) != NULL) && this->getModel(0)->isA(CL_INTERACTIVE_MODEL))
-//   {
-//     ((InteractiveModel*)this->getModel(0))->tick(time);
+  if( likely(this->getModel(0) != NULL) && this->getModel(0)->isA(CL_INTERACTIVE_MODEL))
+  {
+    ((InteractiveModel*)this->getModel(0))->tick(time);
 //
 //     // handle animations differently
@@ -234 +234 @@
 //         ((InteractiveModel*)this->getModel(0))->setAnimation(STAND);
 //     }
-//   }
+  }
 
 }
@@ -246 +246 @@
 {
   // only draw if this entity is not the player since the player nevers sees himself
-  if( this->getCurrentPlayer() == NULL)
+//   if( this->getCurrentPlayer() == NULL)
     WorldEntity::draw();
 }