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

Timestamp:

Jun 7, 2006, 9:06:41 PM (18 years ago)

Author:

patrick

Message:

bsp: integrating the bspmanager fully into the collision detection/reaction system

Location:

branches/bsp_model/src/lib/graphics/importer

Files:

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

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

@@ -77 +77 @@
 void BspManager::load(const char* fileName, float scale)
 {
-  //this->setClassID(CL_BSP_MODEL, "BspManager");
+  this->setClassID(CL_BSP_MODEL, "BspManager");
   // open a BSP file
   this->bspFile = new BspFile();

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

@@ -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/
@@ -22 +22 @@
 #include <vector>
 #include <deque>
+
+#include "base_object.h"
 
 // FORWARD DECLARATIONS
@@ -41 +43 @@
 };
 
-class BspManager
+class BspManager : public BaseObject
 {
 public:
   // Constructors
   BspManager();
-  
+
   BspManager(const char* fileName, float scale = 0.4f);
   void load(const char* fileName, float scale);
@@ -53 +55 @@
   const void draw();
   const void tick(float time);
-  void draw_debug_face(int Face); 
+  void draw_debug_face(int Face);
   void draw_face(int Face);
   void draw_patch(face* Face);
-  
+
 
   void checkCollision(WorldEntity* worldEntity); /*!< WorldEntities use this function to check wheter they collided with the BSPEntity.
@@ -65 +67 @@
   BspTreeNode* getLeaf(BspTreeNode*  node,   Vector* cam) ;  //!< Traverses the tree
   void  checkCollision(BspTreeNode* node, Vector* cam); //!< Obsolete. Use this function for debugging only!
-  void  checkCollisionRay(BspTreeNode * node,float startFraction, float endFraction, Vector* start, Vector* end); 
+  void  checkCollisionRay(BspTreeNode * node,float startFraction, float endFraction, Vector* start, Vector* end);
   void  checkCollisionRayN(BspTreeNode * node,float startFraction, float endFraction, Vector* start, Vector* end);
   void TraceBox( Vector& inputStart, Vector& inputEnd,Vector& inputMins, Vector& inputMaxs );
@@ -74 +76 @@
   bool isAlreadyVisible(int Face);
   void addFace(int Face);
-  
+
   // Data
   BspFile*  bspFile;
@@ -83 +85 @@
   plane* collPlane;
   int lastTex;
-  
+
   //obsolete: global variables for collision detection
   bool  outputStartsOut;
@@ -90 +92 @@
   Vector traceMins; //!< Mins of current bbox
   Vector traceMaxs; //!< Maxs of current bbox
-  Vector traceExtents; /*!< Stores the maximum of the absolute value of each axis in the box. 
+  Vector traceExtents; /*!< Stores the maximum of the absolute value of each axis in the box.
                             For example, if traceMins was (-100,-3,-15) and traceMaxs was (55,22,7), traceExtents */
-  
- 
+
+
   bool * alreadyVisible;
   // Deques to store the visible faces
@@ -100 +102 @@
 
   Vector out;  //!< For debugging only
-  Vector out1; //!< For debugging only 
+  Vector out1; //!< For debugging only
   Vector out2; //!< For debugging only
 };