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

Update gltf-pipeline and fix model test #7206

Merged
merged 5 commits into from
Nov 1, 2018
Merged

Update gltf-pipeline and fix model test #7206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c6a5bd0
Upgrade gltf-pipeline and fix test
lilleyse Oct 30, 2018
deecce6
Update CHANGES.md
lilleyse Oct 30, 2018
b079fb6
Merge branch 'master' into fix-model-test
lilleyse Oct 30, 2018
ec4bc66
Merge branch 'master' into fix-model-test
Nov 1, 2018
586a20a
Fix
lilleyse Nov 1, 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
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 @@ -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)
* Fixed clipping plane crash when adding a plane to an empty collection. [#7168](https://github.com/AnalyticalGraphicsInc/cesium/pull/7168)
* Fixed texture coordinate calculation for polygon entities with `perPositionHeight` [#7188](https://github.com/AnalyticalGraphicsInc/cesium/pull/7188)
* Fixed clipping planes on tilesets not taking into account the tileset model matrix. [#7182](https://github.com/AnalyticalGraphicsInc/cesium/pull/7182)
Expand Down
3 changes: 2 additions & 1 deletion Source/ThirdParty/GltfPipeline/updateVersion.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion Specs/Scene/ModelSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down