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

Timestamp:

Jun 23, 2006, 11:29:40 AM (18 years ago)

Author:

ponder

Message:

• Finally, I got the terrain working completly. What a hard work… It took me lots and lots of hours to remove all bugs in the tesselation routines.

File:

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

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

@@ -29 +29 @@
         memcpy( heightfield.data, tmpData->pixels, sizeof(UByte)*dataSize );
         SDL_FreeSurface( tmpData );
-        //TODO: Perform some checks...
+        //TODO: Perform some checks... size, bits and so on
         pagesX = (heightfield.width/(pageSize-1) );
         pagesZ = (heightfield.height/(pageSize-1) );
-        //tex = (Texture*)MANAGER->load( lightmapSource );
         //TODO: Determine layer visibility!     
         for ( unsigned int i = 0; i < materials.size(); ++i ) {
                 
         }
-
-        printf( " * creating terrain pages ( %d, %d )...", pagesX, pagesZ );
         pages = new pTerrainPage[pagesX*pagesZ];        
         for ( int x = 0; x < pagesX; ++x )
                 for ( int z = 0; z < pagesZ; ++z )
                         pages[z*pagesX+x] = createPage( x, z );
-        printf( "looks good\n" );
-        printf( " * inform pages about the adjacent pages..." );                        
         //Inform each page about its neighbors.
         for ( int x = 0; x < pagesX; ++x )
@@ -54 +49 @@
                                 z > 0                   ? getPage( x+0, z-1 ) : NULL );
         
-        printf( "looks good\n" );
-        printf( " * creating quad_tree data structure..." );
         root = createQuadTree( 0, 0, pagesX, pagesZ );
         activePages = NULL;
-        printf( "looks good\n" );
 }
 
@@ -104 +96 @@
                 glBufferDataARB( GL_ELEMENT_ARRAY_BUFFER_ARB, MAX_INDICES*sizeof( short ), 
                         indices, GL_DYNAMIC_DRAW_ARB );
-                //printf( "uploaded %d verts and %d indices\n", bi.numIndices, bi.numVertices );
                 BufferInfo newInfo;
                 broker->acquire( newInfo.vbIdentifier, newInfo.ibIdentifier );                  
@@ -114 +105 @@
         memcpy( &vertices[bi.numVertices], _vertices, 
                 _numVertices*sizeof( Vertex ) );
-        bi.numVertices+=_numVertices;
         //The indices need to be updated with an offset :(
-        unsigned short *end = _indices+_numIndices;
-        unsigned short *dst = indices+bi.numIndices;
-        int offset = bi.numIndices;
-        if ( bi.numIndices > 0 ) {
-                indices[bi.numIndices] = indices[bi.numIndices-1];
-                indices[bi.numIndices+1] = _indices[0]+offset;
-                dst+=2;
-                bi.numIndices+=2;
-        }
-        for ( unsigned short *i = _indices; i < end; ++i, ++dst ) {
-                *dst = *i+offset;
+        unsigned short *dst= &indices[bi.numIndices];
+        unsigned short offset = bi.numVertices;
+        unsigned short *src= _indices;
+        unsigned short *end= src+_numIndices;
+        bi.numVertices+=_numVertices;           
+        if ( bi.numIndices ) {
+                dst[0] = *(dst-1);
+                dst[1] = *src+offset;
+                dst+=2; bi.numIndices+=2;
+        }
+        while ( src < end ) {
+                *dst= *src+offset;
+                dst++;
+                src++;
         }
         bi.numIndices+=_numIndices;
@@ -167 +160 @@
         frustum->extractPlanes();
         
-        /**
+        /*
          * Enable texture and vertex arrays for the first and the second texture
          * units and disable the normal arrays.
@@ -181 +174 @@
                 glDisableClientState( GL_NORMAL_ARRAY ); 
         glDisable( GL_CULL_FACE );
+        glCullFace( GL_BACK );
         glDisable( GL_LIGHTING );
         glColor3f( 1.0f, 1.0f, 1.0f );
@@ -230 +224 @@
         page = activePages;
         while ( page ) {
+                assert( page->isActive() );
                 page->updateTesselation();
                 page = page->getNext();
@@ -236 +231 @@
         if ( buffers[current].numIndices != 0 ) {
                 BufferInfo bi = buffers[current];       
-                glBindBufferARB( GL_ARRAY_BUFFER_ARB, 
-                        bi.vbIdentifier );
+                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 );
+                glBindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, bi.ibIdentifier );
                 glBufferDataARB( GL_ELEMENT_ARRAY_BUFFER_ARB, MAX_INDICES*sizeof( short ), 
                         indices, GL_DYNAMIC_DRAW_ARB );
         }
-        s = 200.0f;
         glPushAttrib( GL_COLOR_BUFFER_BIT );
         for ( unsigned int i = 0; i < materials.size(); ++i ) {
@@ -258 +250 @@
                 glMatrixMode( GL_TEXTURE );
                 glLoadIdentity();
-                glScalef( s, s, s );
+                glScalef( pagesX, pagesZ, 1.0f );
 
                 glClientActiveTextureARB( GL_TEXTURE0_ARB );
@@ -264 +256 @@
                 glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT );                         
                 glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT );
+                glEnable( GL_CULL_FACE );
                 for ( unsigned j = 0; j < buffers.size(); ++j ) {
                         BufferInfo bi = buffers[j];