Changeset 7352 in orxonox.OLD

Timestamp:

Apr 19, 2006, 5:46:35 PM (18 years ago)

Author:

bottac

Message:

Branch bsp_model created.

Location:

branches/bsp_model

Files:

• . (copied) (copied from trunk)
• src/lib/graphics/importer/Makefile.am (modified) (2 diffs)
• src/world_entities/terrain.cc (modified) (4 diffs)
• src/world_entities/terrain.h (modified) (2 diffs)

branches/bsp_model/src/lib/graphics/importer/Makefile.am

@@ -16 +16 @@
                            height_map.cc \
                            media_container.cc \
-                           movie_player.cc
+                           movie_player.cc \
+                           bsp_tree_node.cc \
+                           bsp_file.cc \
+                           bsp_manager.cc 
 
 libtc_a_SOURCES  = tc.cc
@@ -36 +39 @@
                  anormtab.h \
                  media_container.h \
-                 movie_player.h
+                 movie_player.h \
+                 bsp_tree_node.h \
+                 bsp_file.h \
+                 bsp_manager.h    

branches/bsp_model/src/world_entities/terrain.cc

@@ -30 +30 @@
 
 #include "glincl.h"
-
+#include "lib/graphics/importer/bsp_manager.h"
 #include "state.h"
 
@@ -107 +107 @@
   this->toList(OM_ENVIRON_NOTICK);
 
-  this->objectList = 0;
+ this->objectList = 0;
   this->ssp = NULL;
   this->vegetation = NULL;
-
+  
+  this->bspManager = new BspManager();
   this->heightMap = NULL;
 
-  this->heightMapMaterial = new Material();
+ this->heightMapMaterial = new Material();
+        
+  this->bspManager = new BspManager();
+  //this->loadTexture("maps/wall1.jpeg");
 }
 
@@ -204 +208 @@
   // Vector tmpRot = this->getAbsDir().getSpacialAxis();
   //glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-
+/*
   if (this->objectList)
     glCallList(this->objectList);
@@ -221 +225 @@
     this->heightMap->draw();
   }
+
+*/
+
+  this->bspManager->draw();
   glPopMatrix();
 

branches/bsp_model/src/world_entities/terrain.h

@@ -18 +18 @@
 class HeightMap;
 class Material;
+class BspManager;
 
 //! A simple method to call a desired debug world.
@@ -60 +61 @@
 
    HeightMap*          heightMap;
+   BspManager*         bspManager;
    Material*           heightMapMaterial;
    Vector              terrainScale;