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 crash due to undefined clipping planes texture #6576

Merged
merged 7 commits into from
May 25, 2018
Merged

fix crash due to undefined clipping planes texture #6576

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eda6e52
fix crash due to undefined clipping planes texture
likangning93 May 8, 2018
7f45898
fix uint8 clipping plane partial update bug, add spec
likangning93 May 9, 2018
e207da8
merge and update CHANGES.md
likangning93 May 9, 2018
51bc9c3
Merge branch 'master' into fixClippingPlaneCrash
lilleyse May 11, 2018
f2e3fc4
add check in Model-based 3D Tiles for tileset clipping planes reassig…
likangning93 May 23, 2018
82bfff7
reference check for clipping planes on b3dm and i3dm tiles instead of…
likangning93 May 25, 2018
4305545
comment fix
likangning93 May 25, 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
4 changes: 2 additions & 2 deletions Source/Scene/Batched3DModel3DTileContent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,9 +513,9 @@ define([
this._model._clippingPlanes = (tilesetClippingPlanes.enabled && this._tile._isClipped) ? tilesetClippingPlanes : undefined;
}

// If the model references a destroyed ClippingPlaneCollection due to the tileset's collection being replaced with a
// If the model references a different ClippingPlaneCollection due to the tileset's collection being replaced with a
// ClippingPlaneCollection that gives this tile the same clipping status, update the model to use the new ClippingPlaneCollection.
if (defined(tilesetClippingPlanes) && defined(this._model._clippingPlanes) && this._model._clippingPlanes.isDestroyed()) {
if (defined(tilesetClippingPlanes) && defined(this._model._clippingPlanes) && this._model._clippingPlanes !== tilesetClippingPlanes) {
this._model._clippingPlanes = tilesetClippingPlanes;
}

Expand Down
2 changes: 1 addition & 1 deletion Source/Scene/Instanced3DModel3DTileContent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ define([

// If the model references a destroyed ClippingPlaneCollection due to the tileset's collection being replaced with a
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix comment here as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whoops

// ClippingPlaneCollection that gives this tile the same clipping status, update the model to use the new ClippingPlaneCollection.
if (defined(tilesetClippingPlanes) && defined(model._clippingPlanes) && model._clippingPlanes.isDestroyed()) {
if (defined(tilesetClippingPlanes) && defined(model._clippingPlanes) && model._clippingPlanes !== tilesetClippingPlanes) {
model._clippingPlanes = tilesetClippingPlanes;
}
}
Expand Down