Changeset 6727 in orxonox.OLD for branches/height_map_merge/src/lib

Timestamp:

Jan 25, 2006, 5:46:16 PM (19 years ago)

Author:

bottac

Message:

 

Location:

branches/height_map_merge/src/lib/graphics/importer

Files:

• height_map.cc (modified) (14 diffs)
• height_map.h (modified) (5 diffs)

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

@@ -37 +37 @@
 lowResModel  = new VertexArrayModel();
 
-this->load(i1,j1,i2,j2,hm,highResModel,2);
+this->load(i1,j1,i2,j2,hm,highResModel,4);
 this->load(i1,j1,i2,j2,hm,lowResModel, 8);
 }
@@ -57 +57 @@
                                                                 //FIXME
     float cameraDistance = (State::getCamera()->getAbsCoor() - Vector(0.0,100.0,0.0)).len();
-    if (cameraDistance > 5000 )
+    if (cameraDistance > 10000 )
     {
     
     }
-    else if (cameraDistance > 1000 )
+    else if (cameraDistance >= 50000 )
     {
       this->drawLowRes();
@@ -98 +98 @@
         int sampleRate = Res;
         
-         float height = 0;
+        float height = 0;
         int offset = 0;
         
@@ -128 +128 @@
                 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((float)(j1-sampleRate) /(texRate), (float)(i %heightMap->h)/(texRate));
                 model->addColor(r/255.0,g/255.0,b/255.0);
                 
@@ -147 +147 @@
                 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((float)j /(texRate), (float)(i %heightMap->h)/(texRate));
+                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);
@@ -163 +162 @@
                 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.0,(((i+ sampleRate)/sampleRate))/4.0);
+                model->addTexCoor((float)(j2+sampleRate) /(texRate), (float)(i %heightMap->h)/(texRate));
                 model->addColor(r/255.0,g/255.0,b/255.0);
                 
@@ -208 +207 @@
                 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))/texRatef,(((i - sampleRate)/sampleRate))/texRatef);
+                model->addTexCoor((float)j /(texRate), (float)((i - sampleRate) %heightMap->h)/(texRate));
                 model->addColor(r/255.0,g/255.0,b/255.0);               
         
@@ -225 +224 @@
                 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))/texRatef,(((i)/sampleRate))/texRatef);
+                model->addTexCoor((float)j /(texRate), (float)(i %heightMap->h)/(texRate));
                 model->addColor(r/255.0,g/255.0,b/255.0);
             
@@ -246 +245 @@
                 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);
+                model->addTexCoor((float)j /(texRate), (float)((i+ sampleRate) %heightMap->h)/(texRate));
                 model->addColor(r/255.0,g/255.0,b/255.0);               
         
@@ -255 +254 @@
             {
                 int i = i2;
-                        height = (float)(unsigned char) 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 )];
@@ -263 +262 @@
                 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);
+                model->addTexCoor((float)j /(texRate), (float)(i %heightMap->h)/(texRate));
                 model->addColor(r/255.0,g/255.0,b/255.0);
             
@@ -452 +451 @@
         for(int j = 1; j < j_max ; j++)
         {
-                
          tiles[i][j]->draw();
         }       
@@ -500 +498 @@
 
 
-
-
-
 void HeightMap::scale(Vector v)
 {
@@ -510 +505 @@
 }
 
-void HeightMap::shift(Vector v)
-{
- shiftX = v.x;
- shiftY = v.y;
- shiftZ = v.z;
-}
-
-
-float HeightMap::getHeight(float x, float y)
-{
+void HeightMap::setAbsCoor(Vector v)
+{
+ offsetX = v.x;
+ offsetY = v.y;
+ offsetZ  = v.z;
+}
+
+
+float HeightMap::getHeight(float x, float y) 
+{
+
+ //x -= offsetX;
+ //y -= offsetZ;
+ 
+ 
  int xInt = (int)x / scaleX;  x -= (float)xInt*scaleX; xInt = heightMap->h - xInt;
- int yInt = (int)y / scaleZ;    y -= (float)yInt*scaleZ;
- if(xInt <= 0 || xInt >= heightMap->h || yInt <= 0 || yInt >= heightMap->w  ) return 0.0f;
+ int yInt = (int)y / scaleZ;    y -= (float)yInt*scaleZ; /*yInt = heightMap->w - yInt;*/
+ 
+ if(xInt <= 0 || xInt >= heightMap->h || yInt <= 0 || yInt >= heightMap->w  ) return shiftY;
+ 
  float height = heights[yInt + (xInt)*heightMap->w]*scaleY;
+ 
  float a = normalVectorField[(xInt)][yInt].x;
  float b = normalVectorField [(xInt)][yInt].z;
  float c = normalVectorField [(xInt)][yInt].y;
-  height -= ( (a/c)*(x) + (b/c)*(y))*scaleY;
- return height;
-}
+ 
+ height -= ( (a/c)*(x) + (b/c)*(y);
+  
+ return (height );
+}

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

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer:
+   main-programmer: bottac@ee.ethz.ch
 */
 
@@ -17 +17 @@
 
 
-#define texRate      64
+#define texRate      32
 #define texRatef     4.0f
-#define tileSize     64
+#define tileSize     128
 
 class SDL_Surface;
@@ -58 +58 @@
 void load(const char*, int Mode);
 void scale( Vector V); 
-void shift (Vector V);
+void setAbsCoor(Vector V);
 float getHeight(float x, float y); 
+float getNormal(float x, float y);
 HeightMap();
 HeightMap(const char*);
@@ -78 +79 @@
 Vector  **  normalVectorField ; 
 Tile    ***  tiles;
-Vector     camCoords;
+Vector    camCoords;
+Vector offsetCoords;  
 Material * tmp_mat;
 Material* red_mat;
@@ -86 +88 @@
 float scaleY ;
 float scaleZ ;
-float shiftX ;
-float shiftY ;
-float shiftZ ;
+float shiftX ; // to be removed
+float shiftY ; // to be removed
+float shiftZ ; // to be removed
+float offsetX;
+float offsetY;
+float offsetZ;
 int   cmScaleX;
 int   cmScaleY;