Changeset 9415 in orxonox.OLD for branches/terrain/src/lib/graphics/importer/terrain/terrain_page.cc

Timestamp:

Jul 24, 2006, 12:59:44 PM (18 years ago)

Author:

bensch

Message:

some newlines

File:

• branches/terrain/src/lib/graphics/importer/terrain/terrain_page.cc (modified) (37 diffs)

branches/terrain/src/lib/graphics/importer/terrain/terrain_page.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: Marco Biasini
- 
+
  */
 #include "terrain_page.h"
@@ -26 +26 @@
         }\
         while ( 0 )
-        
+
 TerrainPage::~TerrainPage( )
-{ 
+{
         SAVE_DELETE_ARRAY( indices );
         SAVE_DELETE_ARRAY( vertices );
-        SAVE_DELETE_ARRAY( indexHash );         
-        SAVE_DELETE_ARRAY( errors );    
+        SAVE_DELETE_ARRAY( indexHash );
+        SAVE_DELETE_ARRAY( errors );
 }
 
@@ -41 +41 @@
         numVertices = numIndices = 0;
         errors = new LODError[TerrainPage::MAX_LODS];
-        vertices = NULL; indices = NULL; 
+        vertices = NULL; indices = NULL;
         left = top = bottom = right = NULL;
         for ( int i = 0; i < 8; ++i )
-                layerVisibility[i] = LV_NO;     
-                
-        position = Vector( scale.x*_xOffset, 
+                layerVisibility[i] = LV_NO;
+
+        position = Vector( scale.x*_xOffset,
                 0.0f, scale.z*_zOffset );
         isVisible = false;
         next = NULL;
         active = false;
-        previous = NULL; 
+        previous = NULL;
         currentLOD = -1; wantedLOD = -1;
         hasfull = false;
@@ -58 +58 @@
 }
 
-void TerrainPage::tesselateRow( int _z, int _xStride, int _zStride, 
+void TerrainPage::tesselateRow( int _z, int _xStride, int _zStride,
         bool _adaptLeft, bool _adaptRight )
 {
-        
-        int xStart = 0, xEnd = owner->getPageSize();    
+
+        int xStart = 0, xEnd = owner->getPageSize();
         int halfStride = _zStride >> 1;
         assert( _xStride > 0 );         assert( _zStride > 0 );
@@ -70 +70 @@
         }
         if ( _adaptLeft ) {
-                assert( halfStride > 0 );               
+                assert( halfStride > 0 );
                 addIndex( getIndex( 0, _z ) );
                 addIndex( getIndex( 0, _z+halfStride ) );
@@ -79 +79 @@
                 xStart = _xStride;
         }
-        
+
         if ( _adaptRight )
                 xEnd-=_xStride;
-                
+
         for ( int x = xStart; x < xEnd; x+=_xStride ) {
                 addIndex( getIndex( x, _z) );
                 addIndex( getIndex( x, _z+_zStride ) );
         }
-        
+
         int w = owner->getPageSize()-1;
-        
+
         if ( _adaptRight ) {
-                assert( halfStride > 0 );               
+                assert( halfStride > 0 );
                 addIndex( getIndex( xEnd-1, _z ) );
                 addAgain();
@@ -106 +106 @@
 {
         _adapt[0] = _adapt[1] = _adapt[2] = _adapt[3] = false;
-        
+
         if ( left  && left->isActive() ) {
                 _adapt[TP_LEFT] = ( wantedLOD - left->getWantedLOD() ) > 0;
-                assert( std::abs( wantedLOD - left->wantedLOD ) < 2 );          
-        }       
+                assert( std::abs( wantedLOD - left->wantedLOD ) < 2 );
+        }
         if ( right && right->isActive() ) {
                 _adapt[TP_RIGHT] = ( wantedLOD - right->getWantedLOD() ) > 0;
-                assert( std::abs( wantedLOD - right->wantedLOD ) < 2 );         
-        }       
-                
+                assert( std::abs( wantedLOD - right->wantedLOD ) < 2 );
+        }
+
         if ( top && top->isActive() ) {
-                _adapt[TP_TOP] = ( wantedLOD - top->getWantedLOD() ) > 0;                               
-                assert( std::abs( wantedLOD - top->wantedLOD ) < 2 );           
-        }       
+                _adapt[TP_TOP] = ( wantedLOD - top->getWantedLOD() ) > 0;
+                assert( std::abs( wantedLOD - top->wantedLOD ) < 2 );
+        }
         if ( bottom && bottom->isActive() ) {
-                _adapt[TP_BOTTOM] = ( wantedLOD - bottom->getWantedLOD() ) > 0;         
+                _adapt[TP_BOTTOM] = ( wantedLOD - bottom->getWantedLOD() ) > 0;
                 assert( std::abs( wantedLOD - bottom->wantedLOD ) < 2 );
-        }       
+        }
 }
 
@@ -130 +130 @@
         wantedLOD = -1;
         Vector cam( owner->getCameraPosition() );
-        
+
         for ( int i = TerrainPage::MAX_LODS-1; i >= 0; --i ) {
                 Vector distance( cam.x-errors[i].correct.x,
                                                  cam.y-errors[i].correct.y,
                                                  cam.z-errors[i].correct.z );
-                
+
                 float d = distance.len();
-                
+
                 float err =  errors[i].diff / d ;
-                
+
                 if ( err*scale.y < owner->getDetail() ) {
                         wantedLOD = i;
                         break;
-                }       
+                }
         }
         if ( wantedLOD < 0 ) {
                 wantedLOD = TerrainPage::MAX_LODS-1;
-        }       
+        }
         return wantedLOD;
 }
@@ -153 +153 @@
 void TerrainPage::activate()
 {
-        
+
         pTerrainPage list = owner->getActiveList();
         next = list;
@@ -164 +164 @@
 {
         pTerrainPage list = owner->getActiveList();
-        
+
         if ( previous ) {
                 previous->next = next;
@@ -175 +175 @@
         next = NULL;
         previous = NULL;
-        
+
 }
 
@@ -186 +186 @@
         {
                 int stride = 1 << _lod, x0, y0, xi, yi;
-                // Altough these four nested loops look very scary, they're not 
-                // that bad and require only about O(n^2). 
+                // Altough these four nested loops look very scary, they're not
+                // that bad and require only about O(n^2).
                 for( y0 = 0 ; y0 < size-stride; y0 += stride ) {
                         for( x0 = 0; x0 < size-stride; x0 += stride ) {
@@ -197 +197 @@
                                                 float   fx0 = ( float )xi/( float )stride, fx1 = 1.0f-fx0,
                                                                 fy0 = ( float )yi/( float )stride, fy1 = 1.0f-fy0;
-                                                
+
                                                 float   height00 = getAltitude( x0, y0 ),
                                                                 height10 = getAltitude( x0+stride,y0 ),
                                                                 height01 = getAltitude( x0,y0+stride ),
                                                                 height11 = getAltitude( x0+stride, y0+stride );
-                                                
+
                                                 float   paintHeight =   fx1*fy1 * height00 +
                                                         fx0*fy1 * height10 +
@@ -208 +208 @@
                                                         fx0*fy0 * height11,
                                                         correctHeight =  getAltitude( x, y );
-                                                
+
                                                 float   er = ( float )fabs( correctHeight - paintHeight );
-                                                
+
                                                 numErrors++;
                                                 sumError += er;
@@ -229 +229 @@
         int size = owner->getPageSize();
         float alt = 0.0f;
-        
-        Vector  min( xOffset*scale.x ,0.0f, zOffset*scale.z ), 
+
+        Vector  min( xOffset*scale.x ,0.0f, zOffset*scale.z ),
                         max( (xOffset+1)*scale.x, 0.0f, (zOffset+1)*scale.z);
-        
+
         min.y = max.y = getAltitude( 0, 0 );
         for ( int x = 0; x < size; ++x ) {
@@ -248 +248 @@
         assert( _x >= 0 && _x < 17 );
         assert( _z >= 0 && _z < 17 );
-        return position.y+scale.y*owner->getAltitude( 
-                        _x+(owner->getPageSize()-1)*xOffset, 
+        return position.y+scale.y*owner->getAltitude(
+                        _x+(owner->getPageSize()-1)*xOffset,
                         _z+(owner->getPageSize()-1)*zOffset );
 }
@@ -255 +255 @@
 bool TerrainPage::needsRetesselation()
 {
-        
+
         bool    leftChanged     = ( left && left->isActive() ) &&
                                 ( left->wantedLOD != left->currentLOD ),
-                        rightChanged    = ( right && right->isActive() ) && 
+                        rightChanged    = ( right && right->isActive() ) &&
                                 ( right->wantedLOD != right->currentLOD ),
-                        topChanged              = ( top && top->isActive() ) && 
+                        topChanged              = ( top && top->isActive() ) &&
                                 ( top->wantedLOD != currentLOD ),
-                        bottomChanged   = ( bottom && bottom->isActive() ) && 
+                        bottomChanged   = ( bottom && bottom->isActive() ) &&
                                 ( bottom->wantedLOD != bottom->currentLOD ),
                         iChanged                =  wantedLOD != currentLOD;
-                                
-        return ( leftChanged || rightChanged || topChanged || bottomChanged || 
+
+        return ( leftChanged || rightChanged || topChanged || bottomChanged ||
                 forceTesselation || iChanged );
 }
@@ -275 +275 @@
         if ( needsRetesselation() ) {
                 tesselate( wantedLOD );
-        }       
+        }
         currentLOD = wantedLOD;
-        
-        //Check if the page is a level four page. If yes, copy the vertex and index data into 
+
+        //Check if the page is a level four page. If yes, copy the vertex and index data into
         //the shared level four page buffers.
         if ( currentLOD == TerrainPage::MAX_LODS-1 ) {
-                owner->addLevelFourPage( numVertices, vertices, 
+                owner->addLevelFourPage( numVertices, vertices,
                         numIndices, indices );
         }
@@ -287 +287 @@
 }
 
-void TerrainPage::tesselateTopRow(  int _z, int _stride, 
+void TerrainPage::tesselateTopRow(  int _z, int _stride,
         bool _adaptLeft,  bool _adaptRight )
 {
@@ -293 +293 @@
         int xStart = 0, xEnd= owner->getPageSize()-1;
         int size = xEnd;
-        int z = xEnd-_stride ;  
+        int z = xEnd-_stride ;
         addAgain();
         addIndex( getIndex( 0, z ) );
@@ -331 +331 @@
 
 }
-void TerrainPage::tesselateBottomRow(  int _z,  int _stride,  
+void TerrainPage::tesselateBottomRow(  int _z,  int _stride,
         bool _adaptLeft,  bool _adaptRight  )
 {
@@ -380 +380 @@
         numIndices = numVertices = 0;
         const int       halfStride = 8, stride = 16;
-        
+
         enum { ADAPT_L = 1, ADAPT_R = 2, ADAPT_B = 4, ADAPT_T = 8,
-                ADAPT_LR = 3, ADAPT_LB = 5, ADAPT_LT = 9, ADAPT_RB = 6, 
-                ADAPT_RT = 10, ADAPT_BT = 12, ADAPT_LRB = 7, ADAPT_LBT = 13, ADAPT_LRT = 11, 
+                ADAPT_LR = 3, ADAPT_LB = 5, ADAPT_LT = 9, ADAPT_RB = 6,
+                ADAPT_RT = 10, ADAPT_BT = 12, ADAPT_LRB = 7, ADAPT_LBT = 13, ADAPT_LRT = 11,
                 ADAPT_RBT = 14, ADAPT_LRBT = 15, ADAPT_NONE = 0 };
-                
-        int                     code =  ( _adapt[TP_LEFT]       ? ADAPT_L : 0 ) | 
-                                                ( _adapt[TP_RIGHT]      ? ADAPT_R : 0 ) | 
-                                                ( _adapt[TP_BOTTOM] ? ADAPT_B : 0 ) | 
+
+        int                     code =  ( _adapt[TP_LEFT]       ? ADAPT_L : 0 ) |
+                                                ( _adapt[TP_RIGHT]      ? ADAPT_R : 0 ) |
+                                                ( _adapt[TP_BOTTOM] ? ADAPT_B : 0 ) |
                                                 ( _adapt[TP_TOP]        ? ADAPT_T : 0 );
         switch( code ) {
@@ -397 +397 @@
                         addIndex( getIndex( stride, stride ) );
                         break;
-                        
+
                 case ADAPT_L:
                         addIndex( getIndex( 0, 0 ) );
@@ -406 +406 @@
                         addAgain( );
                         break;
-                
+
                 case ADAPT_R:
                         addIndex( getIndex( stride, stride ) );
@@ -556 +556 @@
 {
 
-        memset( indexHash, 0xffff, 
+        memset( indexHash, 0xffff,
                         sizeof(unsigned short)*Terrain::MAX_VERTICES );
-        
+
         numVertices = 0; numIndices = 0;
-        
+
         //Calculate the pace, based on the lod.
         int stride = 1 << _lod;
-                
+
         bool adapt[4];
         determineBorderAdaption( adapt );
@@ -573 +573 @@
                         vbIdentifier = ibIdentifier = 0;
                 }
-                if ( !vertices ) 
-                        vertices =  new Vertex[8]; 
+                if ( !vertices )
+                        vertices =  new Vertex[8];
                 if ( !indices )
                         indices = new unsigned short[8];
@@ -585 +585 @@
                         if ( indices )
                                 delete[] indices;
-                        vertices = NULL; indices = NULL;        
+                        vertices = NULL; indices = NULL;
                 }
                 assert( vbIdentifier ); assert( ibIdentifier );
@@ -591 +591 @@
 
                 // The call to glBufferDataARB with a null argument for data is to make things faster.
-                // Then calling call glMapBuffer() tells the driver that the previous 
-                // data aren’t valid. As a consequence, if the GPU is still working on them, there won’t 
-                // be a conflict because we invalidated these data. The function glMapBuffer() returns a 
-                // new pointer that we can use while the GPU is working on the previous set of data.. 
-
-                glBufferDataARB( GL_ARRAY_BUFFER_ARB, Terrain::MAX_VERTICES*sizeof( Vertex ), 
+                // Then calling call glMapBuffer() tells the driver that the previous
+                // data aren’t valid. As a consequence, if the GPU is still working on them, there won’t
+                // be a conflict because we invalidated these data. The function glMapBuffer() returns a
+                // new pointer that we can use while the GPU is working on the previous set of data..
+
+                glBufferDataARB( GL_ARRAY_BUFFER_ARB, Terrain::MAX_VERTICES*sizeof( Vertex ),
                         NULL, GL_DYNAMIC_DRAW_ARB );
 
-                vertices = (Vertex*)glMapBufferARB( GL_ARRAY_BUFFER_ARB, 
+                vertices = (Vertex*)glMapBufferARB( GL_ARRAY_BUFFER_ARB,
                         GL_WRITE_ONLY_ARB );
 
                 glBindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, ibIdentifier );
 
-                glBufferDataARB( GL_ELEMENT_ARRAY_BUFFER_ARB, 
-                        Terrain::MAX_INDICES*sizeof( short ), NULL, GL_DYNAMIC_DRAW_ARB );      
-
-                indices = (unsigned short*)glMapBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, 
+                glBufferDataARB( GL_ELEMENT_ARRAY_BUFFER_ARB,
+                        Terrain::MAX_INDICES*sizeof( short ), NULL, GL_DYNAMIC_DRAW_ARB );
+
+                indices = (unsigned short*)glMapBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB,
                         GL_WRITE_ONLY_ARB );
 
-        }       
-
-#endif  
+        }
+
+#endif
 
         assert( indices );      assert( vertices );
@@ -619 +619 @@
                 return;
         }
-        
+
         int zStart = 0, zEnd = owner->getPageSize()-stride;
-        
+
         if ( adapt[TP_BOTTOM] ) {
                 tesselateBottomRow( 0, stride, adapt[TP_LEFT], adapt[TP_RIGHT] );
                 zStart+= stride;
         }
-        
+
         if ( adapt[TP_TOP] )
                 zEnd-= stride;
-                
+
         for ( int z = zStart; z < zEnd; z+=stride )
                 tesselateRow( z, stride, stride, adapt[TP_LEFT], adapt[TP_RIGHT] );
-        
+
 
         if ( adapt[TP_TOP] ) {
-                tesselateTopRow( owner->getPageSize()-stride-1, 
+                tesselateTopRow( owner->getPageSize()-stride-1,
                         stride, adapt[TP_LEFT], adapt[TP_RIGHT] );
         }
-        
+
 #ifdef USE_VBO
         if ( vbIdentifier && ibIdentifier ) {
@@ -645 +645 @@
                 glUnmapBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB );
                 vertices = NULL;
-        }       
+        }
 #endif
 
@@ -653 +653 @@
 void TerrainPage::show( )
 {
-        
-#ifdef USE_VBO  
+
+#ifdef USE_VBO
         //This is done later on...
         //owner->getBufferBroker()->acquire( vbIdentifier, ibIdentifier );
@@ -662 +662 @@
         vertices = new Vertex[Terrain::MAX_VERTICES];
         indices = new unsigned short[Terrain::MAX_INDICES];
-#endif  
+#endif
         vbIdentifier = 0; ibIdentifier = 0;
-        indexHash = new unsigned short[Terrain::MAX_VERTICES];  
+        indexHash = new unsigned short[Terrain::MAX_VERTICES];
         forceTesselation = true;
         activate();
@@ -673 +673 @@
 {
 #ifdef USE_VBO
-        owner->getBufferBroker()->release( vbIdentifier, ibIdentifier );        
+        owner->getBufferBroker()->release( vbIdentifier, ibIdentifier );
 #endif
         SAVE_DELETE_ARRAY( vertices );
@@ -692 +692 @@
                 glVertex3f( bounds.x, bounds.y, 0.0f );
                 glVertex3f( 0.0f, bounds.y, 0.0f );
-                
+
                 glVertex3f( 0.0f, 0.0f, bounds.z );
                 glVertex3f(  bounds.x, 0.0f, bounds.z );
                 glVertex3f( bounds.x, bounds.y, bounds.z );
-                glVertex3f( 0.0f, bounds.y, bounds.z );         
-                
+                glVertex3f( 0.0f, bounds.y, bounds.z );
+
                 glVertex3f( 0.0f, 0.0f, 0.0 );
                 glVertex3f(  0.0, 0.0f, bounds.z );
                 glVertex3f( 0.0f, bounds.y, bounds.z );
-                glVertex3f( 0.0f, bounds.y, 0.0f );                             
-                
+                glVertex3f( 0.0f, bounds.y, 0.0f );
+
                 glVertex3f( bounds.x, 0.0f, 0.0 );
                 glVertex3f(  bounds.x, 0.0f, bounds.z );
                 glVertex3f( bounds.x, bounds.y, bounds.z );
-                glVertex3f( bounds.x, bounds.y, 0.0f );                                         
+                glVertex3f( bounds.x, bounds.y, 0.0f );
         glEnd();
         glPopMatrix();
@@ -716 +716 @@
         assert( glIsEnabled( GL_VERTEX_ARRAY ) );
         assert( !glIsEnabled( GL_NORMAL_ARRAY ) );
-        
+
         if ( currentLOD == TerrainPage::MAX_LODS-1 )
                 return;
-                
+
         assert( isVisible ); assert( numIndices > 0 );
         active = false;
-        CHECK_GL_ERROR( "1" );  
+        CHECK_GL_ERROR( "1" );
 #ifdef USE_VBO
-        
+
         glBindBufferARB( GL_ARRAY_BUFFER_ARB, vbIdentifier );
         glClientActiveTextureARB( GL_TEXTURE0_ARB );
         glInterleavedArrays( GL_T2F_V3F, 0, NULL );
-        
+
         glClientActiveTextureARB( GL_TEXTURE1_ARB );
         glInterleavedArrays( GL_T2F_V3F, 0, NULL );
-        
-        glBindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, ibIdentifier );   
-        
-        glDrawElements( GL_TRIANGLE_STRIP, numIndices, 
-                                        GL_UNSIGNED_SHORT, NULL );      
-#else   
+
+        glBindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, ibIdentifier );
+
+        glDrawElements( GL_TRIANGLE_STRIP, numIndices,
+                                        GL_UNSIGNED_SHORT, NULL );
+#else
         glClientActiveTextureARB( GL_TEXTURE0_ARB );
         glInterleavedArrays( GL_T2F_V3F, 0, vertices );
-        
+
         glClientActiveTextureARB( GL_TEXTURE1_ARB );
         glInterleavedArrays( GL_T2F_V3F, 0, vertices );
-        
-        glDrawElements( GL_TRIANGLE_STRIP, numIndices, 
-                                        GL_UNSIGNED_SHORT, indices );   
+
+        glDrawElements( GL_TRIANGLE_STRIP, numIndices,
+                                        GL_UNSIGNED_SHORT, indices );
 #endif
-        
-
-        
+
+
+
         if ( owner->debug() )
                 drawBox( );
-                
-        CHECK_GL_ERROR( "2" );  
+
+        CHECK_GL_ERROR( "2" );
 }
 
@@ -768 +768 @@
 }
 
-void TerrainPage::getCoord( int _x, int _z, TexCoord& _coord ) const 
-{
-        owner->getCoord( _x+xOffset*(owner->getPageSize()-1 ), 
+void TerrainPage::getCoord( int _x, int _z, TexCoord& _coord ) const
+{
+        owner->getCoord( _x+xOffset*(owner->getPageSize()-1 ),
                                          _z+zOffset*(owner->getPageSize()-1 ), _coord );
 }
@@ -789 +789 @@
                 if ( _layer )
                         hasfull = true;
-        }       
-        layerVisibility[_layer] = _lv;  
+        }
+        layerVisibility[_layer] = _lv;
 }
 
 bool TerrainPage::hasMaterial( int _layer )
-{ 
+{
         return ( layerVisibility[_layer] != LV_NO );
 }