From 079e2049ddfcb2e290bd3aefc0b173dc57bf27ca Mon Sep 17 00:00:00 2001 From: hpinkos Date: Thu, 6 Aug 2015 12:13:10 -0400 Subject: [PATCH 1/4] fix extrusion --- Source/Core/PolygonGeometry.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/PolygonGeometry.js b/Source/Core/PolygonGeometry.js index 5132683b1813..3614b0fbb27a 100644 --- a/Source/Core/PolygonGeometry.js +++ b/Source/Core/PolygonGeometry.js @@ -619,8 +619,8 @@ define([ var perPositionHeight = defaultValue(options.perPositionHeight, false); var extrudedHeight = options.extrudedHeight; - var extrude = (defined(extrudedHeight) && (!CesiumMath.equalsEpsilon(height, extrudedHeight, CesiumMath.EPSILON6) || perPositionHeight)); - if (extrude) { + var extrude = defined(extrudedHeight); + if (extrude && !perPositionHeight) { var h = extrudedHeight; extrudedHeight = Math.min(h, height); height = Math.max(h, height); From 1a4b0348c35f1ecb4f9d13bb81545cc07970a04d Mon Sep 17 00:00:00 2001 From: hpinkos Date: Thu, 6 Aug 2015 12:14:31 -0400 Subject: [PATCH 2/4] fix outline --- Source/Core/PolygonOutlineGeometry.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/PolygonOutlineGeometry.js b/Source/Core/PolygonOutlineGeometry.js index 7ee6ebfcfedb..5b3792bd6612 100644 --- a/Source/Core/PolygonOutlineGeometry.js +++ b/Source/Core/PolygonOutlineGeometry.js @@ -296,8 +296,8 @@ define([ var perPositionHeight = defaultValue(options.perPositionHeight, false); var extrudedHeight = options.extrudedHeight; - var extrude = (defined(extrudedHeight) && (!CesiumMath.equalsEpsilon(height, extrudedHeight, CesiumMath.EPSILON6) || perPositionHeight)); - if (extrude) { + var extrude = defined(extrudedHeight); + if (extrude && !perPositionHeight) { var h = extrudedHeight; extrudedHeight = Math.min(h, height); height = Math.max(h, height); From 5533c37c12c2985f83a8c4c27402e5ff453ab722 Mon Sep 17 00:00:00 2001 From: Hannah Date: Thu, 6 Aug 2015 12:19:43 -0400 Subject: [PATCH 3/4] Update CHANGES.md --- CHANGES.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index ec09cf6489a5..0330120b72b4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,15 @@ Change Log ========== +### 1.11 - 2015-07-01 + +* Breaking changes + * +* Deprecated + * +* Fix issue where extruded `PolygonGeometry` was always extruding to the ellipsoid surface instead of specified height. + + ### 1.12 - 2015-08-03 * Breaking changes From 446cfcd6412b7d8514f4ff268a975d41954938f6 Mon Sep 17 00:00:00 2001 From: Hannah Date: Thu, 6 Aug 2015 12:19:59 -0400 Subject: [PATCH 4/4] Update CHANGES.md --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 0330120b72b4..57cee6cb5f9e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,7 +1,7 @@ Change Log ========== -### 1.11 - 2015-07-01 +### 1.13 - 2015-09-01 * Breaking changes *