Changeset 5990 in orxonox.OLD

Timestamp:

Dec 8, 2005, 4:07:19 PM (18 years ago)

Author:

bottac

Message:

Now, HeightMap seems to set the height of its vertices correctly.

File:

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

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

@@ -35 +35 @@
 {
    this->setClassID(CL_HEIGHT_MAP, "HeightMap");
-        heightMap =  IMG_Load(height_map_name);
-            if(heightMap!=NULL) {
+   heightMap =  IMG_Load(height_map_name);
+   if(heightMap!=NULL) {
+        
                  PRINTF(0)("loading Image %s\n", height_map_name);
                  PRINTF(0)("width : %i\n", heightMap->w);
                  PRINTF(0)("hight : %i\n", heightMap->h);
                  PRINTF(0)("%i Byte(s) per Pixel \n", heightMap->format->BytesPerPixel);
-
-                
+                 PRINTF(0)("Rshift : %i\n", heightMap->format->Rshift);
+                 PRINTF(0)("Bshift: %i\n", heightMap->format->Bshift);
+                 PRINTF(0)("Gshift: %i\n", heightMap->format->Gshift);
+                 PRINTF(0)("Rmask: %i\n", heightMap->format->Rmask);
+                 PRINTF(0)("Gmask: %i\n", heightMap->format->Gmask);            
                 }
                  
-            else       PRINTF(4)("oops! couldn't load %s for some reason.\n", height_map_name);
+     else       PRINTF(4)("oops! couldn't load %s for some reason.\n", height_map_name);
 }
 
@@ -56 +60 @@
 void HeightMap::load()
 {
- long height = 0; 
+ unsigned int height = 0; 
  int offset = 0;
  char *  bmp = (char*) heightMap->pixels;
 
-  if(heightMap != NULL /* && heightMap->format->BitsPerPixel == 8 */)
+  if(heightMap != NULL && heightMap->format->BitsPerPixel == 8 )
         {
-                SDL_LockSurface(heightMap);
-                for(int i = 0 ; i < heightMap->h  ; i +=1)
-                        {
-                        for(int j = 0; j < heightMap->w   ;  j += 1)
-                        {
-
-                                // get local hight from heightMap
-
-                                
-                                
-                                        offset = bmp[j + i*(heightMap->w )];
-                                        height = (unsigned int)heightMap->format->palette->colors[offset].r +
-                                            (unsigned int)heightMap->format->palette->colors[offset].g +
-                                         (unsigned int) heightMap->format->palette->colors[offset].b ;
+        SDL_LockSurface(heightMap);
+        for(int i = 0 ; i < heightMap->h  ; i +=1)
+        {
+            for(int j = 0; j < heightMap->w   ;  j += 1)
+            {
+                // get local hight from heightMap
+                // This seems to work only on 8-Bit Grayscale-Bitmaps
+                height = bmp[j + i*(heightMap->w )];
+                
+                        
+                /*height = heightMap->format->palette->colors[offset].r +
+                           heightMap->format->palette->colors[offset].g +
+                           heightMap->format->palette->colors[offset].b ; */
                                         
                                         
-                                this->addVertex( 20*(heightMap->h - i) , (( height)/15) - 30 ,20*j);
-                        }       
-                        }
-SDL_UnlockSurface(heightMap);
+                this->addVertex( 20*(heightMap->h - i) , ((double)( 100-(double)offset)/5) - 50 ,20*j);
+             }  
+        }
+        SDL_UnlockSurface(heightMap);
 
-int c = (heightMap->w) ;
-int g = 0;
+        int c = (heightMap->w) ; // One line
+        for(int i = 0; i < (heightMap->w)  -1  ; i += 1)
+        {
+            for(int j = 0; j < (heightMap->h)/1 - 1; 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 );                         
+                                 
+                /* ... one square*/
 
-                for(int i = 0; i < (heightMap->w)  -1  ; i += 1)
-                        {
-                                for(int j = 0; j < (heightMap->h)/1 - 1; j++)
-                                {
-                                //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 (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 );
+            }
                                 
                         
                                 
-                        }
+        }
                 
 
-        }
+        }//if
   else
         { 
-  //this->setName("HardCore");
+
+  //make a cube
+  this->setName("HardCore");
   this->addVertex (-0.5, -0.5, 0.5);
   this->addVertex (0.5, -0.5, 0.5);