Changeset 8864 in orxonox.OLD for branches/single_player_map/src/lib/graphics

Timestamp:

Jun 28, 2006, 3:51:36 PM (18 years ago)

Author:

patrick

Message:

new collision registration functions

File:

• branches/single_player_map/src/lib/graphics/importer/bsp_manager.cc (modified) (11 diffs)

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

@@ -1 +1 @@
 /*
    orxonox - the future of 3D-vertical-scrollers
- 
+
    Copyright (C) 2006 orx
- 
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
- 
+
    ### File Specific:
    main-programmer: bottac@ee.ethz.ch
- 
+
    Inspired by:
    Rendering Q3 Maps by Morgan McGuire                  http://graphics.cs.brown.edu/games/quake/quake3.html
    Unofficial Quake 3 Map Specs by Kekoa Proudfoot      http://graphics.stanford.edu/~kekoa/q3/
- 
+
    Collision detection adapted from:
    Quake 3 Collision Detection by Nathan Ostgard        http://www.devmaster.net/articles/quake3collision/
@@ -45 +45 @@
 
 #include "aabb.h"
-
+#include "cr_defs.h"
 
 
@@ -69 +69 @@
 BspManager::BspManager(const TiXmlElement* root)
 {
- 
- 
+
+
   if( root != NULL)
     this->loadParams(root);
- 
+
   CDEngine::getInstance()->setBSPModel(this);
 } */
@@ -99 +99 @@
   this->root  = this->bspFile->get_root();
   this->alreadyVisible = new bool [this->bspFile->numFaces];
- 
+
   CDEngine::getInstance()->setBSPModel(this);
 }
@@ -962 +962 @@
   upDir.z = 0.0;
   Vector dest;
-   
+
 
   Vector position = worldEntity->getAbsCoor();       //+ upDir*10.0f ;
@@ -978 +978 @@
   Vector out2;
 
- 
+
 
   float height = 40;
-  
-  
+
+
   if( box != NULL)
   {
     position = worldEntity->getAbsCoor() +  box->center; // + box->axis[1] * box->halfLength[1];
     dest     = worldEntity->getAbsCoor() +  box->center - box->axis[1] * box->halfLength[1] * 40.0;
-    
+
     position1 = worldEntity->getAbsCoor() +  box->center + box->axis[0] * box->halfLength[0] * 2.0f;
     dest1     = worldEntity->getAbsCoor() +  box->center - box->axis[0] * box->halfLength[0] *2.0f;
-    
-        
+
+
     position2 = worldEntity->getAbsCoor() +  box->center + box->axis[2] * box->halfLength[2] * 2.0f;
     dest2     = worldEntity->getAbsCoor() +  box->center - box->axis[2] * box->halfLength[2] * 2.0f;
-    
+
   }
   else
   {
-    
-  }
-
-  
-  
+
+  }
+
+
+
   //
   this->inputStart =  position;
@@ -1025 +1025 @@
         this->collPlane->z = 0.0f;
         collision = true;
-      } else 
+      } else
         collision = false;
-        
-        
+
+
         out = dest;
-      
+
     } else {
       collision = true;
@@ -1046 +1046 @@
   plane* testPlane = this->collPlane;
 
-  
+
   // 2nd Collision Detection
   this->outputStartsOut = true;
@@ -1056 +1056 @@
   out.x = this->outputFraction;
   //out.z = this->outputFraction;
-  
-  
+
+
     // 3rd Collision Detection
   this->outputStartsOut = true;
@@ -1067 +1067 @@
   //out.x = this->outputFraction;
   out.z = this->outputFraction;
-  
+
 
   /*
@@ -1077 +1077 @@
 
   // Return the normal here: Normal's stored in this->collPlane;
-  if( collision) 
+  if( collision)
   {
     PRINTF(5)("We got a collision!! Are you sure: outputFraction = %f\n", this->outputFraction);
-    worldEntity->registerCollision(this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), out);
-  } 
-  else  worldEntity->registerCollision(this->parent, worldEntity, Vector(0.0, 2.0, 0.0), dest);
+    worldEntity->registerCollision(COLLISION_TYPE_AXIS_Y, this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), out);
+  }
+  else  worldEntity->registerCollision(COLLISION_TYPE_AXIS_Y, this->parent, worldEntity, Vector(0.0, 2.0, 0.0), dest);
 
 }