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

Fix point cloud crash in IE #6051

Merged
merged 3 commits into from
Dec 14, 2017
Merged

Fix point cloud crash in IE #6051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4369f25
Fix point cloud crash in IE
lilleyse Dec 14, 2017
8f624fd
Edit CHANGES.md
lilleyse Dec 14, 2017
6fc6b4a
Fix
lilleyse Dec 14, 2017
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 @@ -9,6 +9,7 @@ Change Log
* Added `Plane.transformPlane` function to apply a transformation to a plane. [#5966](https://github.com/AnalyticalGraphicsInc/cesium/pull/5966)
* Added `PlaneGeometry`, `PlaneOutlineGeometry`, `PlaneGeometryUpdater`, and `PlaneOutlineGeometryUpdater` classes to render plane primitives. [#5996](https://github.com/AnalyticalGraphicsInc/cesium/pull/5996)
* Added `PlaneGraphics` class and `plane` property to `Entity`. [#5996](https://github.com/AnalyticalGraphicsInc/cesium/pull/5996)
* Fixed point cloud crash in IE [#6051](https://github.com/AnalyticalGraphicsInc/cesium/pull/6051)

### 1.40 - 2017-12-01

Expand Down
11 changes: 8 additions & 3 deletions Source/Scene/Cesium3DTileBatchTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,9 +858,12 @@ define([

if (ContextLimits.maximumVertexTextureImageUnits > 0) {
// When VTF is supported, perform per-feature show/hide in the vertex shader
newMain =
newMain = '';
if (handleTranslucent) {
newMain += 'uniform bool tile_translucentCommand; \n';
}
newMain +=
'uniform sampler2D tile_batchTexture; \n' +
'uniform bool tile_translucentCommand; \n' +
'varying vec4 tile_featureColor; \n' +
'void main() \n' +
'{ \n' +
Expand Down Expand Up @@ -1005,9 +1008,11 @@ define([
' tile_color(tile_featureColor); \n' +
'}';
} else {
if (handleTranslucent) {
source += 'uniform bool tile_translucentCommand; \n';
}
source +=
'uniform sampler2D tile_batchTexture; \n' +
'uniform bool tile_translucentCommand; \n' +
'varying vec2 tile_featureSt; \n' +
'void main() \n' +
'{ \n' +
Expand Down