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

Texture compression #4758

Merged
merged 34 commits into from
Feb 2, 2017
Merged

Texture compression #4758

Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
4cc7559
Add support for s3tc, pvrtc, and etc1 compressed textures and loading…
bagnell Dec 1, 2016
cd3b02a
Move exported function to the top
pjcozzi Dec 20, 2016
797e43b
Style
pjcozzi Dec 20, 2016
a9fc4f9
Update CHANGES.md
pjcozzi Dec 20, 2016
0235cec
Merge branch 'master' into texture-compression
bagnell Dec 20, 2016
ca72704
Fix failing tests.
bagnell Dec 20, 2016
64dd9b4
Add ktx loading support to materials. Update Sandcastle and tests.
bagnell Dec 21, 2016
da6d1c6
Document type returned from loadKTX and doc unsupported features of t…
bagnell Dec 21, 2016
172cc21
Fix typo.
bagnell Dec 21, 2016
b1876d9
Add missing sampler when loading glTF with comressed texture.
bagnell Dec 21, 2016
1eef793
Merge branch 'master' into texture-compression
bagnell Jan 4, 2017
cb01073
Initial support for transcoding textures from crunch to DXT.
bagnell Jan 5, 2017
c67a2ca
Fix issue with binary glTF compressed textures.
bagnell Jan 5, 2017
bf97394
Merge branch 'texture-compression' into crunch
bagnell Jan 5, 2017
68082c2
Move transcoding CRN to DXT to a web worker.
bagnell Jan 5, 2017
5875390
Add support for embedded crunch textures in binary glTF. Update the doc.
bagnell Jan 5, 2017
ee6856c
Add crunch support to imagery provider and material. Add loadCRN test…
bagnell Jan 5, 2017
252bb8b
Add model tests with crunch compressed textures.
bagnell Jan 5, 2017
f6cf955
Updates from review.
bagnell Jan 9, 2017
73fc589
Update crunch.js and update licenses.
bagnell Jan 9, 2017
304d32a
Merge pull request #4814 from AnalyticalGraphicsInc/crunch
pjcozzi Jan 9, 2017
40f8bcd
Merge branch 'master' into texture-compression
bagnell Jan 26, 2017
ee85f5c
Update parsing glTF compressed textures.
bagnell Jan 26, 2017
d7d82d0
Add getCompressedTextureFormatSupported to Scene.
bagnell Jan 26, 2017
d1270e1
Merge branch 'master' into texture-compression
bagnell Jan 30, 2017
7b9c700
Update test models with compressed textures. Fix binary glTF.
bagnell Jan 30, 2017
3bd7004
Update texture specs after merge.
bagnell Jan 30, 2017
324200c
Fix loading multiple textures.
bagnell Jan 30, 2017
f6ee997
Update ETC1 test.
bagnell Jan 30, 2017
9574914
Fix failing CI tests.
bagnell Jan 30, 2017
4b713b9
Merge branch 'master' into texture-compression
bagnell Feb 1, 2017
697877c
Update CHANGES.md.
bagnell Feb 1, 2017
3938f7b
Merge branch 'master' into texture-compression
bagnell Feb 1, 2017
ffa2554
Tweak CHANGES.md
pjcozzi Feb 2, 2017
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
4 changes: 2 additions & 2 deletions Source/Scene/Model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1419,8 +1419,8 @@ define([
var gltfImage = images[textures[id].source];
var extras = gltfImage.extras;

var binary;
var uri;
var binary = undefined;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch!

var uri = undefined;

// First check for a compressed texture
if (defined(extras) && defined(extras.compressedImage3DTiles)) {
Expand Down