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

Timestamp:

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

Author:

bottac

Message:

 

Location:

branches/height_map_merge/src/lib/graphics/importer

Files:

• height_map.cc (modified) (4 diffs)
• height_map.h (modified) (1 diff)

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;