Changeset 6730 in orxonox.OLD

Timestamp:

Jan 25, 2006, 6:20:55 PM (18 years ago)

Author:

bottac

Message:

 

Location:

branches/height_map_merge/src

Files:

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

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

@@ -129 +129 @@
                 model->addNormal(normalVectorField[i][w].y,normalVectorField[i][w].z,normalVectorField[i][w].x);
                 model->addTexCoor((float)(j1-sampleRate) /(texRate), (float)(i %heightMap->h)/(texRate));
+                PRINTF(0)("shiftX %f,shiftY %f,shiftZ %f\n", shiftX, shiftY ,shiftZ);
                 model->addColor(r/255.0,g/255.0,b/255.0);
                 
@@ -406 +407 @@
         
   heights  = (unsigned char*) heightMap->pixels;
-
-
+  shiftX = 0;
+  shiftY = 0;
+  shiftZ = 0;
 }
 HeightMap::~HeightMap()
@@ -520 +522 @@
  
  
- int xInt = (int)x / scaleX;  x -= (float)xInt*scaleX; xInt = heightMap->h - xInt;
- 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;
+ int xInt = (int)x / scaleX;  x -= (float)((int)x); xInt = heightMap->h - xInt;
+ int yInt = (int)y / scaleZ;    y -= (float) ((int) y); /*yInt = heightMap->w - yInt;*/
+ 
+ PRINTF(0)("xInt: %i, yInt: %i, x: %f, y: %f\n", xInt, yInt, x, y);
+ 
+ if(xInt <= 0 || xInt >= heightMap->h || yInt <= 0 || yInt >= heightMap->w  ) return 0;
  
  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);
-  
+ height -= ( (a/c)*(x) + (b/c)*(y));
+  */
+ PRINTF(0)("height: %f \n" ,height );
  return (height );
 }

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

@@ -19 +19 @@
 #define texRate      32
 #define texRatef     4.0f
-#define tileSize     128
+#define tileSize     32
 
 class SDL_Surface;

branches/height_map_merge/src/world_entities/terrain.cc

@@ -223 +223 @@
 
   /* translate */
- /* glTranslatef (this->getAbsCoor ().x,
+  glTranslatef (this->getAbsCoor ().x,
                 this->getAbsCoor ().y,
                 this->getAbsCoor ().z);
-        */      
   /* rotate */
  // Vector tmpRot = this->getAbsDir().getSpacialAxis();
@@ -250 +249 @@
   glPopMatrix();
 
+  
+  
+  
+  
  glMatrixMode(GL_MODELVIEW);
 glPushMatrix();