Changeset 8524 in orxonox.OLD

Timestamp:

Jun 16, 2006, 11:40:03 AM (18 years ago)

Author:

bottac

Message:

Worked on ground walk.

Location:

branches/bsp_model/src

Files:

• lib/collision_reaction/cr_physics_ground_walk.cc (modified) (3 diffs)
• lib/collision_reaction/cr_physics_ground_walk.h (modified) (1 diff)
• lib/graphics/importer/bsp_manager.cc (modified) (5 diffs)
• world_entities/creatures/md2_creature.cc (modified) (2 diffs)
• world_entities/space_ships/collision_probe.cc (modified) (1 diff)

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

@@ -23 +23 @@
 #include "world_entity.h"
 #include "cr_physics_ground_walk.h"
-
-#include "debug.h"
 
 #include <vector>
@@ -57 +55 @@
   CollisionEvent* ce = collision->getCollisionEvents().front();
   Vector normal = ce->getGroundNormal();
-  normal.normalize();
+  // normal.normalize();
 
   // put it back
@@ -64 +62 @@
 //   PRINTF(0)("current pos:\n");
 //   collision->getEntityB()->getAbsCoor().debug();
+  
+  
+  Vector height = ce->getCollisionPosition() - collision->getEntityB()->getAbsCoor();
+  if(ce->getGroundNormal().len() <= 0.1f)
+  {
+    collision->getEntityB()->setAbsCoor(collision->getEntityB()->getLastAbsCoor());
+    return;
+  }
+  if(height.y < -3.6)
+  {
+    downspeed++;
+    collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() + Vector(0.0,-0.03*downspeed,0.0));
+    
+  }
+  else
+  {
+    if(height.y > -3.5  && height.y <    3.9)
+    {
+      //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));    
+    }
+      downspeed = 0;
+  }
+  
 
+  /*
   PRINTF(0)("Collision with Ground: \n");
   collision->getEntityB()->getAbsCoor().debug();
+  collision->getEntityB()->setVelocity(Vector());
+  collision->getEntityB()->setAbsCoor(this->lastPositions[1]);
+  
+  */
+}
 
-  //collision->getEntityB()->setVelocity(Vector());
-  //collision->getEntityB()->setAbsCoor(this->lastPositions[5]);
-}
 
 

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

@@ -29 +29 @@
 
     Vector       lastPositions[10];           //!< last 10 positions
+    float        downspeed;
 };
 

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

@@ -942 +942 @@
   this->outputFraction = 1.0f;
   
-  Vector position = worldEntity->getAbsCoor();
+
 
 
@@ -958 +958 @@
   dest.z  += forwardDir.z;
   */
-
-  dest = worldEntity->getAbsCoor() - upDir*40.0;
+  Vector position = worldEntity->getAbsCoor() + upDir*5.0f ;
+  dest = worldEntity->getAbsCoor() - upDir*40.0f; //
   Vector out = dest;
 
@@ -986 +986 @@
 //   position1.debug();
 
+  if(!this->outputStartsOut )
+  {
+    this->collPlane = new plane;
+    this->collPlane->x = 0.0f;
+    this->collPlane->y = 0.0f;
+    this->collPlane->z = 0.0f;
+    collision = true;
+  }
+  else
+  {
+    
+    
+    
+    
   if( this->outputFraction == 1.0f)
   {
-    if(this->outputAllSolid)
+    if(this->outputAllSolid )
     {
       this->collPlane = new plane;
-      this->collPlane->x = 1.0f;
+      this->collPlane->x = 0.0f;
       this->collPlane->y = 0.0f;
       this->collPlane->z = 0.0f;
@@ -1013 +1027 @@
   }
 
+  
+  }
   // Return the normal here: Normal's stored in this->collPlane;
   if( collision) {
@@ -1018 +1034 @@
     worldEntity->registerCollision(this->parent, worldEntity, Vector(this->collPlane->x, this->collPlane->y, this->collPlane->z), out);
   }
+  else  worldEntity->registerCollision(this->parent, worldEntity, Vector(0.0, 1.0, 0.0), dest);
 
 }

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

@@ -124 +124 @@
   cycle = 0.0;
 
-  travelSpeed = 15.0;
+  travelSpeed =300.0;
   this->velocity = Vector(0.0,0.0,0.0);
 
@@ -293 +293 @@
   Vector accel(0.0, 0.0, 0.0);
   /*
-  Vector rot(0.0, 0.0, 0.0); // wird benötigt für Helicopter
+  Vector rot(0.0, 0.0, 0.0); // wird ben�igt fr Helicopter
   */
   //float rotVal = 0.0;

branches/bsp_model/src/world_entities/space_ships/collision_probe.cc

@@ -67 +67 @@
   this->loadModel("models/dr_freak.md2");
 
-  this->localVelocity = Vector(0,-4,0);
+  this->localVelocity = Vector(0,0,0);
 }