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

Timestamp:

Jul 3, 2006, 10:23:35 PM (18 years ago)

Author:

ponder

Message:

Cleanup for the terrain

File:

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

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

@@ -28 +28 @@
         SDL_Surface *tmpData = IMG_Load( full.c_str() );
         if ( !tmpData ) {
-                PRINTF(0)( "I' sorry, I can't load %s\n", full.c_str() );
+                PRINT(0)( "I' sorry, I can't load %s\n", full.c_str() );
                 return;
         }               
         if ( !validateSize( tmpData->h ) || !validateSize( tmpData->w ) ) {
-                PRINTF(0)( "The size of the elevation map must be 2^n+1x2^m+1. and at least 17x17" );
+                PRINT(0)( "The size of the elevation map must be 2^n+1x2^m+1. and at least 17x17" );
                 return;
         }
         if ( tmpData->format->BytesPerPixel != 1 ) {
-                PRINTF(0)( "The elevetation map must be an 8bit image!" );
+                PRINT(0)( "The elevetation map must be an 8bit image not %d", 
+                        tmpData->format->BytesPerPixel*8 );
                 return;
         }
@@ -148 +149 @@
         switch( _node->cull() ) {
                 case Frustum::INTERSECT:
-                        //printf( "partially inside frustum\n" );
                         if ( !_node->isChildless() ) {
                                 pTerrainQuad *children = _node->getChildren();
@@ -160 +160 @@
                         break;
                 case Frustum::INSIDE:
-                        //printf( "fully inside frustum\n" );                   
                         showPages( _node->getXOffset(), 
                                            _node->getZOffset(), 
@@ -167 +166 @@
                         break;
                 case Frustum::OUTSIDE:
-                        cullCount+= (_node->getWidth()-1)*(_node->getHeight()-1);
                         break;
         }
@@ -249 +247 @@
         //Due to some reason, the OpenGL implementors chose the plane equation
         //to an array of doubles. So we will make them happy.
-        double farPlane[] = { far.n.x, far.n.y, far.n.z, far.d };
-        glEnable( GL_CLIP_PLANE0 );
-        glClipPlane( GL_CLIP_PLANE0, farPlane );
+        //double farPlane[] = { far.n.x, far.n.y, far.n.z, far.d };
+        //glEnable( GL_CLIP_PLANE0 );
+        //glClipPlane( GL_CLIP_PLANE0, farPlane );
         glPushAttrib( GL_ALL_ATTRIB_BITS );
         glPushClientAttrib( GL_CLIENT_VERTEX_ARRAY_BIT );
@@ -273 +271 @@
         //glPolygonMode( GL_FRONT_AND_BACK, GL_LINE );
         cullCount = 0;
-        
-        /*// Lets see which pages are visible.
-        determineVisiblePages( root );
-        int wantedLeft, wantedRight, wantedBottom, wantedTop, minLOD;
-        pTerrainPage neighbor = NULL;
-        page = activePages;
-        bool dirty;
-        current = 0;
-        BufferInfo bi;
-        broker->acquire( bi.vbIdentifier, bi.ibIdentifier );
-        buffers.push_back( bi );
-        int dirtyRounds = 0;
-        do {
-                dirtyRounds++;
-                dirty = false;
-                page = activePages;
-                while ( page ) {
-                        if ( !page->isActive() ) {
-                                pTerrainPage tmp = page;
-                                page = tmp->getNext();
-                                tmp->setVisibility( false );
-                                continue;
-                        }
-                        wantedLeft = wantedRight = wantedBottom = wantedTop = page->getWantedLOD();
-                        if ( ( neighbor = page->getLeft() ) && ( neighbor->isActive() ) ) 
-                                wantedLeft = neighbor->getWantedLOD();
-                        if ( ( neighbor = page->getRight() ) && ( neighbor->isActive() ) ) 
-                                wantedRight = neighbor->getWantedLOD();
-                        if ( ( neighbor = page->getTop() ) && ( neighbor->isActive() ) ) 
-                                wantedTop = neighbor->getWantedLOD();
-                        if ( ( neighbor = page->getBottom() ) && ( neighbor->isActive() ) ) 
-                                wantedBottom = neighbor->getWantedLOD();                        
-                
-                        minLOD = std::min( std::min( wantedBottom, wantedTop ), 
-                                std::min( wantedLeft, wantedRight ) );  
-                        if ( minLOD < page->getWantedLOD()-1 ) {
-                                page->setWantedLOD( minLOD+1 );
-                                dirty = true;
-                        }       
-                        page = page->getNext();
-                }
-        } while ( dirty );
-        
-        page = activePages;
-        while ( page ) {
-                assert( page->isActive() );
-                page->updateTesselation();
-                page = page->getNext();
-        }
-        //If there is some data in the buffer, we need to upload the data
-        //into the vram...
-        if ( buffers[current].numIndices != 0 ) {
-                BufferInfo bi = buffers[current];       
-                glBindBufferARB( GL_ARRAY_BUFFER_ARB, bi.vbIdentifier );
-                glBufferDataARB( GL_ARRAY_BUFFER_ARB, MAX_VERTICES*sizeof( Vertex ), 
-                        vertices, GL_DYNAMIC_DRAW_ARB );
-                glBindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, bi.ibIdentifier );
-                glBufferDataARB( GL_ELEMENT_ARRAY_BUFFER_ARB, MAX_INDICES*sizeof( short ), 
-                        indices, GL_DYNAMIC_DRAW_ARB );
-        }*/
         glEnable( GL_BLEND );
         glDepthFunc( GL_LEQUAL );
@@ -389 +327 @@
                 }
         }
-                        
         glClientActiveTextureARB( GL_TEXTURE1_ARB );    
         glActiveTextureARB( GL_TEXTURE1_ARB );
@@ -412 +349 @@
                 break;
     case 2:
-        pixel = *(Uint16 *)p;
+                if ( SDL_BYTEORDER == SDL_BIG_ENDIAN )
+                        pixel = p[0] << 8 | p[1]; 
+                else
+                pixel = *(Uint16 *)p;
                 break;
     case 3:
@@ -424 +364 @@
                 break;
     default:
-        return 255;       /* shouldn't happen, but avoids warnings */
+        return 255; /* shouldn't happen, but avoids warnings */
     }
         Uint8 r,g,b,a;