From c6a5bd09c2481b53f320a0c99f97fe7912562790 Mon Sep 17 00:00:00 2001 From: Sean Lilley Date: Tue, 30 Oct 2018 13:39:12 -0400 Subject: [PATCH 1/3] Upgrade gltf-pipeline and fix test --- Source/ThirdParty/GltfPipeline/updateVersion.js | 3 ++- Specs/Scene/ModelSpec.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/ThirdParty/GltfPipeline/updateVersion.js b/Source/ThirdParty/GltfPipeline/updateVersion.js index 3ed61799ae6..f1656c1053e 100644 --- a/Source/ThirdParty/GltfPipeline/updateVersion.js +++ b/Source/ThirdParty/GltfPipeline/updateVersion.js @@ -853,7 +853,8 @@ define([ (!defined(node.translation) || Cartesian3.fromArray(node.translation).equals(Cartesian3.ZERO)) && (!defined(node.scale) || Cartesian3.fromArray(node.scale).equals(new Cartesian3(1.0, 1.0, 1.0))) && (!defined(node.rotation) || Cartesian4.fromArray(node.rotation).equals(new Cartesian4(0.0, 0.0, 0.0, 1.0))) && - (!defined(node.matrix) || Matrix4.fromColumnMajorArray(node.matrix).equals(Matrix4.IDENTITY)); + (!defined(node.matrix) || Matrix4.fromColumnMajorArray(node.matrix).equals(Matrix4.IDENTITY)) && + !defined(node.extensions && !defined(node.extras)); } function deleteNode(gltf, nodeId) { diff --git a/Specs/Scene/ModelSpec.js b/Specs/Scene/ModelSpec.js index 150accc2e06..f441a1a05d0 100644 --- a/Specs/Scene/ModelSpec.js +++ b/Specs/Scene/ModelSpec.js @@ -2080,7 +2080,7 @@ defineSuite([ expect(scene).toRender([0, 0, 0, 255]); m.show = true; m.zoomTo(); - expect(scene).toRender([51, 51, 51, 255]); // Cesium has minimum lighting + expect(scene).toRender([0, 0, 0, 255]); m.show = false; primitives.remove(m); From deecce6afe938046eb1e6cccb727ee160224a181 Mon Sep 17 00:00:00 2001 From: Sean Lilley Date: Tue, 30 Oct 2018 13:49:26 -0400 Subject: [PATCH 2/3] Update CHANGES.md --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 7b32c1ef2be..51106841341 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -22,6 +22,7 @@ Change Log * Fixed a crash when using `BingMapsGeocoderService` [#7143](https://github.com/AnalyticalGraphicsInc/cesium/issues/7143) * Fixed entity visibility issue related to setting an entity show property and altering or adding entity geometry [#7156](https://github.com/AnalyticalGraphicsInc/cesium/pull/7156) * Fixed accuracy of rotation matrix generated by `VelocityOrientationProperty` [#6641](https://github.com/AnalyticalGraphicsInc/cesium/pull/6641) +* Fixed incorrect rendering of models using the `KHR_materials_common` lights extension. [#7206](https://github.com/AnalyticalGraphicsInc/cesium/pull/7206) ### 1.50 - 2018-10-01 From 586a20ad42eea33b6556bfb8a05badd6b96f2083 Mon Sep 17 00:00:00 2001 From: Sean Lilley Date: Thu, 1 Nov 2018 14:44:19 -0400 Subject: [PATCH 3/3] Fix --- Source/ThirdParty/GltfPipeline/updateVersion.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/ThirdParty/GltfPipeline/updateVersion.js b/Source/ThirdParty/GltfPipeline/updateVersion.js index f1656c1053e..6b827b4dbdc 100644 --- a/Source/ThirdParty/GltfPipeline/updateVersion.js +++ b/Source/ThirdParty/GltfPipeline/updateVersion.js @@ -854,7 +854,7 @@ define([ (!defined(node.scale) || Cartesian3.fromArray(node.scale).equals(new Cartesian3(1.0, 1.0, 1.0))) && (!defined(node.rotation) || Cartesian4.fromArray(node.rotation).equals(new Cartesian4(0.0, 0.0, 0.0, 1.0))) && (!defined(node.matrix) || Matrix4.fromColumnMajorArray(node.matrix).equals(Matrix4.IDENTITY)) && - !defined(node.extensions && !defined(node.extras)); + !defined(node.extensions) && !defined(node.extras); } function deleteNode(gltf, nodeId) {