Changeset 8907 in orxonox.OLD for branches

Timestamp:

Jun 29, 2006, 2:10:27 PM (18 years ago)

Author:

bottac

Message:

further bugs fixed.

Location:

branches/single_player_map/src

Files:

• lib/collision_reaction/cr_physics_ground_walk.cc (modified) (4 diffs)
• lib/graphics/importer/bsp_manager.cc (modified) (1 diff)
• world_entities/bsp_entity.cc (modified) (3 diffs)

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

@@ -23 +23 @@
 #include "world_entity.h"
 #include "cr_physics_ground_walk.h"
+#include "collision_reaction.h"
 
 #include <vector>
@@ -72 +73 @@
   WorldEntity* entity = collision->getEntityB();
 
-  // collision position maths
-  Vector collPos =  collision->getEntityB()->getAbsCoor()  + box->center - ce->getCollisionPosition();
-
-  float CR_MAX_WALK_HEIGHT = 2.0f;
-  float CR_THRESHOLD = 0.2f;
-
   if( box == NULL)
   {
@@ -83 +78 @@
     return;
   }
+  
+  
+  // collision position maths
+  Vector collPos =  collision->getEntityB()->getAbsCoor()  + box->center - ce->getCollisionPosition();
+
+  float CR_MAX_WALK_HEIGHT = 2.0f;
+  float CR_THRESHOLD = 0.2f;
+
 
 
@@ -89 +92 @@
     case COLLISION_TYPE_AXIS_Y:
 
-      height = collPos.y - box->halfLength[1];
-     // PRINTF(0)("height: %f          , model height: %f\n", height, box->halfLength[1]);
-     // PRINTF(0)(" ground normal: %f, %f, %f\n", normal.x, normal.y, normal.z);
-
-      // object is beneath the plane (ground)
-      if( height <= 0.0f )
-      {
-        entity->shiftCoor(Vector(0, -height, 0));
-      }
-      // object is already in the wall
-      else if( ce->isInWall())
-      {
-        entity->setAbsCoor(entity->getLastAbsCoor());
-      }
-      break;
-
+//       height = collPos.y - box->halfLength[1];
+//       PRINTF(0)("height: %f          , model height: %f\n", height, box->halfLength[1]);
+//       PRINTF(0)(" ground normal: %f, %f, %f\n", normal.x, normal.y, normal.z);
+// 
+//       // object is beneath the plane (ground)
+//       if( height <= 0.0f )
+//       {
+//         entity->shiftCoor(Vector(0, -height, 0));
+//       }
+//       // object is already in the wall
+//       else if( ce->isInWall())
+//       {
+//         entity->setAbsCoor(entity->getLastAbsCoor());
+//       }
+//       break;
+// 
 
     case COLLISION_TYPE_AXIS_X:

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

@@ -91 +91 @@
   this->bspFile->scale =  scale;
   if(this->bspFile->read(ResourceManager::getFullName(fileName).c_str()) == -1)
-    return -1;
+  return -1;
+  
   this->bspFile->build_tree();
   this->root  = this->bspFile->get_root();

branches/single_player_map/src/world_entities/bsp_entity.cc

@@ -39 +39 @@
 BspEntity::~BspEntity ()
 {
-  if( this->bspManager)
+  if( this->bspManager != NULL)
     delete this->bspManager;
 }
@@ -51 +51 @@
 void BspEntity::init()
 {
-  this->setClassID(CL_BSP_ENTITY, "BspEntity");
+
   this->bspManager = NULL;
   /**
@@ -64 +64 @@
 
   // Check wether file exists....
-  if ( File(ResourceManager::getFullName(name)).exists()  ){
-    // War das Laden erfolgreich?
+  if ( File(ResourceManager::getFullName(name)).exists()  ) {
+
+    this->setClassID(CL_BSP_ENTITY, "BspEntity");
     this->bspManager = new BspManager(this);
+
     if(this->bspManager->load(name.c_str(), 0.1f) == -1 ) {
       this->bspManager = NULL;
-      // Dont do anything
+
     } else {
-
-     
       this->toList(OM_ENVIRON); // Success!!!
     }
   } else {
+    this->bspManager = NULL;
     this->toList(OM_DEAD);
   }