Merge pull request #4014 from slozier/fix_4013

Resolve issue #4013

Author: bagnell

Source/Core/HeightmapTerrainData.js

@@ -524,18 +524,19 @@ define([
 
         var i;
         if (isBigEndian) {
-            for (i = 0; i < elementsPerHeight; ++i) {
+            for (i = 0; i < elementsPerHeight - 1; ++i) {
                 heights[index + i] = (height / divisor) | 0;
                 height -= heights[index + i] * divisor;
                 divisor /= elementMultiplier;
             }
         } else {
-            for (i = elementsPerHeight - 1; i >= 0; --i) {
+            for (i = elementsPerHeight - 1; i > 0; --i) {
                 heights[index + i] = (height / divisor) | 0;
                 height -= heights[index + i] * divisor;
                 divisor /= elementMultiplier;
             }
         }
+        heights[index + i] = height;
     }
 
     return HeightmapTerrainData;

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, 1, 1, 2, 3, 3, 4, 4, 4, 5, 5, 6, 7, 7, 8, 8]);
+                 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]);
              });
          });
 
@@ -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, 3, 3, 4, 4, 5, 5, 6, 6, 6, 7, 7, 8, 9, 9, 10]);
+                 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]);
              });
          });