Changeset 5976 in orxonox.OLD

Timestamp:

Dec 7, 2005, 5:21:41 PM (18 years ago)

Author:

bottac

Message:

 

Location:

branches/height_map/src

Files:

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

branches/height_map/src/defs/class_id.h

@@ -186 +186 @@
   CL_PROMITIVE_MODEL            =    0x00000808,
   CL_MD2Model                   =    0x00000809,
-  CL_LIGHT                      =    0x0000080a,
-  CL_PARTICLE_EMITTER           =    0x0000080b,
-  CL_PARTICLE_SYSTEM            =    0x0000080c,
+  CL_HEIGHT_MAP                 =    0x0000080a,
+  CL_LIGHT                      =    0x0000080b,
+  CL_PARTICLE_EMITTER           =    0x0000080c,
+  CL_PARTICLE_SYSTEM            =    0x0000080d,
   CL_ENVIRONMENT                =    0x00000810,
   CL_SHADER                     =    0x00000811,

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

@@ -34 +34 @@
 HeightMap::HeightMap(const char* height_map_name = NULL) : Model()
 {
+   this->setClassID(CL_HEIGHT_MAP, "HeightMap");
         heightMap =  IMG_Load(height_map_name);
             if(heightMap!=NULL) {
@@ -55 +56 @@
 void HeightMap::load()
 {
- int height = 0; 
+ long height = 0; 
  int offset = 0;
  char *  bmp = (char*) heightMap->pixels;
@@ -61 +62 @@
   if(heightMap != NULL /* && heightMap->format->BitsPerPixel == 8 */)
         {
-                for(int i = 0; i < heightMap->h; i += 2)
+SDL_LockSurface(heightMap);
+                for(int i = 0; i < heightMap->h -1; i += 2)
                         {
-                        for(int j = 0; j < heightMap->w;  j += 2)
+                        for(int j = 0; j < heightMap->w -1;  j += 2)
                         {
 
@@ -69 +71 @@
 
                                 
-                                SDL_LockSurface(heightMap);
-                                        height = bmp[j + i*heightMap->w];
-                                        //height = heightMap->format->palette->colors[offset];
-                                SDL_UnlockSurface(heightMap);   
-                                this->addVertex(heightMap->h - i , ((long)( height)  / 10) - 15 ,heightMap->w - j);
+                                
+                                        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 ;
+                                        
+                                this->addVertex(heightMap->h - i , ((long)( height) / 30) - 60 ,heightMap->w - j);
                         }       
                         }
+SDL_UnlockSurface(heightMap);
+                for(int i = 0; i < (heightMap->h * heightMap->w)/4   -1  ; i ++)
+                        {
+                                 this->addFace (3, VERTEX_ONLY, i,i+1 ,i + (heightMap->w / 2) );
+                                
+                                  this->addFace (3, VERTEX_ONLY,i + (heightMap->w / 2)  ,i + (heightMap->w / 2) +1, i+1 );
+                                
 
-                for(int i = 0; i < (heightMap->h * heightMap->w) / 4 - heightMap->w /2 -1  ; i ++)
-                        {
-                                  this->addFace (3, VERTEX_ONLY, i,i+1 ,i + (heightMap->w / 2) );
-                                
-                                  this->addFace (3, VERTEX_ONLY, i+1,i + (heightMap->w / 2)  ,i + (heightMap->w / 2) +1 );
+                                //this->addFace (4 ,VERTEX_ONLY,i,i + (heightMap->w / 2)  ,i + (heightMap->w / 2) +1, i+1 );
                         }
                 

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

@@ -771 +771 @@
   this->vertices->finalizeArray();
   this->vTexture->finalizeArray();
+printf("=================%s::%d\n", this->getClassName(), normals->getCount());
   if (normals->getCount() == 0) // vertices-Array must be built for this
     this->buildVertexNormals();

branches/height_map/src/world_entities/terrain.cc

@@ -24 +24 @@
 #include "resource_manager.h"
 #include "model.h"
+#include "material.h"
 #include "height_map.h"
 #include "glincl.h"
@@ -39 +40 @@
 
   this->init();
-  
+
+  this->tmp_mat = new Material();  
   // this->loadParams(root);
 
@@ -204 +206 @@
   Vector tmpRot = this->getAbsDir().getSpacialAxis();
   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
+
+   this->tmp_mat->select();
+
   this->model->draw();
   if (this->objectList)

branches/height_map/src/world_entities/terrain.h

@@ -15 +15 @@
 // FORWARD DECLARATION
 class SpatialSeparation;
+class Material;
 
 //! A simple method to call a desired debug world.
@@ -43 +44 @@
  private:
    Model*              vegetation;
+   Material*           tmp_mat;
    int                 objectList;
 };