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

Timestamp:

Jun 29, 2006, 10:47:05 PM (18 years ago)

Author:

patrick

Message:

collision reaction refine

Location:

branches/single_player_map/src/lib/graphics/importer

Files:

• bsp_manager.cc (modified) (1 diff)
• bsp_manager.h (modified) (4 diffs)

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

@@ -987 +987 @@
   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;
+    dest     = worldEntity->getAbsCoor() +  box->center - box->axis[1] * box->halfLength[1]  * 40.0f;
 
     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;
+    dest1     = worldEntity->getAbsCoor() +  box->center - box->axis[0] * box->halfLength[0] * 2.0f;
 
 

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

@@ -28 +28 @@
 
 
+#define BSP_X_OFFSET 10.0f
+#define BSP_Y_OFFSET 40.0f
+#define BSP_Z_OFFSET 10.0f
+
 
 // FORWARD DECLARATIONS
@@ -56 +60 @@
 
   BspManager(const char* fileName, float scale = 0.4f);
-  
+
   // Deconstructor
   ~BspManager();
-  
- 
+
+
 
   // Functions
@@ -106 +110 @@
   Vector inputStart;
   Vector inputEnd;
-  
+
   Vector traceMins; //!< Mins of current bbox
   Vector traceMaxs; //!< Maxs of current bbox
@@ -122 +126 @@
   Vector out1; //!< For debugging only
   Vector out2; //!< For debugging only
-                        
+
   int tgl;
 };