Changeset 4093 in orxonox.OLD

Timestamp:

May 6, 2005, 8:19:01 PM (19 years ago)

Author:

nico

Message:

branches/heightMap: challenging the model class

Location:

orxonox/branches/heightMap/src

Files:

• lib/graphics/importer/heightmap.cc (modified) (3 diffs)
• lib/graphics/importer/heightmap.h (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)

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

@@ -16 +16 @@
         this->setName(fileName);
         
-        this->import(fileName);
+        this->import(fileName, displaylistResolution, vertexResolution);
         
-        //this->finalize();
+        this->finalize();
 }
 
@@ -25 +25 @@
 }
 
-bool Heightmap::import (const char* fileName)
+bool Heightmap::import (const char* fileName, int displaylistResolution, int vertexResolution)
 {
         PRINTF(4)("preparing to read in file: %s\n", fileName);
@@ -32 +32 @@
         this->bitmap = IMG_Load(fileName);
 
+        // how many pixels wide is a display list?
+        int pixPerDLSide = displaylistResolution * vertexResolution;
+
+        int howManyListsWide = bitmap->w / pixPerDLSide + 1;
+        int howManyListsHigh = bitmap->h / pixPerDLSide + 1;
         
+        // calculated pixel dimensions of one display list. usually equals pixPerDLSide, but at the end of the picture
+        // this needs to be shorter, that we do not make a segfault
+        int width = pixPerDLSide;
+        int height = pixPerDLSide;
         
-        
+        for (int i=0; i<howManyListsWide; i++)
+        {
+                for (int j=0; j<howManyListsHigh; j++)
+                {
+                        // catch out of image access in x-direction
+                        if ( (j+1)*pixPerDLSide - 1 >= bitmap->w )      width = bitmap->w - j*pixPerDLSide;
+                        else                                                                            width = pixPerDLSide;
+                        // y-direction
+                        if ( (i+1)*pixPerDLSide - 1 >= bitmap->h )      height = bitmap->h - i*pixPerDLSide;
+                        else                                                                            height = pixPerDLSide;
+                        
+                        this->readIntoGroup(j*pixPerDLSide,i*pixPerDLSide,width,height,vertexResolution);
+                }
+        }
         
         return true;
 }
 
+void Heightmap::readIntoGroup(int left, int top,int width, int height, int vertexResolution)
+{
+        //this->newGroup();
+        
+        for (int z=top; z < top+height; z++)
+        {
+                for (int x=left; x < left+width; x++)
+                {
+                        this->addVertex(x,this->getHeightAt(x,z),z);
+                }
+        }
+}
+
+float Heightmap::getHeightAt(int x, int z)
+{
+        Uint8 index;
+        SDL_Color color;
+        
+        SDL_LockSurface(bitmap);
+        
+        index = *((Uint8*)bitmap->pixels + z * bitmap->pitch + x * bitmap->format->BytesPerPixel);
+        color = bitmap->format->palette->colors[index];
+        
+        SDL_UnlockSurface(bitmap);
+        
+        // return the red component, because in a grayscale pic, r,g and b are all the same value
+        return (GLint)color.r;
+}

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

@@ -16 +16 @@
         
 private:
-        bool import (const char* fileName);
+        bool Heightmap::import (const char* fileName, int displaylistResolution, int vertexResolution);
+        void Heightmap::readIntoGroup(int left, int top,int width, int height, int vertexResolution);
+
+        float Heightmap::getHeightAt(int x, int z);
 
         // holds the loaded pixels

orxonox/branches/heightMap/src/story_entities/world.cc

@@ -627 +627 @@
 
   //terrain = new Terrain("../data/worlds/newGround.obj");
-  terrain = new Terrain("../data/pictures/heightmapHello.bmp");
+  terrain = new Terrain("../data/pictures/heightmapHello.bmp",100,1);
   terrain->setRelCoor(Vector(0,-10,0));
   this->spawn(terrain);