Changeset 8569 in orxonox.OLD for branches/terrain/src/lib/graphics/importer/terrain/terrain_page.h

Timestamp:

Jun 18, 2006, 8:26:57 PM (18 years ago)

Author:

ponder

Message:

• The terrain now uses VBO's instead of VARS. Its possible to switch back, though.
• The multitexturing works fine.

File:

• branches/terrain/src/lib/graphics/importer/terrain/terrain_page.h (modified) (4 diffs)

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

@@ -17 +17 @@
 #ifndef TERRAIN_PAGE_H
 #define TERRAIN_PAGE_H
-
+#define USE_VBO
 #include "terrain_quad.h"
 #include <stdio.h>
@@ -26 +26 @@
 
 typedef TerrainPage *pTerrainPage;
+
+struct Vertex {
+        TexCoord        t;      
+        Triple          p;
+};
+
+typedef Vertex *pVertex;
 
 typedef struct {
@@ -208 +215 @@
                         if ( wantedLOD >= TerrainPage::MAX_LODS )
                                 wantedLOD = 4;
+                        else if ( wantedLOD < 0 )
+                                wantedLOD = 0;
                         else
                                 wantedLOD = _lod;
@@ -271 +280 @@
                 bool                                            forceTesselation;
                 bool                                            active;
-                Triple                                          *vertices;
+                pVertex                                         vertices;
                 unsigned short                          *indices;
                 unsigned short                          *indexHash;
-                TexCoord                                        *coords;
                 int                                                     numIndices;
                 int                                                     numVertices;
+                
+#ifdef  USE_VBO
+                GLuint                                          ibIdentifier,
+                                                                        vbIdentifier;
+#endif          
                 bool                                            isVisible;
                 pTerrainPage                            next;