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

Timestamp:

Jun 29, 2006, 9:48:25 PM (18 years ago)

Author:

patrick

Message:

the ground walking algorithm is almost working again

File:

• branches/single_player_map/src/lib/graphics/importer/bsp_manager.cc (modified) (10 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/
@@ -69 +69 @@
 BspManager::BspManager(const TiXmlElement* root)
 {
- 
- 
+
+
   if( root != NULL)
     this->loadParams(root);
- 
+
   CDEngine::getInstance()->setBSPModel(this);
 } */
@@ -111 +111 @@
   this->root  = this->bspFile->get_root();
   this->alreadyVisible = new bool [this->bspFile->numFaces];
- 
+
   CDEngine::getInstance()->setBSPModel(this);
 }
@@ -986 +986 @@
 
   if( box != NULL) {
-    position = worldEntity->getAbsCoor() +  box->center; // + box->axis[1] * 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] * 40.0;
 
@@ -998 +998 @@
   } else {
     // Init positions and destinations to anything useful!
-   
+
   }
 
@@ -1049 +1049 @@
   bool xCollision = false;
   bool zCollision = false;
-  
+
 
     // 2nd Collision Detection
@@ -1070 +1070 @@
     //out.z = this->outputFraction;
 
-   
+
 
       // 3rd Collision Detection
@@ -1078 +1078 @@
       this->inputStart =  position2;
       this->inputEnd =   dest2;
-      
+
       this->checkCollisionRayN(this->root,0.0f,1.0f, &position2, &dest2 );
       //out.x = this->outputFraction;
@@ -1092 +1092 @@
         zCollision = true;
       }
-    
+
   //end if
   /*
@@ -1102 +1102 @@
 
   // Return the normal here: Normal's stored in this->collPlane;
-/*  if( collision) {
-    PRINTF(5)("We got a collision!! Are you sure: outputFraction = %f\n", this->outputFraction);
+  if( collision) {
     worldEntity->registerCollision(COLLISION_TYPE_AXIS_Y , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), out, SolidFlag);
-} */
+}
   if(xCollision) {
     worldEntity->registerCollision(COLLISION_TYPE_AXIS_X , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), out, SolidFlag);