Merge pull request #3966 from AnalyticalGraphicsInc/fix-heightmaps

Fix heightmap upsampling
CesiumGS · May 26, 2016 · 59d83b9 · 59d83b9
2 parents 6ca381f + f052d23
commit 59d83b9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Apps/Sandcastle/gallery/Terrain.html b/Apps/Sandcastle/gallery/Terrain.html
@@ -51,7 +51,7 @@
 var ellipsoidProvider = new Cesium.EllipsoidTerrainProvider();
 
 var vrTheWorldProvider = new Cesium.VRTheWorldTerrainProvider({
-    url : 'https://www.vr-theworld.com/vr-theworld/tiles1.0.0/73/',
+    url : 'http://www.vr-theworld.com/vr-theworld/tiles1.0.0/73/',
     credit : 'Terrain data courtesy VT MÄK'
 });
 

diff --git a/Source/Core/HeightmapTerrainData.js b/Source/Core/HeightmapTerrainData.js
@@ -525,13 +525,13 @@ define([
         var i;
         if (isBigEndian) {
             for (i = 0; i < elementsPerHeight; ++i) {
-                heights[index + i] = height / divisor;
+                heights[index + i] = (height / divisor) | 0;
                 height -= heights[index + i] * divisor;
                 divisor /= elementMultiplier;
             }
         } else {
             for (i = elementsPerHeight - 1; i >= 0; --i) {
-                heights[index + i] = height / divisor;
+                heights[index + i] = (height / divisor) | 0;
                 height -= heights[index + i] * divisor;
                 divisor /= elementMultiplier;
             }

diff --git a/Specs/Core/HeightmapTerrainDataSpec.js b/Specs/Core/HeightmapTerrainDataSpec.js
@@ -162,7 +162,7 @@ defineSuite([
                  expect(upsampled.wasCreatedByUpsampling()).toBe(true);
                  expect(upsampled._width).toBe(4);
                  expect(upsampled._height).toBe(4);
-                 expect(upsampled._buffer).toEqual([1.0, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0, 5.5, 6.0, 6.5, 7.0, 7.5, 8.0, 8.5]);
+                 expect(upsampled._buffer).toEqual([1, 1, 1, 2, 3, 3, 4, 4, 4, 5, 5, 6, 7, 7, 8, 8]);
              });
          });
 
@@ -222,7 +222,7 @@ defineSuite([
                  expect(upsampled.wasCreatedByUpsampling()).toBe(true);
                  expect(upsampled._width).toBe(4);
                  expect(upsampled._height).toBe(4);
-                 expect(upsampled._buffer).toEqual([2.5, 3.0, 3.5, 4.0, 4.5, 5.0, 5.5, 6.0, 6.5, 7.0, 7.5, 8.0, 8.5, 9.0, 9.5, 10.0]);
+                 expect(upsampled._buffer).toEqual([2, 3, 3, 4, 4, 5, 5, 6, 6, 6, 7, 7, 8, 9, 9, 10]);
              });
          });