Changeset 9417 in orxonox.OLD for branches/terrain/src/lib/graphics/importer/bsp_file.cc

Timestamp:

Jul 24, 2006, 1:23:47 PM (18 years ago)

Author:

bensch

Message:

Cleanup after merge

File:

• branches/terrain/src/lib/graphics/importer/bsp_file.cc (modified) (16 diffs)

branches/terrain/src/lib/graphics/importer/bsp_file.cc

@@ -102 +102 @@
         this->numTextures = lump.length/sizeof(BspTexture);
         this->textures = new char[lump.length];
-        file.seekg( lump.offset );      
-        file.read( TEXTURE_SEMANTICS, this->numTextures, 
+        file.seekg( lump.offset );
+        file.read( TEXTURE_SEMANTICS, this->numTextures,
                 this->textures, slurpedBytes );
 }
 void BspFile::readPlanes()
-{       
+{
         size_t slurpedBytes;
         bsp_lump& lump = header.lumps[Planes];
@@ -113 +113 @@
         this->planes = new plane[this->numPlanes];
         file.seekg( lump.offset );
-        file.read( PLANE_SEMANTICS, this->numPlanes, 
+        file.read( PLANE_SEMANTICS, this->numPlanes,
                 this->planes, slurpedBytes );
 }
@@ -124 +124 @@
         this->nodes = new node[this->numNodes];
         file.seekg( lump.offset );
-        file.read( NODE_SEMANTICS, this->numNodes, 
+        file.read( NODE_SEMANTICS, this->numNodes,
                 this->nodes, slurpedBytes );
 }
@@ -135 +135 @@
         this->leaves = new leaf[this->numLeafs];
         file.seekg( lump.offset );
-        file.read( LEAF_SEMANTICS, this->numLeafs, 
-                this->leaves, slurpedBytes );   
+        file.read( LEAF_SEMANTICS, this->numLeafs,
+                this->leaves, slurpedBytes );
 }
 
@@ -146 +146 @@
         this->leafFaces = (char*)( new int[this->numLeafFaces] );
         file.seekg( lump.offset );
-        file.read( "i", this->numLeafFaces, 
+        file.read( "i", this->numLeafFaces,
                 this->leafFaces, slurpedBytes );
 }
@@ -157 +157 @@
         this->leafBrushes = (char*) ( new int[this->numLeafBrushes] );
         file.seekg( lump.offset );
-        file.read( "i", this->numLeafBrushes, 
-                this->leafBrushes, slurpedBytes );      
+        file.read( "i", this->numLeafBrushes,
+                this->leafBrushes, slurpedBytes );
 }
 
@@ -168 +168 @@
         this->bspModels = new model[this->numBspModels];
         file.seekg( lump.offset );
-        file.read( MODEL_SEMANTICS, this->numBspModels, 
+        file.read( MODEL_SEMANTICS, this->numBspModels,
                 this->bspModels, slurpedBytes );
 }
@@ -179 +179 @@
         this->brushes = new brush[numBrushes];
         file.seekg( lump.offset );
-        file.read( BRUSH_SEMANTICS, numBrushes, 
+        file.read( BRUSH_SEMANTICS, numBrushes,
                 this->brushes, slurpedBytes );
 }
@@ -189 +189 @@
         this->vertice = (char*)( new BspVertex[this->numVertex] );
         file.seekg( lump.offset );
-        file.read( VERTEX_SEMANTICS, this->numVertex, 
+        file.read( VERTEX_SEMANTICS, this->numVertex,
                 this->vertice, slurpedBytes );
 }
@@ -215 +215 @@
         this->faces = new face[this->numFaces];
         file.seekg( lump.offset );
-        file.read( FACE_SEMANTICS, this->numFaces, 
+        file.read( FACE_SEMANTICS, this->numFaces,
                 this->faces, slurpedBytes );
 }
@@ -226 +226 @@
         this->lightMaps = new lightmap[this->numLightMaps];
         file.seekg( lump.offset );
-        file.read( LIGHTMAP_SEMANTICS, this->numLightMaps, 
+        file.read( LIGHTMAP_SEMANTICS, this->numLightMaps,
                 this->lightMaps, slurpedBytes );
 }
 void BspFile::readLightvols()
 {
-        /* not loaded atm */    
+        /* not loaded atm */
 }
 void BspFile::readBrushSides()
@@ -241 +241 @@
         this->brushSides = new brushside[this->numBrushSides];
         file.seekg( lump.offset );
-        file.read( BRUSHSIDE_SEMANTICS, this->numBrushSides, 
+        file.read( BRUSHSIDE_SEMANTICS, this->numBrushSides,
                 this->brushSides, slurpedBytes );
 }
@@ -251 +251 @@
         file.seekg( lump.offset );
         file.read( "i2", 1, this->visData, slurpedBytes );
-        file.read( "b", lump.length-8, 
-                this->visData+8, slurpedBytes );        
+        file.read( "b", lump.length-8,
+                this->visData+8, slurpedBytes );
 }
 /**
@@ -267 +267 @@
         if (file.exists() && file.open( File::ReadOnly ) ) {
         PRINTF(0)("BSP FILE: Datei %s gefunden. \n", name);
-        
+
                 //BSP-Files have little endian order.
                 file.setByteorder( LittleEndian );
                 file.read( HEADER_SEMANTICS, (void*)&header, slurpedBytes );
                 if ( header.version != 46 ) {
-                        PRINTF(0)("BSP FILE: Wrong BSPVersion. We only handle 0x2e-files!\n");   
-                        //!< now, we should do some error handling              
+                        PRINTF(0)("BSP FILE: Wrong BSPVersion. We only handle 0x2e-files!\n");
+                        //!< now, we should do some error handling
                         return ( -1 );
                 }
@@ -280 +280 @@
                 readPlanes();
                 readNodes();
-                readLeafs(); readLeafFaces(); readLeafBrushes(); 
-                readModels(); 
+                readLeafs(); readLeafFaces(); readLeafBrushes();
+                readModels();
                 readVertices(); readMeshVerts();
                 readBrushSides(); readBrushes();
@@ -287 +287 @@
                 readFaces();
                 readLightmaps(); readLightvols();
-                readVisdata(    
+                readVisdata();
         file.close();