From 8ae71a8a7081d1dc1d105db3c6fd9bc9453864ed Mon Sep 17 00:00:00 2001 From: Dan Bagnell Date: Mon, 9 May 2016 14:32:19 -0400 Subject: [PATCH 1/3] Fix exaggerated terrain normals. --- Source/Workers/createVerticesFromQuantizedTerrainMesh.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Workers/createVerticesFromQuantizedTerrainMesh.js b/Source/Workers/createVerticesFromQuantizedTerrainMesh.js index 73450be748fd..73b92065b8c8 100644 --- a/Source/Workers/createVerticesFromQuantizedTerrainMesh.js +++ b/Source/Workers/createVerticesFromQuantizedTerrainMesh.js @@ -145,7 +145,7 @@ define([ if (exaggeration !== 1.0) { var normal = AttributeCompression.octDecode(toPack.x, toPack.y, scratchNormal); - var fromENUNormal = Transforms.eastNorthUpToFixedFrame(cartesian3Scratch, ellipsoid, scratchFromENU); + var fromENUNormal = Transforms.eastNorthUpToFixedFrame(positions[j], ellipsoid, scratchFromENU); var toENUNormal = Matrix4.inverseTransformation(fromENUNormal, scratchToENU); Matrix4.multiplyByPointAsVector(toENUNormal, normal, normal); From c09878b924cce6f35f9a6f08278bbc48c33698c9 Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Tue, 10 May 2016 16:57:38 +1000 Subject: [PATCH 2/3] Update CHANGES.md --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index e3fb4f30798e..4aefd4b5d840 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,6 +8,7 @@ Change Log * Deprecated * * Improved KML NetworkLink compatibility by supporting the `Url` tag. [#3895](https://github.com/AnalyticalGraphicsInc/cesium/pull/3895). +* Fixed a bug that could cause incorrect normals to be computed for exaggerated terrain, especially for low-detail tiles. ### 1.21 - 2016-05-02 From e25b2ce4059feee6de7e4525042b89efd4e99fcd Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Tue, 10 May 2016 16:58:16 +1000 Subject: [PATCH 3/3] Update CHANGES.md --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 4aefd4b5d840..eb0ee3c13897 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,7 +8,7 @@ Change Log * Deprecated * * Improved KML NetworkLink compatibility by supporting the `Url` tag. [#3895](https://github.com/AnalyticalGraphicsInc/cesium/pull/3895). -* Fixed a bug that could cause incorrect normals to be computed for exaggerated terrain, especially for low-detail tiles. +* Fixed a bug that could cause incorrect normals to be computed for exaggerated terrain, especially for low-detail tiles. [#3904](https://github.com/AnalyticalGraphicsInc/cesium/pull/3904) ### 1.21 - 2016-05-02