Changeset 5993 in orxonox.OLD

Timestamp:

Dec 8, 2005, 10:30:58 PM (18 years ago)

Author:

bottac

Message:

After fixing a wrong unsigned char to int conversion, HeightMaps look much better now!

https://www.orxonox.net/cgi-bin/trac.cgi/attachment/wiki/HeightMap/screenshot1.jpg?format=raw

File:

• branches/height_map/src/lib/graphics/importer/height_map.cc (modified) (3 diffs)

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

@@ -60 +60 @@
 void HeightMap::load()
 {
- int height = 0; 
+ unsigned char height = 0; 
  int offset = 0;
+
  char *  bmp = (char*) heightMap->pixels;
 
@@ -67 +68 @@
         {
         SDL_LockSurface(heightMap);
-        for(int i = 0 ; i < heightMap->h  ; i +=1)
+        for(int i = 0 ; i < heightMap->h  ; i +=2)
         {
-            for(int j = 0; j < heightMap->w   ;  j += 1)
+            for(int j = 0; j < heightMap->w   ;  j += 2)
             {
                 // get local hight from heightMap
@@ -80 +81 @@
                            heightMap->format->palette->colors[offset].b ; */
                                         
-                                        
-                this->addVertex( 20*(heightMap->h - i) , ((double)( (double)300-40*height)/100) - 300 ,20*j);
+                                
+                this->addVertex( 12*(heightMap->h - i) , (( (double)height)/4)-200  ,12 *j);
              }  
         }
         SDL_UnlockSurface(heightMap);
 
-        int c = (heightMap->w) ; // One line
-        for(int i = 0; i < (heightMap->w)  -1  ; i += 1)
+
+
+        int c = (heightMap->w)/2 ; // One line
+        for(int i = 0; i < (heightMap->w)/2  -2  ; i ++)
         {
-            for(int j = 0; j < (heightMap->h)/1 - 1; j++)
+            for(int j = 0; j < (heightMap->h)/2 - 2; j++)
             {
                  
                 /* Two Triangles or ...*/ 
                 
-                //this->addFace (3, VERTEX_ONLY,j+1+i*c ,j + (i+1)*c, j + i*c );
-                //this->addFace (3, VERTEX_ONLY,j + (i+1)*c +1 ,j + (i+1)*c,j+i*c +1 );                         
+                this->addFace (3, VERTEX_ONLY,j + (i+1)*c,j+1+i*c , j + i*c );
+                this->addFace (3, VERTEX_ONLY,j + (i+1)*c,j + (i+1)*c +1 ,j+i*c +1 );                           
                                  
                 /* ... one square*/
 
-                this->addFace (4 ,VERTEX_ONLY,j+i*c,j+(i+1)*c  ,j + (i+1)*c +1, j +i*c+1 );
+                //this->addFace (4 ,VERTEX_ONLY,j+i*c,j+(i+1)*c  ,j + (i+1)*c +1, j +i*c+1 );
             }