From 7fd9d178a5f858a9e4a86e711d0b03d486026eea Mon Sep 17 00:00:00 2001 From: Ed Mackey Date: Mon, 26 Mar 2018 16:54:38 -0400 Subject: [PATCH 1/2] glTF BLEND mode didn't respect double-sided flag. --- .../ThirdParty/GltfPipeline/processPbrMetallicRoughness.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Source/ThirdParty/GltfPipeline/processPbrMetallicRoughness.js b/Source/ThirdParty/GltfPipeline/processPbrMetallicRoughness.js index ab84f9ae568e..c73a9360deeb 100644 --- a/Source/ThirdParty/GltfPipeline/processPbrMetallicRoughness.js +++ b/Source/ThirdParty/GltfPipeline/processPbrMetallicRoughness.js @@ -618,7 +618,11 @@ define([ var techniqueStates; if (defined(alphaMode) && alphaMode !== 'OPAQUE') { techniqueStates = { - enable: [ + enable: parameterValues.doubleSided ? [ + WebGLConstants.DEPTH_TEST, + WebGLConstants.BLEND + ]: [ + WebGLConstants.CULL_FACE, WebGLConstants.DEPTH_TEST, WebGLConstants.BLEND ], From 81b2eb6986e65b58e0b7e913cdcbc6fb8822ac1d Mon Sep 17 00:00:00 2001 From: Ed Mackey Date: Mon, 26 Mar 2018 17:07:26 -0400 Subject: [PATCH 2/2] CHANGES.md --- CHANGES.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 31430957a8e0..50ef1334feaa 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -30,7 +30,7 @@ Change Log * `Credit` has been modified to take an HTML string as the credit content [#6331](https://github.com/AnalyticalGraphicsInc/cesium/pull/6331) * Added support for ordering in `DataSourceCollection` [#6316](https://github.com/AnalyticalGraphicsInc/cesium/pull/6316) * All ground geometry from one `DataSource` will render in front of all ground geometry from another `DataSource` in the same collection with a lower index. - * Use `DataSourceCollection.raise`, `DataSourceCollection.lower`, `DataSourceCollection.raiseToTop` and `DataSourceCollection.lowerToBottom` functions to change the ordering of a `DataSource` in the collection. + * Use `DataSourceCollection.raise`, `DataSourceCollection.lower`, `DataSourceCollection.raiseToTop` and `DataSourceCollection.lowerToBottom` functions to change the ordering of a `DataSource` in the collection. ##### Fixes :wrench: * Fixed support of glTF-supplied tangent vectors. [#6302](https://github.com/AnalyticalGraphicsInc/cesium/pull/6302) @@ -40,6 +40,7 @@ Change Log * Fixed default value of `alphaCutoff` in glTF models. [#6346](https://github.com/AnalyticalGraphicsInc/cesium/pull/6346) * Fixed rendering vector tiles when using `invertClassification`. [#6349](https://github.com/AnalyticalGraphicsInc/cesium/pull/6349) * Fixed animation for glTF models with missing animation targets. [#6351](https://github.com/AnalyticalGraphicsInc/cesium/pull/6351) +* Fixed double-sided flag for glTF materials with `BLEND` enabled. [#6371](https://github.com/AnalyticalGraphicsInc/cesium/pull/6371) ### 1.43 - 2018-03-01