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

Jump to bottom

Fix styling + flight destination bug #8622

Merged
merged 2 commits into from
Feb 19, 2020
Merged

Fix styling + flight destination bug #8622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15d8967
Check passOptions.isRender instead of frameState.passes.render
lilleyse Feb 19, 2020
393e3de
Remove console.log
lilleyse Feb 19, 2020
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
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Change Log
##### Fixes :wrench:

* Fixed a bug where tiles would not load if the camera was tracking a moving tileset. [#8598](https://github.com/CesiumGS/cesium/pull/8598)
* Fixed a bug where applying a new 3D Tiles style during a flight would not update all existing tiles. [#8622](https://github.com/CesiumGS/cesium/pull/8622)

### 1.66.0 - 2020-02-03

Expand Down
8 changes: 4 additions & 4 deletions Source/Scene/Cesium3DTile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1211,8 +1211,8 @@ import TileOrientedBoundingBox from './TileOrientedBoundingBox.js';
this.geometricError = this._geometricError * uniformScale;
};

function applyDebugSettings(tile, tileset, frameState) {
if (!frameState.passes.render) {
function applyDebugSettings(tile, tileset, frameState, passOptions) {
if (!passOptions.isRender) {
return;
}

Expand Down Expand Up @@ -1320,10 +1320,10 @@ import TileOrientedBoundingBox from './TileOrientedBoundingBox.js';
*
* @private
*/
Cesium3DTile.prototype.update = function(tileset, frameState) {
Cesium3DTile.prototype.update = function(tileset, frameState, passOptions) {
var initCommandLength = frameState.commandList.length;
updateClippingPlanes(this, tileset);
applyDebugSettings(this, tileset, frameState);
applyDebugSettings(this, tileset, frameState, passOptions);
updateContent(this, tileset, frameState);
this._commandsLength = frameState.commandList.length - initCommandLength;

Expand Down
6 changes: 3 additions & 3 deletions Source/Scene/Cesium3DTileStyleEngine.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import defineProperties from '../Core/defineProperties.js';
this._styleDirty = true;
};

Cesium3DTileStyleEngine.prototype.applyStyle = function(tileset, frameState) {
Cesium3DTileStyleEngine.prototype.applyStyle = function(tileset, passOptions) {
if (!tileset.ready) {
return;
}
Expand All @@ -37,8 +37,8 @@ import defineProperties from '../Core/defineProperties.js';

var styleDirty = this._styleDirty;

if (frameState.passes.render) {
// Don't reset until the color pass, e.g., for mouse-over picking
if (passOptions.isRender) {
// Don't reset until the render pass
this._styleDirty = false;
}

Expand Down
11 changes: 6 additions & 5 deletions Source/Scene/Cesium3DTileset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1949,9 +1949,10 @@ import TileOrientedBoundingBox from './TileOrientedBoundingBox.js';
tileset._tileDebugLabels.update(frameState);
}

function updateTiles(tileset, frameState, isRender) {
tileset._styleEngine.applyStyle(tileset, frameState);
function updateTiles(tileset, frameState, passOptions) {
tileset._styleEngine.applyStyle(tileset, passOptions);

var isRender = passOptions.isRender;
var statistics = tileset._statistics;
var commandList = frameState.commandList;
var numberOfInitialCommands = commandList.length;
Expand Down Expand Up @@ -1988,13 +1989,13 @@ import TileOrientedBoundingBox from './TileOrientedBoundingBox.js';
if (isRender) {
tileVisible.raiseEvent(tile);
}
tile.update(tileset, frameState);
tile.update(tileset, frameState, passOptions);
statistics.incrementSelectionCounts(tile.content);
++statistics.selected;
}
for (i = 0; i < emptyLength; ++i) {
tile = emptyTiles[i];
tile.update(tileset, frameState);
tile.update(tileset, frameState, passOptions);
}

var addedCommandsLength = commandList.length - lengthBeforeUpdate;
Expand Down Expand Up @@ -2202,7 +2203,7 @@ import TileOrientedBoundingBox from './TileOrientedBoundingBox.js';
requestTiles(tileset);
}

updateTiles(tileset, frameState, isRender);
updateTiles(tileset, frameState, passOptions);

// Update pass statistics
Cesium3DTilesetStatistics.clone(statistics, passStatistics);
Expand Down
14 changes: 9 additions & 5 deletions Specs/Scene/Batched3DModel3DTileContentSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { HeadingPitchRoll } from '../../Source/Cesium.js';
import { Matrix4 } from '../../Source/Cesium.js';
import { Transforms } from '../../Source/Cesium.js';
import { Batched3DModel3DTileContent } from '../../Source/Cesium.js';
import { Cesium3DTilePass } from '../../Source/Cesium.js';
import { ClippingPlane } from '../../Source/Cesium.js';
import { ClippingPlaneCollection } from '../../Source/Cesium.js';
import { Model } from '../../Source/Cesium.js';
Expand Down Expand Up @@ -261,6 +262,7 @@ describe('Scene/Batched3DModel3DTileContent', function() {
var tile = tileset.root;
var content = tile.content;
var model = content._model;
var passOptions = Cesium3DTilePass.getPassOptions(Cesium3DTilePass.RENDER);

expect(model.clippingPlanes).toBeUndefined();

Expand All @@ -271,13 +273,13 @@ describe('Scene/Batched3DModel3DTileContent', function() {
});
tileset.clippingPlanes = clippingPlaneCollection;
clippingPlaneCollection.update(scene.frameState);
tile.update(tileset, scene.frameState);
tile.update(tileset, scene.frameState, passOptions);

expect(model.clippingPlanes).toBeDefined();
expect(model.clippingPlanes).toBe(tileset.clippingPlanes);

tile._isClipped = false;
tile.update(tileset, scene.frameState);
tile.update(tileset, scene.frameState, passOptions);

expect(model.clippingPlanes).toBeUndefined();
});
Expand All @@ -287,6 +289,7 @@ describe('Scene/Batched3DModel3DTileContent', function() {
return Cesium3DTilesTester.loadTileset(scene, withBatchTableUrl).then(function(tileset) {
var tile = tileset.root;
var model = tile.content._model;
var passOptions = Cesium3DTilePass.getPassOptions(Cesium3DTilePass.RENDER);

expect(model.clippingPlanes).toBeUndefined();

Expand All @@ -297,7 +300,7 @@ describe('Scene/Batched3DModel3DTileContent', function() {
});
tileset.clippingPlanes = clippingPlaneCollection;
clippingPlaneCollection.update(scene.frameState);
tile.update(tileset, scene.frameState);
tile.update(tileset, scene.frameState, passOptions);

expect(model.clippingPlanes).toBeDefined();
expect(model.clippingPlanes).toBe(tileset.clippingPlanes);
Expand All @@ -311,7 +314,7 @@ describe('Scene/Batched3DModel3DTileContent', function() {
newClippingPlaneCollection.update(scene.frameState);
expect(model.clippingPlanes).not.toBe(tileset.clippingPlanes);

tile.update(tileset, scene.frameState);
tile.update(tileset, scene.frameState, passOptions);
expect(model.clippingPlanes).toBe(tileset.clippingPlanes);
});
});
Expand All @@ -321,6 +324,7 @@ describe('Scene/Batched3DModel3DTileContent', function() {

return Cesium3DTilesTester.loadTileset(scene, withBatchTableUrl).then(function(tileset) {
var tile = tileset.root;
var passOptions = Cesium3DTilePass.getPassOptions(Cesium3DTilePass.RENDER);

var clippingPlaneCollection = new ClippingPlaneCollection({
planes : [
Expand All @@ -329,7 +333,7 @@ describe('Scene/Batched3DModel3DTileContent', function() {
});
tileset.clippingPlanes = clippingPlaneCollection;
clippingPlaneCollection.update(scene.frameState);
tile.update(tileset, scene.frameState);
tile.update(tileset, scene.frameState, passOptions);

expect(Model._getClippingFunction.calls.count()).toEqual(1);
});
Expand Down
13 changes: 9 additions & 4 deletions Specs/Scene/Cesium3DTileSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { Matrix4 } from '../../Source/Cesium.js';
import { Rectangle } from '../../Source/Cesium.js';
import { Transforms } from '../../Source/Cesium.js';
import { Cesium3DTile } from '../../Source/Cesium.js';
import { Cesium3DTilePass } from '../../Source/Cesium.js';
import { Cesium3DTileRefine } from '../../Source/Cesium.js';
import { Cesium3DTilesetHeatmap } from '../../Source/Cesium.js';
import { TileBoundingRegion } from '../../Source/Cesium.js';
Expand Down Expand Up @@ -347,25 +348,29 @@ describe('Scene/Cesium3DTile', function() {

it('can be a bounding region', function() {
var tile = new Cesium3DTile(mockTileset, '/some_url', tileWithBoundingRegion, undefined);
tile.update(mockTileset, scene.frameState);
var passOptions = Cesium3DTilePass.getPassOptions(Cesium3DTilePass.RENDER);
tile.update(mockTileset, scene.frameState, passOptions);
expect(tile._debugBoundingVolume).toBeDefined();
});

it('can be an oriented bounding box', function() {
var tile = new Cesium3DTile(mockTileset, '/some_url', tileWithBoundingBox, undefined);
tile.update(mockTileset, scene.frameState);
var passOptions = Cesium3DTilePass.getPassOptions(Cesium3DTilePass.RENDER);
tile.update(mockTileset, scene.frameState, passOptions);
expect(tile._debugBoundingVolume).toBeDefined();
});

it('can be a bounding sphere', function() {
var tile = new Cesium3DTile(mockTileset, '/some_url', tileWithBoundingSphere, undefined);
tile.update(mockTileset, scene.frameState);
var passOptions = Cesium3DTilePass.getPassOptions(Cesium3DTilePass.RENDER);
tile.update(mockTileset, scene.frameState, passOptions);
expect(tile._debugBoundingVolume).toBeDefined();
});

it('creates debug bounding volume for viewer request volume', function() {
var tile = new Cesium3DTile(mockTileset, '/some_url', tileWithViewerRequestVolume, undefined);
tile.update(mockTileset, scene.frameState);
var passOptions = Cesium3DTilePass.getPassOptions(Cesium3DTilePass.RENDER);
tile.update(mockTileset, scene.frameState, passOptions);
expect(tile._debugViewerRequestVolume).toBeDefined();
});
});
Expand Down
14 changes: 9 additions & 5 deletions Specs/Scene/Instanced3DModel3DTileContentSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Color } from '../../Source/Cesium.js';
import { HeadingPitchRange } from '../../Source/Cesium.js';
import { HeadingPitchRoll } from '../../Source/Cesium.js';
import { Transforms } from '../../Source/Cesium.js';
import { Cesium3DTilePass } from '../../Source/Cesium.js';
import { ClippingPlane } from '../../Source/Cesium.js';
import { ClippingPlaneCollection } from '../../Source/Cesium.js';
import { Model } from '../../Source/Cesium.js';
Expand Down Expand Up @@ -285,6 +286,7 @@ describe('Scene/Instanced3DModel3DTileContent', function() {
var tile = tileset.root;
var content = tile.content;
var model = content._modelInstanceCollection._model;
var passOptions = Cesium3DTilePass.getPassOptions(Cesium3DTilePass.RENDER);

expect(model.clippingPlanes).toBeUndefined();

Expand All @@ -295,13 +297,13 @@ describe('Scene/Instanced3DModel3DTileContent', function() {
});
tileset.clippingPlanes = clippingPlaneCollection;
clippingPlaneCollection.update(scene.frameState);
tile.update(tileset, scene.frameState);
tile.update(tileset, scene.frameState, passOptions);

expect(model.clippingPlanes).toBeDefined();
expect(model.clippingPlanes).toBe(tileset.clippingPlanes);

tile._isClipped = false;
tile.update(tileset, scene.frameState);
tile.update(tileset, scene.frameState, passOptions);

expect(model.clippingPlanes).toBeUndefined();
});
Expand All @@ -311,6 +313,7 @@ describe('Scene/Instanced3DModel3DTileContent', function() {
return Cesium3DTilesTester.loadTileset(scene, withBatchTableUrl).then(function(tileset) {
var tile = tileset.root;
var model = tile.content._modelInstanceCollection._model;
var passOptions = Cesium3DTilePass.getPassOptions(Cesium3DTilePass.RENDER);

expect(model.clippingPlanes).toBeUndefined();

Expand All @@ -321,7 +324,7 @@ describe('Scene/Instanced3DModel3DTileContent', function() {
});
tileset.clippingPlanes = clippingPlaneCollection;
clippingPlaneCollection.update(scene.frameState);
tile.update(tileset, scene.frameState);
tile.update(tileset, scene.frameState, passOptions);

expect(model.clippingPlanes).toBeDefined();
expect(model.clippingPlanes).toBe(tileset.clippingPlanes);
Expand All @@ -335,7 +338,7 @@ describe('Scene/Instanced3DModel3DTileContent', function() {
newClippingPlaneCollection.update(scene.frameState);
expect(model.clippingPlanes).not.toBe(tileset.clippingPlanes);

tile.update(tileset, scene.frameState);
tile.update(tileset, scene.frameState, passOptions);
expect(model.clippingPlanes).toBe(tileset.clippingPlanes);
});
});
Expand All @@ -351,10 +354,11 @@ describe('Scene/Instanced3DModel3DTileContent', function() {
new ClippingPlane(Cartesian3.UNIT_X, 0.0)
]
});
var passOptions = Cesium3DTilePass.getPassOptions(Cesium3DTilePass.RENDER);
tileset.clippingPlanes = clippingPlaneCollection;
clippingPlaneCollection.update(scene.frameState);
content.clippingPlanesDirty = true;
tile.update(tileset, scene.frameState);
tile.update(tileset, scene.frameState, passOptions);

expect(Model._getClippingFunction.calls.count()).toEqual(1);
});
Expand Down
8 changes: 5 additions & 3 deletions Specs/Scene/PointCloud3DTileContentSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { Math as CesiumMath } from '../../Source/Cesium.js';
import { PerspectiveFrustum } from '../../Source/Cesium.js';
import { Transforms } from '../../Source/Cesium.js';
import { Pass } from '../../Source/Cesium.js';
import { Cesium3DTilePass } from '../../Source/Cesium.js';
import { Cesium3DTileRefine } from '../../Source/Cesium.js';
import { Cesium3DTileStyle } from '../../Source/Cesium.js';
import { ClippingPlane } from '../../Source/Cesium.js';
Expand Down Expand Up @@ -864,6 +865,7 @@ describe('Scene/PointCloud3DTileContent', function() {
var tile = tileset.root;
tile._isClipped = true;
var content = tile.content;
var passOptions = Cesium3DTilePass.getPassOptions(Cesium3DTilePass.RENDER);

var noClipFS = content._pointCloud._drawCommand.shaderProgram._fragmentShaderText;
expect(noClipFS.indexOf('clip') !== -1).toBe(false);
Expand All @@ -877,15 +879,15 @@ describe('Scene/PointCloud3DTileContent', function() {
tileset.clippingPlanes = clippingPlanes;

clippingPlanes.update(scene.frameState);
tile.update(tileset, scene.frameState);
tile.update(tileset, scene.frameState, passOptions);
var clipOneIntersectFS = content._pointCloud._drawCommand.shaderProgram._fragmentShaderText;
expect(clipOneIntersectFS.indexOf('= clip(') !== -1).toBe(true);
expect(clipOneIntersectFS.indexOf('float clip') !== -1).toBe(true);

clippingPlanes.unionClippingRegions = true;

clippingPlanes.update(scene.frameState);
tile.update(tileset, scene.frameState);
tile.update(tileset, scene.frameState, passOptions);
var clipOneUnionFS = content._pointCloud._drawCommand.shaderProgram._fragmentShaderText;
expect(clipOneUnionFS.indexOf('= clip(') !== -1).toBe(true);
expect(clipOneUnionFS.indexOf('float clip') !== -1).toBe(true);
Expand All @@ -894,7 +896,7 @@ describe('Scene/PointCloud3DTileContent', function() {
clippingPlanes.add(new ClippingPlane(Cartesian3.UNIT_Y, 1.0));

clippingPlanes.update(scene.frameState);
tile.update(tileset, scene.frameState);
tile.update(tileset, scene.frameState, passOptions);
var clipTwoUnionFS = content._pointCloud._drawCommand.shaderProgram._fragmentShaderText;
expect(clipTwoUnionFS.indexOf('= clip(') !== -1).toBe(true);
expect(clipTwoUnionFS.indexOf('float clip') !== -1).toBe(true);
Expand Down