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

Timestamp:

Jun 1, 2006, 5:10:54 PM (18 years ago)

Author:

bensch

Message:

merges some merges

Location:

branches/bsp_model/src/lib/graphics/importer

Files:

• Makefile.am (modified) (1 diff)
• bsp_file.cc (copied) (copied from branches/bsp_model_old/src/lib/graphics/importer/bsp_file.cc)
• bsp_file.h (copied) (copied from branches/bsp_model_old/src/lib/graphics/importer/bsp_file.h)
• bsp_manager.cc (copied) (copied from branches/bsp_model_old/src/lib/graphics/importer/bsp_manager.cc) (19 diffs)
• bsp_manager.h (copied) (copied from branches/bsp_model_old/src/lib/graphics/importer/bsp_manager.h)
• bsp_tree_leaf.cc (copied) (copied from branches/bsp_model_old/src/lib/graphics/importer/bsp_tree_leaf.cc)
• bsp_tree_leaf.h (copied) (copied from branches/bsp_model_old/src/lib/graphics/importer/bsp_tree_leaf.h)
• bsp_tree_node.cc (copied) (copied from branches/bsp_model_old/src/lib/graphics/importer/bsp_tree_node.cc)
• bsp_tree_node.h (copied) (copied from branches/bsp_model_old/src/lib/graphics/importer/bsp_tree_node.h)

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

@@ -16 +16 @@
                            height_map.cc \
                            media_container.cc \
-                           movie_player.cc
+                           movie_player.cc \
+                           \
+                           bsp_manager.cc \
+                           bsp_file.cc
+
+
 
 libtc_a_SOURCES  = tc.cc
 
 
-noinst_HEADERS = model.h \
-                 tc.h \
-                 vertex_array_model.h \
-                 grid.h \
-                 static_model.h \
-                 objModel.h \
-                 primitive_model.h \
-                 md2Model.h \
-                 material.h \
-                 texture.h \
-                 texture_sequence.h \
-                 height_map.h \
-                 anorms.h \
-                 anormtab.h \
-                 media_container.h \
-                 movie_player.h
+noinst_HEADERS = \
+                model.h \
+                tc.h \
+                vertex_array_model.h \
+                grid.h \
+                static_model.h \
+                objModel.h \
+                primitive_model.h \
+                md2Model.h \
+                material.h \
+                texture.h \
+                texture_sequence.h \
+                height_map.h \
+                anorms.h \
+                anormtab.h \
+                media_container.h \
+                movie_player.h\
+                \
+                bsp_manager.h \
+                bsp_file.h

branches/bsp_model/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/
@@ -60 +60 @@
   */
   CDEngine::getInstance()->setBSPModel(this);
-  
-  
-  
 }
 
@@ -70 +67 @@
 {
 
-  
+
   if( root != NULL)
     this->loadParams(root);
-  
+
   CDEngine::getInstance()->setBSPModel(this);
 } */
@@ -117 +114 @@
   this->out1.y += this->collPlane->y*5.0;
   this->out1.z += this->collPlane->z*5.0;
-  
+
   this->out2.x += this->collPlane->x*10.0;
   this->out2.y += this->collPlane->y*10.0;
@@ -124 +121 @@
   this->drawDebugCube(&this->out1);
   this->drawDebugCube(&this->out2);
-  */ 
+  */
   // Draw Debug Terrain
   /*
-  this->bspFile->Materials[0]->select(); 
+  this->bspFile->Materials[0]->select();
   for(int i = 0; i <  this->bspFile->numPatches ; i++)
-        {
-                this->bspFile->VertexArrayModels[i]->draw();
-   
-        }
+        {
+                this->bspFile->VertexArrayModels[i]->draw();
+
+        }
   */
 
@@ -283 +280 @@
   glActiveTextureARB(GL_TEXTURE1_ARB);
   glBindTexture(GL_TEXTURE_2D, this->bspFile->whiteLightMap);
-  
- 
+
+
 
 }//draw
@@ -540 +537 @@
       // don't store plane
       // this->collPlane = &curPlane;
-      
+
     } else {   // line is leaving the brush
       float fraction = (startDistance + EPSILON) / (startDistance - endDistance);  // *
@@ -547 +544 @@
       // don't store plane
       //this->collPlane = & curPlane;
-      
+
     }
 
@@ -562 +559 @@
       if (startFraction < 0)
         startFraction = 0;
-      this->outputFraction = startFraction; 
+      this->outputFraction = startFraction;
     }
   }
@@ -609 +606 @@
       // store plane
       this->collPlane = &curPlane;
-      
+
     } else {   // line is leaving the brush
       float fraction = (startDistance + EPSILON) / (startDistance - endDistance);  // *
@@ -616 +613 @@
       // store plane
       this->collPlane = & curPlane;
-      
+
     }
 
@@ -631 +628 @@
       if (startFraction < 0)
         startFraction = 0;
-      this->outputFraction = startFraction; 
+      this->outputFraction = startFraction;
     }
   }
@@ -831 +828 @@
 {
   return;
-  
+
   Vector position = worldEntity->getAbsCoor();
 
@@ -839 +836 @@
   forwardDir.y =2.0*forwardDir.y;
   forwardDir.z =2.0*forwardDir.z;
-  
+
   Vector upDir = worldEntity->getAbsDirY();
   Vector dest = position;
@@ -847 +844 @@
   Vector out = Vector(-1875.0,-1875.0,-1875.0);
   if(!worldEntity->isA(CL_PLAYABLE)) {
-    
-    
-    
- 
+
+
+
+
   }
   else {
@@ -882 +879 @@
 
     }
-    
+
     this->checkCollisionRayN(this->root,0.0f,1.0f, &position, &dest );
     if(this->outputFraction == 1.0f) out = dest;
@@ -891 +888 @@
     out.y = position.y + (dest.y -position.y) * this->outputFraction;
     out.z = position.z + (dest.z -position.z) * this->outputFraction;
-    
+
     //Vector out3 = out + Vector(3*this->collPlane->x,3*this->collPlane->y,3*this->collPlane->z);
     //this->out = out;
@@ -898 +895 @@
     //this->drawDebugCube(&out1);
     //this->drawDebugCube(&out2);
-    
+
     //this->drawDebugCube(&out3);
-  
-    }
-   
+
+    }
+
     // Return the normal here: Normal's stored in this->collPlane;
     if(collision) worldEntity->collidesWithGround(out,out1,out2);
-  
+
   }
 
@@ -947 +944 @@
 
     /*
-        for(int i = 0; i < camLeaf.n_leafbrushes && i < 10; i++ )
-        {
-                brush& curBrush = ((brush*)(this->bspFile->brushes))[(camLeaf.leafbrush_first +i)%this->bspFile->numLeafBrushes];
-                if(curBrush.n_brushsides < 0) return;
-                for(int j = 0; j < curBrush.n_brushsides; j++)
-                {
-                float dist = -0.1;
-                brushside& curBrushSide = ((brushside*)(this->bspFile->brushSides))[(curBrush.brushside +j)%this->bspFile->numBrushSides];
-                plane&      testPlane = ((plane*)(this->bspFile->planes))[curBrushSide.plane % this->bspFile->numPlanes];
-                dist = testPlane.x * this->cam.x +  testPlane.y * this->cam.y  +  testPlane.z * this->cam.z   -testPlane.d ; 
-                
-                if(dist < -0.01f) dist = -1.0f *dist;
-                if(dist < 1.0f){
-                                this->drawDebugCube(&this->cam);
-                                return;
-                              }
-                }
-                        
-        } */
+        for(int i = 0; i < camLeaf.n_leafbrushes && i < 10; i++ )
+        {
+                brush& curBrush = ((brush*)(this->bspFile->brushes))[(camLeaf.leafbrush_first +i)%this->bspFile->numLeafBrushes];
+                if(curBrush.n_brushsides < 0) return;
+                for(int j = 0; j < curBrush.n_brushsides; j++)
+                {
+                float dist = -0.1;
+                brushside& curBrushSide = ((brushside*)(this->bspFile->brushSides))[(curBrush.brushside +j)%this->bspFile->numBrushSides];
+                plane&      testPlane = ((plane*)(this->bspFile->planes))[curBrushSide.plane % this->bspFile->numPlanes];
+                dist = testPlane.x * this->cam.x +  testPlane.y * this->cam.y  +  testPlane.z * this->cam.z   -testPlane.d ;
+
+                if(dist < -0.01f) dist = -1.0f *dist;
+                if(dist < 1.0f){
+                                this->drawDebugCube(&this->cam);
+                                return;
+                              }
+                }
+
+        } */
 
   }