Ticket #2039: exact_normal_unnormalized.diff

source/graphics/Terrain.cpp

@@ -254 +254 @@
         if (xf + zf <= 1.f)
         {
             // Lower-left triangle (don't use h11)
-            return -CVector3D(TERRAIN_TILE_SIZE, (h10-h00)*HEIGHT_SCALE, 0).Cross(CVector3D(0, (h01-h00)*HEIGHT_SCALE, TERRAIN_TILE_SIZE)).Normalized();
+            return CVector3D(h00-h10, TERRAIN_TILE_SIZE/HEIGHT_SCALE, h00-h01);
         }
         else
         {
             // Upper-right triangle (don't use h00)
-            return -CVector3D(TERRAIN_TILE_SIZE, (h11-h01)*HEIGHT_SCALE, 0).Cross(CVector3D(0, (h11-h10)*HEIGHT_SCALE, TERRAIN_TILE_SIZE)).Normalized();
+            return CVector3D(h01-h11, TERRAIN_TILE_SIZE/HEIGHT_SCALE, h10-h11);
         }
     }
     else
@@ -267 +267 @@
         if (xf <= zf)
         {
             // Upper-left triangle (don't use h10)
-            return -CVector3D(TERRAIN_TILE_SIZE, (h11-h01)*HEIGHT_SCALE, 0).Cross(CVector3D(0, (h01-h00)*HEIGHT_SCALE, TERRAIN_TILE_SIZE)).Normalized();
+            return CVector3D(h01-h11, TERRAIN_TILE_SIZE/HEIGHT_SCALE, h00-h01);
         }
         else
         {
             // Lower-right triangle (don't use h01)
-            return -CVector3D(TERRAIN_TILE_SIZE, (h10-h00)*HEIGHT_SCALE, 0).Cross(CVector3D(0, (h11-h10)*HEIGHT_SCALE, TERRAIN_TILE_SIZE)).Normalized();
+            return CVector3D(h00-h10, TERRAIN_TILE_SIZE/HEIGHT_SCALE, h10-h11);
         }
     }
 }