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.

Sign up for GitHub

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

Remove ClippingPlaneCollection.clone #6872

Merged
merged 3 commits into from
Aug 3, 2018
Merged

Remove ClippingPlaneCollection.clone #6872

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e02c825
remove ClippingPlaneCollection.clone
Aug 1, 2018
9768f89
fix sandcastle
Aug 3, 2018
66615c7
Merge branch 'master' into remove-clipping-collection-clone
Aug 3, 2018
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
33 changes: 14 additions & 19 deletions Apps/Sandcastle/gallery/3D Tiles Clipping Planes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,20 @@
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> <!-- Use Chrome Frame in IE -->
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
<meta name="description" content="User-defined clipping planes applied to a batched 3D Tileset, point cloud, and model.">
<meta name="cesium-sandcastle-labels" content="Showcases, 3D Tiles">
<title>Cesium Demo</title>
<script type="text/javascript" src="../Sandcastle-header.js"></script>
<script type="text/javascript" src="../../../ThirdParty/requirejs-2.1.20/require.js"></script>
<script type="text/javascript">
require.config({
baseUrl : '../../../Source',
waitSeconds : 60
});
if(typeof require === 'function') {
require.config({
baseUrl : '../../../Source',
waitSeconds : 120
});
}
</script>
</head>
<body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">
Expand Down Expand Up @@ -45,7 +47,6 @@
function startup(Cesium) {
'use strict';
//Sandcastle_Begin

// Add a clipping plane, a plane geometry to show the representation of the
// plane, and control the magnitude of the plane distance with the mouse.

Expand Down Expand Up @@ -154,19 +155,13 @@

var modelEntityClippingPlanes;
function loadModel(url) {
var clippingPlanes = [
new Cesium.ClippingPlane(new Cesium.Cartesian3(0.0, 0.0, -1.0), -100.0)
];

modelEntityClippingPlanes = new Cesium.ClippingPlaneCollection({
planes : clippingPlanes,
var clippingPlanes = new Cesium.ClippingPlaneCollection({
planes : [
new Cesium.ClippingPlane(new Cesium.Cartesian3(0.0, 0.0, -1.0), -100.0)
],
edgeWidth : viewModel.edgeStylingEnabled ? 1.0 : 0.0
});

function updateClippingPlanes() {
return modelEntityClippingPlanes;
}

var position = Cesium.Cartesian3.fromDegrees(-123.0744619, 44.0503706, 100.0);
var heading = Cesium.Math.toRadians(135.0);
var pitch = 0.0;
Expand All @@ -181,14 +176,14 @@
uri : url,
scale : 8,
minimumPixelSize : 100.0,
clippingPlanes : new Cesium.CallbackProperty(updateClippingPlanes, false)
clippingPlanes : clippingPlanes
}
});

viewer.trackedEntity = entity;

for (var i = 0; i < clippingPlanes.length; ++i) {
var plane = clippingPlanes[i];
var plane = clippingPlanes.get(i);
var planeEntity = viewer.entities.add({
position : position,
plane : {
Expand Down Expand Up @@ -262,7 +257,7 @@
}

//Sandcastle_End
Sandcastle.finishedLoading();
Sandcastle.finishedLoading();
}
if (typeof Cesium !== 'undefined') {
startup(Cesium);
Expand Down
10 changes: 9 additions & 1 deletion CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
Change Log
==========

### 1.49 - 2018-09-03

##### Breaking Changes :mega:
* Removed `ClippingPlaneCollection.clone`

##### Fixes :wrench:
* Fixed bug that caused a new `ClippingPlaneCollection` to be created every frame when used with a model entity [#6872](https://github.com/AnalyticalGraphicsInc/cesium/pull/6872)

### 1.48 - 2018-08-01

##### Additions :tada:
Expand All @@ -16,7 +24,7 @@ Change Log
* Support for the 3D Tiles pre-version 1.0 Batch Table Hierarchy is deprecated to reflect updates to the [3D Tiles spec](https://github.com/AnalyticalGraphicsInc/3d-tiles/pull/301). Use the [`3DTILES_batch_table_hierarchy`](https://github.com/AnalyticalGraphicsInc/3d-tiles/tree/1.0/extensions/3DTILES_batch_table_hierarchy) extension instead. Support for the deprecated batch table hierarchy will remain for backwards compatibility. [#6780](https://github.com/AnalyticalGraphicsInc/cesium/pull/6780)
* `PostProcessStageLibrary.createLensFlarStage` is deprecated due to misspelling and will be removed in Cesium 1.49. Use `PostProcessStageLibrary.createLensFlareStage` instead.

#### Fixes :wrench:
##### Fixes :wrench:
* Fixed a bug where 3D Tilesets using the `region` bounding volume don't get transformed when the tileset's `modelMatrix` changes. [#6755](https://github.com/AnalyticalGraphicsInc/cesium/pull/6755)
* Fixed a bug that caused eye dome lighting for point clouds to fail in Safari on macOS and Edge on Windows by removing the dependency on floating point color textures. [#6792](https://github.com/AnalyticalGraphicsInc/cesium/issues/6792)
* Fixed a bug that caused polylines on terrain to render incorrectly in 2D and Columbus View with a `WebMercatorProjection`. [#6809](https://github.com/AnalyticalGraphicsInc/cesium/issues/6809)
Expand Down
41 changes: 0 additions & 41 deletions Source/Scene/ClippingPlaneCollection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,47 +546,6 @@ define([
this._dirtyIndex = -1;
};

/**
* Duplicates this ClippingPlaneCollection instance.
*
* @param {ClippingPlaneCollection} [result] The object onto which to store the result.
* @returns {ClippingPlaneCollection} The modified result parameter or a new ClippingPlaneCollection instance if one was not provided.
*/
ClippingPlaneCollection.prototype.clone = function(result) {
if (!defined(result)) {
result = new ClippingPlaneCollection();
}

var length = this.length;
var i;
if (result.length !== length) {
var planes = result._planes;
var index = planes.length;

planes.length = length;
for (i = index; i < length; ++i) {
result._planes[i] = new ClippingPlane(Cartesian3.UNIT_X, 0.0);
}
}

for (i = 0; i < length; ++i) {
var resultPlane = result._planes[i];
resultPlane.index = i;
resultPlane.onChangeCallback = function(index) {
setIndexDirty(result, index);
};
ClippingPlane.clone(this._planes[i], resultPlane);
}

result.enabled = this.enabled;
Matrix4.clone(this.modelMatrix, result.modelMatrix);
result.unionClippingRegions = this.unionClippingRegions;
Color.clone(this.edgeColor, result.edgeColor);
result.edgeWidth = this.edgeWidth;

return result;
};

var scratchMatrix = new Matrix4();
var scratchPlane = new Plane(Cartesian3.UNIT_X, 0.0);
/**
Expand Down
50 changes: 0 additions & 50 deletions Specs/Scene/ClippingPlaneCollectionSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,56 +576,6 @@ defineSuite([
}).toThrowDeveloperError();
});

it('clone without a result parameter returns new copy', function() {
clippingPlanes = new ClippingPlaneCollection({
planes : planes,
enabled : false,
edgeColor : Color.RED,
modelMatrix : transform
});

var result = clippingPlanes.clone();
expect(result).not.toBe(clippingPlanes);
expect(Cartesian3.equals(result._planes[0].normal, planes[0].normal)).toBe(true);
expect(result._planes[0].distance).toEqual(planes[0].distance);
expect(Cartesian3.equals(result._planes[1].normal, planes[1].normal)).toBe(true);
expect(result._planes[1].distance).toEqual(planes[1].distance);
expect(result.enabled).toEqual(false);
expect(result.modelMatrix).toEqual(transform);
expect(result.edgeColor).toEqual(Color.RED);
expect(result.edgeWidth).toEqual(0.0);
expect(result.unionClippingRegions).toEqual(false);
expect(result._testIntersection).not.toBeUndefined();
});

it('clone stores copy in result parameter', function() {
clippingPlanes = new ClippingPlaneCollection({
planes : planes,
enabled : false,
edgeColor : Color.RED,
modelMatrix : transform
});
var result = new ClippingPlaneCollection();
var copy = clippingPlanes.clone(result);
expect(copy).toBe(result);
expect(result._planes).not.toBe(planes);
expect(Cartesian3.equals(result._planes[0].normal, planes[0].normal)).toBe(true);
expect(result._planes[0].distance).toEqual(planes[0].distance);
expect(Cartesian3.equals(result._planes[1].normal, planes[1].normal)).toBe(true);
expect(result._planes[1].distance).toEqual(planes[1].distance);
expect(result.enabled).toEqual(false);
expect(result.modelMatrix).toEqual(transform);
expect(result.edgeColor).toEqual(Color.RED);
expect(result.edgeWidth).toEqual(0.0);
expect(result.unionClippingRegions).toEqual(false);
expect(result._testIntersection).not.toBeUndefined();

// Only allocate a new array if needed
var previousPlanes = result._planes;
clippingPlanes.clone(result);
expect(result._planes).toBe(previousPlanes);
});

it('setting unionClippingRegions updates testIntersection function', function() {
clippingPlanes = new ClippingPlaneCollection();
var originalIntersectFunction = clippingPlanes._testIntersection;
Expand Down