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

Timestamp:

Jun 21, 2006, 6:23:57 PM (19 years ago)

Author:

ponder

Message:

Tried to do the collision detection for the terrain.

Location:

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

Files:

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

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

@@ -227 +227 @@
                 }
         } while ( dirty );
-        printf( "dirtyrounds: %d\n", dirtyRounds );
+        
         page = activePages;
-        
         while ( page ) {
                 page->updateTesselation();
@@ -286 +285 @@
                 }
                 activatedCount = 0; deactivatedCount = 0;
-                //printf( "%d of %d pages drawn\n", pagesX*pagesZ-cullCount, pagesX*pagesZ );
-                //float percentage = (float)cullCount/(float)(pagesX*pagesZ)*100.0f;
-                //printf( "culled %f%% terrain pages away\n",  percentage );
         }
         

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

@@ -233 +233 @@
                 std::vector<BufferInfo>         buffers;                        
                         
-                //Texture                                       *tex;
                 Triple                                          cameraPosition;
                 pFrustum                                        frustum;

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

@@ -338 +338 @@
                         addIndex( getIndex( halfStride, 0 ) );
                         addIndex( getIndex( stride, 0 ) );
-                        addAgain(  );
+                        addAgain( );
                         addIndex( getIndex( 0, stride ) );
                         addIndex( getIndex( stride, halfStride ) );
@@ -352 +352 @@
                         addIndex( getIndex( halfStride, 0 ) );
                         addIndex( getIndex( 0, 0 ) );
-                        addAgain(  );
+                        addAgain( );
                         break;
 
                 case ADAPT_T:
                         addIndex( getIndex( stride, stride ) );
-                        addAgain(  );
+                        addAgain( );
                         addIndex( getIndex( halfStride, stride ) );
                         addIndex( getIndex( stride, 0 ) );
@@ -369 +369 @@
                         addIndex( getIndex( halfStride, stride ) );
                         addIndex( getIndex( 0, stride ) );
-                        addAgain(  );
+                        addAgain( );
                         addIndex( getIndex( stride, 0 ) );
                         addIndex( getIndex( 0, halfStride ) );
@@ -392 +392 @@
                         addIndex( getIndex( halfStride, stride ) );
                         addIndex( getIndex( stride, stride ) );
-                        addAgain(  );
+                        addAgain( );
                         break;
 
                 case ADAPT_BT:
                         addIndex( getIndex( 0, 0 ) );
-                        addAgain(  );
-                        addIndex( getIndex( halfStride, 0 ) );
-                        addIndex( getIndex( 0, stride ) );
-                        addIndex( getIndex( stride, 0 ) );
-                        addIndex( getIndex( halfStride, stride ) );
-                        addIndex( getIndex( stride, stride ) );
-                        addAgain(  );
+                        addAgain( );
+                        addIndex( getIndex( halfStride, 0 ) );
+                        addIndex( getIndex( 0, stride ) );
+                        addIndex( getIndex( stride, 0 ) );
+                        addIndex( getIndex( halfStride, stride ) );
+                        addIndex( getIndex( stride, stride ) );
+                        addAgain( );
                         break;
 
@@ -414 +414 @@
                         addIndex( getIndex( halfStride, stride ) );
                         addIndex( getIndex( stride, stride ) );
-                        addAgain(  );
+                        addAgain( );
                         break;
 
@@ -425 +425 @@
                         addIndex( getIndex( halfStride, 0 ) );
                         addIndex( getIndex( 0, 0 ) );
-                        addAgain(  );
+                        addAgain( );
                         break;
 
@@ -439 +439 @@
                         break;
         }
-        assert( numVertices > 3 );
-
         assert( numIndices % 2 == 0 );
 }

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

@@ -225 +225 @@
                  * @brief Tesselates one row of the terrain page.
                  * @param _z                    The z-offset of the row
-                 * @param _xStride              Determines the step-size horizontally
-                 * @param _zStride              Determines the step-size vertically.
+                 * @param _xStride              Defines the step-size horizontally
+                 * @param _zStride              Defines the step-size vertically.
+                 * @param _adaptLeft    True if the left neighbor has a coarser
+                 *                                              tesselation level.              
                  * @param _adaptRight   True if the right neighbor has a coarser
                  *                                              tesselation level.
-                 * @param _adaptLeft    True if the left neighbor has a coarser
-                 *                                              tesselation level.                      
                  */
                 void tesselateRow( int _z, int _xStride, int _zStride, bool _adaptLeft, bool _adaptRight );