Changeset 4095 in orxonox.OLD for orxonox/branches

Timestamp:

May 6, 2005, 8:52:06 PM (20 years ago)

Author:

nico

Message:

branches/heightmap: i want modular debug

Location:

orxonox/branches/heightMap/src

Files:

• defs/debug.h (modified) (2 diffs)
• lib/graphics/importer/heightmap.cc (modified) (4 diffs)

orxonox/branches/heightMap/src/defs/debug.h

@@ -56 +56 @@
 // DEFINE MODULES
 #define DEBUG_MODULE_ORXONOX            0
-#define DEBUG_MODULE_WORLD              1
-#define DEBUG_MODULE_PNODE              1
+#define DEBUG_MODULE_WORLD              0
+#define DEBUG_MODULE_PNODE              0
 #define DEBUG_MODULE_WORLD_ENTITY       0
 #define DEBUG_MODULE_COMMAND_NODE       0
@@ -63 +63 @@
 #define DEBUG_MODULE_LOAD               0
 
-#define DEBUG_MODULE_IMPORTER           1
+#define DEBUG_MODULE_IMPORTER           0
 #define DEBUG_MODULE_TRACK_MANAGER      0
 #define DEBUG_MODULE_GARBAGE_COLLECTOR  0
 #define DEBUG_MODULE_LIGHT              0
-#define DEBUG_MODULE_PLAYER             1
-#define DEBUG_MODULE_WEAPON             3
+#define DEBUG_MODULE_PLAYER             0
+#define DEBUG_MODULE_WEAPON             0
 #define DEBUG_MODULE_MATH               0
-#define DEBUG_MODULE_FONT               1
-#define DEBUG_MODULE_ANIM               1
+#define DEBUG_MODULE_FONT               0
+#define DEBUG_MODULE_ANIM               0
+#define DEBUG_MODULE_HEIGHTMAP                  4
 
 #define DEBUG_MODULE_NULL_PARENT        0

orxonox/branches/heightMap/src/lib/graphics/importer/heightmap.cc

@@ +1 @@
+
+
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_HEIGHTMAP
 
 
@@ -54 +57 @@
                         else                                                                            height = pixPerDLSide;
                         
+                        
+                        
                         this->readIntoGroup(j*pixPerDLSide,i*pixPerDLSide,width,height,vertexResolution);
                 }
@@ -62 +67 @@
 
 void Heightmap::readIntoGroup(int left, int top,int width, int height, int vertexResolution)
-{
-        //this->newGroup();
-        
+{       
+        // add all vertices first
         for (int z=top; z < top+height; z++)
         {
@@ -72 +76 @@
                 }
         }
+
+        
+        // code readability
+        int thisVertex = 0;
+        int bottomVertex = width;
+        
+        // create all faces
+        for (int z=top; z < top+height - 1; z++)
+        {
+                for (int x=left; x < left+width - 1; x++)
+                {
+                        thisVertex++;
+                        bottomVertex++;                 
+                        
+                        this->addFace(3, VERTEX_ONLY, thisVertex, bottomVertex, thisVertex+1);
+                        this->addFace(3, VERTEX_ONLY, thisVertex+1, bottomVertex, bottomVertex+1);
+
+                }
+        }
+        
+
+
 }