Changeset 5967 in orxonox.OLD for branches/height_map

Timestamp:

Dec 7, 2005, 4:15:30 PM (19 years ago)

Author:

bottac

Message:

changes in height_map.cc

Location:

branches/height_map/src

Files:

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

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

@@ -15 +15 @@
 #include "height_map.h"
 #include "model.h"
+#include "texture.h"
+#include "vector.h"
+
+#include "debug.h"
+
+// INCLUDING SDL_Image
+#ifdef HAVE_SDL_IMAGE_H
+#include <SDL_image.h>
+#else
+#include <SDL/SDL_image.h>
+#endif
 
 HeightMap::HeightMap() : Model()
 {
+        
+}
+
+HeightMap::HeightMap(const char* height_map_name = NULL) : Model()
+{
+        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);
+
+                
+                }
+                 
+            else       PRINTF(4)("oops! couldn't load %s for some reason.\n", height_map_name);
+}
+
+
+HeightMap::~HeightMap()
+{
+        delete heightMap;
 }
 
 void HeightMap::load()
 {
-   
-         this->setName("HardCore");
+ int height = 0; 
+ int offset = 0;
+ char *  bmp = (char*) heightMap->pixels;
+
+  if(heightMap != NULL /* && heightMap->format->BitsPerPixel == 8 */)
+        {
+                for(int i = 0; i < heightMap->h; i += 8)
+                        {
+                        for(int j = 0; j < heightMap->w;  j += 8)
+                        {
+
+                                // get local hight from heightMap
+
+                                
+                                SDL_LockSurface(heightMap);
+                                        height = bmp[j + i*heightMap->w];
+                                        //height = heightMap->format->palette->colors[offset];
+                                SDL_UnlockSurface(heightMap);   
+                                this->addVertex(heightMap->h - i , height ,heightMap->w - j);
+                        }       
+                        }
+
+                for(int i = 0; i < (heightMap->h * heightMap->w) / 64 - heightMap->w /8  ; i ++)
+                        {
+                                  this->addFace (3, VERTEX_ONLY, i,i+1 ,i + (heightMap->w / 8) );
+                                
+                                  this->addFace (3, VERTEX_ONLY, i+1,i + (heightMap->w / 8)  ,i + (heightMap->w / 8) +1 );
+                        }
+                
+
+        }
+  else
+        { 
+  //this->setName("HardCore");
   this->addVertex (-0.5, -0.5, 0.5);
   this->addVertex (0.5, -0.5, 0.5);
@@ -32 +97 @@
   this->addVertex (-0.5, -0.5, -0.5);
   this->addVertex (0.5, -0.5, -0.5);
+        
 
-  this->addVertexTexture (0.0, 0.0);
-  this->addVertexTexture (1.0, 0.0);
-  this->addVertexTexture (0.0, 1.0);
-  this->addVertexTexture (1.0, 1.0);
-  this->addVertexTexture (0.0, 2.0);
-  this->addVertexTexture (1.0, 2.0);
-  this->addVertexTexture (0.0, 3.0);
-  this->addVertexTexture (1.0, 3.0);
-  this->addVertexTexture (0.0, 4.0);
-  this->addVertexTexture (1.0, 4.0);
-  this->addVertexTexture (2.0, 0.0);
-  this->addVertexTexture (2.0, 1.0);
-  this->addVertexTexture (-1.0, 0.0);
-  this->addVertexTexture (-1.0, 1.0);
 
-  this->addVertexNormal (0.0, 0.0, 1.0);
-  this->addVertexNormal (0.0, 0.0, 1.0);
-  this->addVertexNormal (0.0, 0.0, 1.0);
-  this->addVertexNormal (0.0, 0.0, 1.0);
-  this->addVertexNormal (0.0, 1.0, 0.0);
-  this->addVertexNormal (0.0, 1.0, 0.0);
-  this->addVertexNormal (0.0, 1.0, 0.0);
-  this->addVertexNormal (0.0, 1.0, 0.0);
-  this->addVertexNormal (0.0, 0.0, -1.0);
-  this->addVertexNormal (0.0, 0.0, -1.0);
-  this->addVertexNormal (0.0, 0.0, -1.0);
-  this->addVertexNormal (0.0, 0.0, -1.0);
-  this->addVertexNormal (0.0, -1.0, 0.0);
-  this->addVertexNormal (0.0, -1.0, 0.0);
-  this->addVertexNormal (0.0, -1.0, 0.0);
-  this->addVertexNormal (0.0, -1.0, 0.0);
-  this->addVertexNormal (1.0, 0.0, 0.0);
-  this->addVertexNormal (1.0, 0.0, 0.0);
-  this->addVertexNormal (1.0, 0.0, 0.0);
-  this->addVertexNormal (1.0, 0.0, 0.0);
-  this->addVertexNormal (-1.0, 0.0, 0.0);
-  this->addVertexNormal (-1.0, 0.0, 0.0);
-  this->addVertexNormal (-1.0, 0.0, 0.0);
-  this->addVertexNormal (-1.0, 0.0, 0.0);
 
-  this->addFace (3, VERTEX_TEXCOORD_NORMAL, 0,0,0, 1,1,1, 3,3,2);
-  this->addFace (4, VERTEX_TEXCOORD_NORMAL, 2,2,4, 3,3,5, 5,5,6, 4,4,7);
-  this->addFace (4, VERTEX_TEXCOORD_NORMAL, 4,4,8, 5,5,9, 7,7,10, 6,6,11);
-  this->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,6,12, 7,7,13, 1,9,14, 0,8,15);
-  this->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,1,16, 7,10,17, 5,11,18, 3,3,19);
-  this->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,12,20, 0,0,21, 2,2,22, 4,13,23);
+  this->addFace (3, VERTEX_ONLY, 4, 3, 2);
 
+        }
       this->finalize();
 

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

@@ -13 +13 @@
 */
 
+
 #include "model.h"
 
-
+class SDL_Surface;
+class Vector;
 
 class HeightMap : public Model
@@ -21 +23 @@
 public:
 void load();
+void load(const char*, int);
 HeightMap();
+HeightMap(const char*);
+~HeightMap();
+
+private:
+SDL_Surface* heightMap;
+
 };

branches/height_map/src/lib/graphics/importer/model.h

@@ -134 +134 @@
   inline unsigned int getTexCoordCount() const { return this->texCoordCount; };
 
-  /** @returns the Count of Faces of this Model */
+  /** @returns the Count of loadFaces of this Model */
   inline unsigned int getFaceCount() const { return this->faceCount; };
 

branches/height_map/src/world_entities/terrain.cc

@@ -42 +42 @@
   // this->loadParams(root);
 
- HeightMap * hm = new HeightMap();
+ HeightMap * hm = new HeightMap("/home/bottac/svn/data/pictures/heightmapHello.bmp");
+
  hm->load();
  this->model=hm;