Changeset 6529 in orxonox.OLD for branches/height_map/src/lib

Timestamp:

Jan 18, 2006, 1:18:40 PM (19 years ago)

Author:

bottac

Message:

Some bugs fixed

Location:

branches/height_map/src/lib/graphics/importer

Files:

• height_map.cc (modified) (10 diffs)
• height_map.h (modified) (1 diff)
• static_model.cc (modified) (1 diff)
• vertex_array_model.cc (modified) (3 diffs)

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

@@ -37 +37 @@
 lowResModel  = new VertexArrayModel();
 
-this->load(i1,j1,i2,j2,hm,highResModel,4);
-this->load(i1,j1,i2,j2,hm,lowResModel, 32);
+this->load(i1,j1,i2,j2,hm,highResModel,2);
+this->load(i1,j1,i2,j2,hm,lowResModel, 8);
 }
 
@@ -84 +84 @@
         int sampleRate = Res;
         
-        unsigned char height = 0;
+         float height = 0;
         int offset = 0;
         
@@ -128 +128 @@
                  b = (float)colours[3*j+0 + 3*i*(heightMap->w)];
                  }
-                height =  hm->heights[j+sampleRate + i*(heightMap->w )];
+                height = (float)(unsigned char) hm->heights[j +sampleRate+ i*(heightMap->w )];
+                height += (float)(unsigned char) hm->heights[j+ 1 + sampleRate + (i+1)*(heightMap->w )];
+                height +=  (float) (unsigned char) hm->heights[j -1+ sampleRate   + (i+1)*(heightMap->w )];
+                height +=  (float)(unsigned char)hm->heights[j +sampleRate+ (i+2)*(heightMap->w )];
+                height +=  (float)(unsigned char)hm->heights[j+sampleRate + (i)*(heightMap->w )];
+                
+                height=height/5.0;
+                
                 model->addVertex(scaleX*(heightMap->h -i) + shiftX ,((double)(height)*scaleY) + shiftY ,scaleZ*(j) + shiftZ); // Top Right      
                 model->addNormal(normalVectorField[i][j].y,normalVectorField[i][j].z,normalVectorField[i][j].x);
-                model->addTexCoor(((j/sampleRate)%texRate)/texRatef,((i/sampleRate)%texRate)/texRatef, ((j/sampleRate)%heightMap->w)/float(heightMap->w),((i/sampleRate)%heightMap->h)/float(heightMap->h));
-
+                model->addTexCoor((float)j /(texRate), (float)(i %heightMap->h)/(texRate));
+                
+                //PRINTF(0)("TexCoord:  %f %f \n",(float)j / 100.0, (float)(i %heightMap->h)/100.0);
+                
                 model->addColor(r/255.0,g/255.0,b/255.0);
-                
-                
                 w = j;
             }
@@ -142 +149 @@
                 model->addVertex(scaleX*(heightMap->h -i)+ shiftX,shiftY,scaleZ*(w)+ shiftZ); // Top Right
                 model->addNormal(normalVectorField[i][w].y,normalVectorField[i][w].z,normalVectorField[i][w].x);
-                model->addTexCoor((((w+sampleRate)/sampleRate)%4)/4.0,(((i+ sampleRate)/sampleRate)%4)/4.0);
+                model->addTexCoor((((w+sampleRate)/sampleRate))/4.0,(((i+ sampleRate)/sampleRate))/4.0);
                 model->addColor(r/255.0,g/255.0,b/255.0);
                 
@@ -187 +194 @@
                 model->addVertex(scaleX*(heightMap->h -i) + shiftX , shiftY ,scaleZ*(j) + shiftZ); // Top Right 
                 model->addNormal(normalVectorField[i][j].y,normalVectorField[i][j].z,normalVectorField[i][j].x);
-                model->addTexCoor(((j/sampleRate)%texRate)/texRatef,(((i - sampleRate)/sampleRate)%texRate)/texRatef, ((j/sampleRate)%heightMap->w)/float(heightMap->w),(((i - sampleRate) /sampleRate)%heightMap->h)/float(heightMap->h));
+                model->addTexCoor(((j/sampleRate))/texRatef,(((i - sampleRate)/sampleRate))/texRatef, ((j/sampleRate)%heightMap->w)/float(heightMap->w),(((i - sampleRate) /sampleRate)%heightMap->h)/float(heightMap->h));
                 model->addColor(r/255.0,g/255.0,b/255.0);               
         
@@ -195 +202 @@
             {
                 int i = i1;
-                height =  hm->heights[j+sampleRate + i*(heightMap->w )];
+                height = (float)(unsigned char) hm->heights[j +sampleRate+ i*(heightMap->w )];
+                height += (float)(unsigned char) hm->heights[j+ 1 + sampleRate + (i+1)*(heightMap->w )];
+                height +=  (float) (unsigned char) hm->heights[j -1+ sampleRate   + (i+1)*(heightMap->w )];
+                height +=  (float)(unsigned char)hm->heights[j +sampleRate+ (i+2)*(heightMap->w )];
+                height +=  (float)(unsigned char)hm->heights[j+sampleRate + (i)*(heightMap->w )];
+                height=height/5.0;
+                
                 model->addVertex(scaleX*(heightMap->h -i) + shiftX , ((double)(height)*scaleY) +shiftY ,scaleZ*(j) + shiftZ); // Top Right      
                 model->addNormal(normalVectorField[i][j].y,normalVectorField[i][j].z,normalVectorField[i][j].x);
-                model->addTexCoor(((j/sampleRate)%texRate)/texRatef,(((i)/sampleRate)%texRate)/texRatef, ((j/sampleRate)%heightMap->w)/float(heightMap->w),(((i)/sampleRate)%heightMap->h)/float(heightMap->h));
+                model->addTexCoor(((j/sampleRate))/texRatef,(((i)/sampleRate))/texRatef, ((j/sampleRate)%heightMap->w)/float(heightMap->w),(((i)/sampleRate)%heightMap->h)/float(heightMap->h));
                 model->addColor(r/255.0,g/255.0,b/255.0);
             
@@ -228 +241 @@
             {
                 int i = i2;
-                height =  hm->heights[j+sampleRate + i*(heightMap->w )];
+                        height = (float)(unsigned char) hm->heights[j +sampleRate+ i*(heightMap->w )];
+                height += (float)(unsigned char) hm->heights[j+ 1 + sampleRate + (i+1)*(heightMap->w )];
+                height +=  (float) (unsigned char) hm->heights[j -1+ sampleRate   + (i+1)*(heightMap->w )];
+                height +=  (float)(unsigned char)hm->heights[j +sampleRate+ (i+2)*(heightMap->w )];
+                height +=  (float)(unsigned char)hm->heights[j+sampleRate + (i)*(heightMap->w )];
+                height=height/5.0;
                 model->addVertex(scaleX*(heightMap->h -i) + shiftX , ((double)(height)*scaleY) +shiftY ,scaleZ*(j) + shiftZ); // Top Right      
                 model->addNormal(normalVectorField[i][j].y,normalVectorField[i][j].z,normalVectorField[i][j].x);
@@ -349 +367 @@
   colourMap = IMG_Load(colour_map_name);
   }
+  
   if(colourMap != NULL)
                 {
@@ -373 +392 @@
   
         
-   heights  = (unsigned char*) heightMap->pixels;
+  heights  = (unsigned char*) heightMap->pixels;
 
 
@@ -409 +428 @@
 
 int i_min = 1;
-int i_max = (heightMap->h - tileSize)/ tileSize;
+int i_max = (heightMap->h - tileSize )/ tileSize;
 int j_min = 1;
 int j_max= (heightMap->w - tileSize) / tileSize;

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

@@ -17 +17 @@
 
 
-#define texRate      4
+#define texRate      22
 #define texRatef     4.0f
-#define tileSize     64
+#define tileSize     32
 
 class SDL_Surface;

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

@@ -289 +289 @@
          glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
+        
   if (groupName == NULL)
      return;

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

@@ -34 +34 @@
 {
 
-   this->tex1 = new Texture("pictures/ground.tga");
-  this->tex1->setName("test1");
-  this->tex2 = new Texture("pictures/heightmapHelloCM.bmp");
-  this->tex2->setName("test2");
+
 
   
@@ -182 +179 @@
   this->texCoords1.push_back(u);
   this->texCoords1.push_back(v);
-  this->texCoords2.push_back(w);
-  this->texCoords2.push_back(x);
+  //this->texCoords2.push_back(w);
+  //this->texCoords2.push_back(x);
   this->pModelInfo.numTexCoor++;
 }
@@ -190 +187 @@
   this->texCoords1.push_back(u);
   this->texCoords1.push_back(v);
-  this->texCoords2.push_back(0.0);
-  this->texCoords2.push_back(0.0);
+  
   this->pModelInfo.numTexCoor++;
 }