Skip to content

Commit 42f3f52

Browse files
authored
Editor: Always configure GLTFLoader with KTX2 and Meshopt. (mrdoob#26414)
1 parent 1775695 commit 42f3f52

File tree

1 file changed

+25
-3
lines changed

1 file changed

+25
-3
lines changed

editor/js/Loader.js

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,12 +307,19 @@ function Loader( editor ) {
307307

308308
const { DRACOLoader } = await import( 'three/addons/loaders/DRACOLoader.js' );
309309
const { GLTFLoader } = await import( 'three/addons/loaders/GLTFLoader.js' );
310+
const { KTX2Loader } = await import( 'three/addons/loaders/KTX2Loader.js' );
311+
const { MeshoptDecoder } = await import( 'three/addons/libs/meshopt_decoder.module.js' );
310312

311313
const dracoLoader = new DRACOLoader();
312314
dracoLoader.setDecoderPath( '../examples/jsm/libs/draco/gltf/' );
313315

316+
const ktx2Loader = new KTX2Loader();
317+
ktx2Loader.setTranscoderPath( '../examples/jsm/libs/basis/' );
318+
314319
const loader = new GLTFLoader( manager );
315320
loader.setDRACOLoader( dracoLoader );
321+
loader.setKTX2Loader( ktx2Loader );
322+
loader.setMeshoptDecoder( MeshoptDecoder );
316323

317324
loader.parse( contents, '', function ( result ) {
318325

@@ -953,14 +960,21 @@ function Loader( editor ) {
953960

954961
{
955962

956-
const { DRACOLoader } = await import( 'three/addons/loaders/DRACOLoader.js' );
957963
const { GLTFLoader } = await import( 'three/addons/loaders/GLTFLoader.js' );
964+
const { DRACOLoader } = await import( 'three/addons/loaders/DRACOLoader.js' );
965+
const { KTX2Loader } = await import( 'three/addons/loaders/KTX2Loader.js' );
966+
const { MeshoptDecoder } = await import( 'three/addons/libs/meshopt_decoder.module.js' );
958967

959968
const dracoLoader = new DRACOLoader();
960969
dracoLoader.setDecoderPath( '../examples/jsm/libs/draco/gltf/' );
961970

971+
const ktx2Loader = new KTX2Loader();
972+
ktx2Loader.setTranscoderPath( '../examples/jsm/libs/basis/' );
973+
962974
const loader = new GLTFLoader();
963975
loader.setDRACOLoader( dracoLoader );
976+
loader.setKTX2Loader( ktx2Loader );
977+
loader.setMeshoptDecoder( MeshoptDecoder );
964978

965979
loader.parse( file.buffer, '', function ( result ) {
966980

@@ -981,14 +995,22 @@ function Loader( editor ) {
981995

982996
{
983997

984-
const { DRACOLoader } = await import( 'three/addons/loaders/DRACOLoader.js' );
985998
const { GLTFLoader } = await import( 'three/addons/loaders/GLTFLoader.js' );
999+
const { DRACOLoader } = await import( 'three/addons/loaders/DRACOLoader.js' );
1000+
const { KTX2Loader } = await import( 'three/addons/loaders/KTX2Loader.js' );
1001+
const { MeshoptDecoder } = await import( 'three/addons/libs/meshopt_decoder.module.js' );
9861002

9871003
const dracoLoader = new DRACOLoader();
9881004
dracoLoader.setDecoderPath( '../examples/jsm/libs/draco/gltf/' );
9891005

990-
const loader = new GLTFLoader( manager );
1006+
const ktx2Loader = new KTX2Loader();
1007+
ktx2Loader.setTranscoderPath( '../examples/jsm/libs/basis/' );
1008+
1009+
const loader = new GLTFLoader();
9911010
loader.setDRACOLoader( dracoLoader );
1011+
loader.setKTX2Loader( ktx2Loader );
1012+
loader.setMeshoptDecoder( MeshoptDecoder );
1013+
9921014
loader.parse( strFromU8( file ), '', function ( result ) {
9931015

9941016
const scene = result.scene;

0 commit comments

Comments
 (0)