Changeset 6745 in orxonox.OLD

Timestamp:

Jan 25, 2006, 11:07:31 PM (18 years ago)

Author:

bottac

Message:

 

Location:

branches/height_map_merge/src

Files:

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

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

@@ -411 +411 @@
   shiftZ = 0;
 }
+
+
 HeightMap::~HeightMap()
 {
@@ -505 +507 @@
  scaleY = v.y;
  scaleZ = v.z;
+ generateNormalVectorField();
 }
 
@@ -518 +521 @@
 {
 
- //x -= offsetX;
- //y -= offsetZ;
+ x -= offsetX;
+ y -= offsetZ;
  
  
@@ -531 +534 @@
  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));
-  */
+ PRINTF(0)("a: %f \n" ,a);
+  PRINTF(0)("b: %f \n" ,b);
+   PRINTF(0)("c: %f \n" ,c);
+ 
+ height += ( (a/c)*(x) + (b/c)*(y));
+  
  PRINTF(0)("height: %f \n" ,height );
- return (height );
-}
+ return (height + offsetZ);
+}

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

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

branches/height_map_merge/src/world_entities/terrain.cc

@@ -170 +170 @@
       delete this->heightMapMaterial;
 
-
+delete this->heightMapMaterial;
+/*   
    this->heightMapMaterial = new Material(); 
    heightMapMaterial->setTransparency(1.0);
@@ -190 +191 @@
    heightMapMaterial->setSpecularMap(textureName);      
  
-
+*/
 
 }
@@ -262 +263 @@
     glBegin(GL_QUADS);            // Draw The Cube Using quads
     glColor3f(0.0f,1.0f,0.0f);  // Color Blue
-    glVertex3f(camera.x + 13.0f,height+13.0f,camera.z-13.0f);      // Top Right Of The Quad (Top)
-    glVertex3f(camera.x-13.0f, height+13.0f,camera.z-13.0f);      // Top Left Of The Quad (Top)
-    glVertex3f(camera.x-13.0f, height+13.0f, camera.z+13.0f);      // Bottom Left Of The Quad (Top)
-    glVertex3f(camera.x+ 13.0f, height+13.0f, camera.z+13.0f);      // Bottom Right Of The Quad (Top)
+    glVertex3f(camera.x + 63.0f,heightMap->getHeight(camera.x+63.0f, camera.z-10.0f)+13.0f,camera.z-10.0f);      // Top Right Of The Quad (Top)
+    glVertex3f(camera.x-63.0f, heightMap->getHeight(camera.x+63.0f, camera.z-10.0f)+13.0f,camera.z-10.0f);      // Top Left Of The Quad (Top)
+    glVertex3f(camera.x-63.0f, heightMap->getHeight(camera.x+63.0f, camera.z+10.0f)+13.0f, camera.z+10.0f);      // Bottom Left Of The Quad (Top)
+    glVertex3f(camera.x+ 63.0f, heightMap->getHeight(camera.x+63.0f, camera.z+10.0f)+13.0f, camera.z+10.0f);      // Bottom Right Of The Quad (Top)
    glEnd();                      // End Drawing The Plan