Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix PolygonGeometry per position height extrusion #2923

Merged
merged 4 commits into from
Aug 6, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
Change Log
==========

### 1.13 - 2015-09-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
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/PolygonGeometry.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/PolygonOutlineGeometry.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down