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 classification 3D Tiles in Edge #6295

Merged
merged 2 commits into from
Mar 1, 2018
Merged
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
2 changes: 1 addition & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ Change Log
* Fixed `Material` so it can now take a `Resource` object as an image. [#6199](https://github.com/AnalyticalGraphicsInc/cesium/issues/6199)
* Fixed an issue causing the Bing Maps key to be sent unnecessarily with every tile request. [#6250](https://github.com/AnalyticalGraphicsInc/cesium/pull/6250)
* Fixed documentation issue for the `Cesium.Math` class. [#6233](https://github.com/AnalyticalGraphicsInc/cesium/issues/6233)
* Fix Firefox WebGL console warnings. [#5912](https://github.com/AnalyticalGraphicsInc/cesium/issues/5912)
* Fixed rendering 3D Tiles as classification volumes. [#6295](https://github.com/AnalyticalGraphicsInc/cesium/pull/6295)

### 1.42.1 - 2018-02-01
_This is an npm-only release to fix an issue with using Cesium in Node.js.__
2 changes: 2 additions & 0 deletions Source/Scene/Cesium3DTileBatchTable.js
Original file line number Diff line number Diff line change
@@ -1093,6 +1093,7 @@ define([
'varying vec4 tile_featureColor; \n' +
'void main() \n' +
'{ \n' +
' tile_main(); \n' +
' gl_FragColor = tile_featureColor; \n' +
'}';
} else {
@@ -1101,6 +1102,7 @@ define([
'varying vec2 tile_featureSt; \n' +
'void main() \n' +
'{ \n' +
' tile_main(); \n' +
' vec4 featureProperties = texture2D(tile_batchTexture, tile_featureSt); \n' +
' if (featureProperties.a == 0.0) { \n' + // show: alpha == 0 - false, non-zeo - true
' discard; \n' +