Changeset 5989 in orxonox.OLD for branches

Timestamp:

Dec 8, 2005, 3:16:54 PM (19 years ago)

Author:

bottac

Message:

Branch height_map loads now heightmapHello.bmp from your data-directory.
You might need an old revision of data for this branch. I use revision 110.

Location:

branches/height_map/src

Files:

• lib/graphics/importer/height_map.cc (modified) (2 diffs)
• world_entities/terrain.cc (modified) (1 diff)

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

@@ -63 +63 @@
         {
                 SDL_LockSurface(heightMap);
-                for(int i = 0 ; i < heightMap->h  ; i ++)
+                for(int i = 0 ; i < heightMap->h  ; i +=1)
                         {
                         for(int j = 0; j < heightMap->w   ;  j += 1)
@@ -78 +78 @@
                                         
                                         
-                                this->addVertex( 10*(heightMap->h - i) , (( height)/15) - 200 ,10*j);
+                                this->addVertex( 20*(heightMap->h - i) , (( height)/15) - 30 ,20*j);
                         }       
                         }
 SDL_UnlockSurface(heightMap);
 
-int c = (heightMap->w) / 1;
+int c = (heightMap->w) ;
 int g = 0;
 
-                for(int i = 0; i < (heightMap->w)/1  -1  ; i ++)
+                for(int i = 0; i < (heightMap->w)  -1  ; i += 1)
                         {
                                 for(int j = 0; j < (heightMap->h)/1 - 1; j++)

branches/height_map/src/world_entities/terrain.cc

@@ -44 +44 @@
   // this->loadParams(root);
 
- HeightMap * hm = new HeightMap("/home/bottac/svn/data/pictures/heightmapHello.bmp");
+ char* heightmapName = ResourceManager::getFullName("pictures/heightmapHello.bmp");
+ HeightMap * hm = new HeightMap(heightmapName);
 
  hm->load();