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 for binary glTFs storing CRN and KTX textures #5753

Merged
merged 3 commits into from
Aug 21, 2017
Merged

Conversation

lilleyse
Copy link
Contributor

Bug report and fix from the forum, with some modifications: https://groups.google.com/forum/#!topic/cesium-dev/02M8ho6hONo.

@cesium-concierge
Copy link

@lilleyse thanks for the pull request!

I noticed that a file in ThirdParty/ or Source/ThirdParty/ has been added or modified. Please verify that it has a section in LICENSE.md and that its license information is up to date with this new version. Once you do, please confirm by commenting on this pull request.

I am a bot who helps you make Cesium awesome! Thanks again.

@pjcozzi
Copy link
Contributor

pjcozzi commented Aug 15, 2017

Does this need new unit tests?

@lilleyse
Copy link
Contributor Author

Improved the tests a bit. They were able to pass before because the default texture was being used.

@pjcozzi
Copy link
Contributor

pjcozzi commented Aug 20, 2017

Are these CI failures related?

  Core/sampleTerrain
    ✗ queries heights from Small Terrain
	Expected undefined to be greater than 5000.
	    at Specs/Core/sampleTerrainSpec.js:42:41
	    at Promise.then (Source/ThirdParty/when.js:196:34)
	    at Source/ThirdParty/when.js:297:13
	    at processQueue (Source/ThirdParty/when.js:647:4)
	    at _resolve (Source/ThirdParty/when.js:333:4)
	Expected undefined to be less than 10000.
	    at Specs/Core/sampleTerrainSpec.js:43:41
	    at Promise.then (Source/ThirdParty/when.js:196:34)
	    at Source/ThirdParty/when.js:297:13
	    at processQueue (Source/ThirdParty/when.js:647:4)
	    at _resolve (Source/ThirdParty/when.js:333:4)
	Expected undefined to be greater than 5000.
	    at Specs/Core/sampleTerrainSpec.js:44:41
	    at Promise.then (Source/ThirdParty/when.js:196:34)
	    at Source/ThirdParty/when.js:297:13
	    at processQueue (Source/ThirdParty/when.js:647:4)
	    at _resolve (Source/ThirdParty/when.js:333:4)
	Expected undefined to be less than 10000.
	    at Specs/Core/sampleTerrainSpec.js:45:41
	    at Promise.then (Source/ThirdParty/when.js:196:34)
	    at Source/ThirdParty/when.js:297:13
	    at processQueue (Source/ThirdParty/when.js:647:4)
	    at _resolve (Source/ThirdParty/when.js:333:4)

https://travis-ci.org/AnalyticalGraphicsInc/cesium/builds/266571774?utm_source=github_status&utm_medium=notification

@lilleyse
Copy link
Contributor Author

It also fails on master locally, so not related.

@cesium-concierge
Copy link

Congratulations on closing the issue! I found these Cesium forum links in the comments above:

If this issue affects any of these threads, please post a comment like the following:

The issue at #5753 has just been closed and may resolve your issue. Look for the change in the next stable release of Cesium!
Or get it now in the master branch on GitHub https://github.com/AnalyticalGraphicsInc/cesium

I am a bot who helps development running smoothly! Have a great day.

@pjcozzi pjcozzi merged commit 675840f into master Aug 21, 2017
@pjcozzi pjcozzi deleted the crn-ktx-fix branch August 21, 2017 00:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants