Changeset 8642 in orxonox.OLD

Timestamp:

Jun 20, 2006, 5:47:04 PM (18 years ago)

Author:

ponder

Message:

Removed two bugs

1. The indices weren't copied properly to the shared buffer.
2. GL_CULL_FACE enabled is only appropriate when you're flying above the ground. i're underneath, you'll see nothing.

Location:

branches/terrain/src/lib/graphics/importer/terrain

Files:

• terrain.cc (modified) (2 diffs)
• terrain.h (modified) (1 diff)

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

@@ -129 +129 @@
                 bi.numIndices+=2;
         }
-        for ( unsigned short *i = _indices; i < end; ++i ) {
-                *indices = *i+offset;
+        for ( unsigned short *i = _indices; i < end; ++i, ++dst ) {
+                *dst = *i+offset;
         }
         bi.numIndices+=_numIndices;
@@ -184 +184 @@
                 glEnableClientState( GL_TEXTURE_COORD_ARRAY );
                 glDisableClientState( GL_NORMAL_ARRAY ); 
-                
+        glDisable( GL_CULL_FACE );
         glDisable( GL_LIGHTING );
         glColor3f( 1.0f, 1.0f, 1.0f );

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

@@ -71 +71 @@
                 const static int PAGE_SIZE                      = 17;
                 const static int MAX_VERTICES           = PAGE_SIZE*PAGE_SIZE;
-                const static int MAX_INDICES            = 3*MAX_VERTICES/*2*( PAGE_SIZE*PAGE_SIZE - PAGE_SIZE ) - 2*/;
+                const static int MAX_INDICES            = 2*( PAGE_SIZE*PAGE_SIZE + PAGE_SIZE -2 );
                 /**
                  * The amount of geometry rendered is largely depending on this constant. So chose a