Skip to content

Add support for KTX2 texture compression to gltf-model #5101

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

Merged
merged 11 commits into from
Sep 13, 2022
Merged

Add support for KTX2 texture compression to gltf-model #5101

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d1d36c5
Initial commit, feature support for ktx2 textures in gltf-model
Aug 24, 2022
00dcf2b
Code cleanup
Aug 25, 2022
ce3b8d1
Doc cleanup
Aug 25, 2022
9fe77c4
Doc cleanup
Aug 25, 2022
ecc831a
Re-adding mysteriously wiped code for gltf-loader system
Aug 25, 2022
92acd93
WIP example
Aug 25, 2022
9fa1a24
KTX2 seem to be working, verifying...
Aug 25, 2022
02d533d
Style correction
Aug 25, 2022
f5304ae
Extending example
Aug 25, 2022
137c853
Correcting link to transcoder files
Aug 25, 2022
9df1d2c
basisTranscoderPath is the correct term, since it's the path to basis…
Sep 3, 2022
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
Prev Previous commit
Next Next commit
KTX2 seem to be working, verifying...
  • Loading branch information
James Kane committed Aug 25, 2022
commit 9fa1a246fe34679aa533c9db3151e89c6a0d39f3
4 changes: 2 additions & 2 deletions examples/test/model/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
<a-assets>
<a-asset-item id="crate-obj" src="../../assets/models/crate/crate.obj"></a-asset-item>
<a-asset-item id="crate-mtl" src="../../assets/models/crate/crate.mtl"></a-asset-item>
<a-asset-item id="brainstem" src="https://cdn.aframe.io/test-models/models/glTF-2.0/brainstem/BrainStem.gltf"></a-asset-item>
<a-asset-item id="brainstem" src="https://cdn.glitch.global/f43e6264-95fc-43e8-8049-dc53b985b1e3/grip-compressed.glb?v=1661368839319"></a-asset-item>
</a-assets>

<a-entity position="0 0 -12">
<a-entity gltf-model="#brainstem" position="-2 -1 5" scale="3 3 3"></a-entity>
<a-text value="glTF" color="#000000" position="-2 -2 6" scale="1.5 1.5 1.5"></a-text>
<a-text value="glTF w/ KTX2 texture" color="#000000" position="-2 -2 6" scale="1.5 1.5 1.5"></a-text>

<a-entity obj-model="obj: #crate-obj; mtl: #crate-mtl" position="5 0 5"></a-entity>
<a-entity obj-model="obj: #crate-obj; mtl: #crate-mtl" position="5 2 5"></a-entity>
Expand Down
5 changes: 3 additions & 2 deletions src/components/gltf-model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ module.exports.Component = registerComponent('gltf-model', {
this.ready = meshoptDecoder.then(function (meshoptDecoder) {
self.loader.setMeshoptDecoder(meshoptDecoder);
});
} if (ktxLoader) {
this.loader.setKTX2Loader(ktxLoader);
} else {
this.ready = Promise.resolve();
}
if (ktxLoader) {
this.loader.setKTX2Loader(ktxLoader);
}
},

update: function () {
Expand Down
1 change: 1 addition & 0 deletions src/lib/three.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ require('super-three/examples/js/loaders/OBJLoader'); // THREE.OBJLoader
require('super-three/examples/js/loaders/MTLLoader'); // THREE.MTLLoader
require('super-three/examples/js/utils/BufferGeometryUtils'); // THREE.BufferGeometryUtils
require('super-three/examples/js/lights/LightProbeGenerator'); // THREE.LightProbeGenerator
require('super-three/examples/js/utils/WorkerPool'); // WorkerPool used by KTX2Loader

THREE.DRACOLoader.prototype.crossOrigin = 'anonymous';
THREE.GLTFLoader.prototype.crossOrigin = 'anonymous';
Expand Down
2 changes: 1 addition & 1 deletion src/systems/gltf-model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ module.exports.System = registerSystem('gltf-model', {
}
if (!this.ktx2Loader && basisTranscoderPath) {
this.ktx2Loader = new THREE.KTX2Loader();
this.ktx2Loader.setTranscoderPath(basisTranscoderPath);
this.ktx2Loader.setTranscoderPath(basisTranscoderPath).detectSupport( this.el.renderer );
}
if (!this.meshoptDecoder && meshoptDecoderPath) {
this.meshoptDecoder = fetchScript(meshoptDecoderPath)
Expand Down