Changeset 5980 in orxonox.OLD

Timestamp:

Dec 7, 2005, 9:52:29 PM (18 years ago)

Author:

bottac

Message:

---

!testing branch height_map!

---

Please adopt the String on line 46 in file:
branches/height_map/src/world_entities/terrain.cc
according to your setup. The file referred to must be a 8-Bit Bitmap!

Terrain::Terrain (const TiXmlElement* root)
{
Change PATH

HeightMap * hm = new HeightMap("~/svn/data/pictures/heightmapHello.bmp");

Sorry!

Location:

branches/height_map/src

Files:

• lib/graphics/importer/height_map.cc (modified) (2 diffs)
• world_entities/player.cc (modified) (3 diffs)

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

@@ -62 +62 @@
   if(heightMap != NULL /* && heightMap->format->BitsPerPixel == 8 */)
         {
-SDL_LockSurface(heightMap);
-                for(int i = 0; i < heightMap->h -1; i += 2)
+                SDL_LockSurface(heightMap);
+                for(int i = 0 ; i < heightMap->h  ; i ++)
                         {
-                        for(int j = 0; j < heightMap->w -1;  j += 2)
+                        for(int j = 0; j < heightMap->w   ;  j += 1)
                         {
 
@@ -72 +72 @@
                                 
                                 
-                                        offset = bmp[j + i*heightMap->w];
-                                        height = heightMap->format->palette->colors[offset].r + heightMap->format->palette->colors[offset].g + heightMap->format->palette->colors[offset].b ;
+                                        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 ;
                                         
-                                this->addVertex(heightMap->h - i , ((long)( height) / 30) - 60 ,heightMap->w - j);
+                                        
+                                this->addVertex( 10*(heightMap->h - i) , (( height)/15) - 200 ,10*j);
                         }       
                         }
 SDL_UnlockSurface(heightMap);
-                for(int i = 0; i < (heightMap->h * heightMap->w)/4   -1  ; i ++)
+
+int c = (heightMap->w) / 1;
+int g = 0;
+
+                for(int i = 0; i < (heightMap->w)/1  -1  ; i ++)
                         {
-                                 this->addFace (3, VERTEX_ONLY, i,i+1 ,i + (heightMap->w / 2) );
+                                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,i + (heightMap->w / 2)  ,i + (heightMap->w / 2) +1, i+1 );
+                                //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,i,i + (heightMap->w / 2)  ,i + (heightMap->w / 2) +1, i+1 );
+                        
+                                
                         }
                 

branches/height_map/src/world_entities/player.cc

@@ -277 +277 @@
   /* FIXME: calculating the direction and orthDirection every timeSlice is redundant! save it somewhere */
   /* calculate the direction in which the craft is heading  */
-  Vector direction (1.0, 0.0, 0.0);
+  Vector direction (20.0, 0.0, 0.0);
   //direction = this->absDirection.apply (direction);
   Vector orthDirection (0.0, 0.0, 1.0);
@@ -289 +289 @@
   if( this->bLeft )
   {
-    accel -=(orthDirection);
+    accel -=(orthDirection)*20;
     rot +=Vector(1,0,0);
     rotVal -= .4;
@@ -295 +295 @@
   if( this->bRight )
   {
-    accel += orthDirection;
+    accel += orthDirection*20;
     rot += Vector(1,0,0);
     rotVal += .4;