Changeset 8699 in orxonox.OLD for branches/bsp_model/src/lib/graphics

Timestamp:

Jun 22, 2006, 2:32:46 AM (19 years ago)

Author:

patrick

Message:

bsp: the collision reaction now is adjusted to the object size

File:

• branches/bsp_model/src/lib/graphics/importer/bsp_manager.cc (modified) (3 diffs)

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

@@ -952 +952 @@
   Vector position;
   Vector out;
+  float height;
 
   if( box != NULL)
+  {
+    forwardDir = worldEntity->getAbsDirX();
+    forwardDir = forwardDir * box->halfLength[0];
+
+    upDir = Vector(0,1,0) * box->halfLength[1];
+
+    position = worldEntity->getAbsCoor() + box->center + box->axis[1] * box->halfLength[1];
+    dest     = worldEntity->getAbsCoor() + box->center - box->axis[1] * box->halfLength[1];
+    out      = dest;
+
+    height = box->halfLength[1];
+  }
+  else
   {
     forwardDir = worldEntity->getAbsDirX();
@@ -964 +978 @@
     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;
 
+    height = 40;
   }
 
@@ -994 +993 @@
   Vector dest1 = position1 + forwardDir;
   Vector dest2 = position2 + forwardDir;
-  dest = position - Vector(0.0, 40.0,0.0);
+//   dest = position - Vector(0.0, 40.0,0.0);
   Vector out1;
   Vector out2;
 
 
-  float height = 40;
+
 
   this->inputStart =  position;