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

Jump to bottom

Editor: Refactor creation of GLTFLoader. #27193

Merged
merged 1 commit into from Nov 16, 2023
Merged

Editor: Refactor creation of GLTFLoader. #27193

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
107 changes: 36 additions & 71 deletions editor/js/Loader.js
View file
Open in desktop
Expand Up @@ -269,23 +269,8 @@ function Loader( editor ) {

const contents = event.target.result;

const { GLTFLoader } = await import( 'three/addons/loaders/GLTFLoader.js' );
const { DRACOLoader } = await import( 'three/addons/loaders/DRACOLoader.js' );
const { KTX2Loader } = await import( 'three/addons/loaders/KTX2Loader.js' );
const { MeshoptDecoder } = await import( 'three/addons/libs/meshopt_decoder.module.js' );

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

const ktx2Loader = new KTX2Loader();
ktx2Loader.setTranscoderPath( '../examples/jsm/libs/basis/' );

editor.signals.rendererDetectKTX2Support.dispatch( ktx2Loader );
const loader = await createGLTFLoader();

const loader = new GLTFLoader();
loader.setDRACOLoader( dracoLoader );
loader.setKTX2Loader( ktx2Loader );
loader.setMeshoptDecoder( MeshoptDecoder );
loader.parse( contents, '', function ( result ) {

const scene = result.scene;
Expand All @@ -294,7 +279,8 @@ function Loader( editor ) {
scene.animations.push( ...result.animations );
editor.execute( new AddObjectCommand( editor, scene ) );

dracoLoader.dispose();
loader.dracoLoader.dispose();
loader.ktx2Loader.dispose();

} );

Expand All @@ -313,23 +299,7 @@ function Loader( editor ) {

const contents = event.target.result;

const { DRACOLoader } = await import( 'three/addons/loaders/DRACOLoader.js' );
const { GLTFLoader } = await import( 'three/addons/loaders/GLTFLoader.js' );
const { KTX2Loader } = await import( 'three/addons/loaders/KTX2Loader.js' );
const { MeshoptDecoder } = await import( 'three/addons/libs/meshopt_decoder.module.js' );

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

const ktx2Loader = new KTX2Loader();
ktx2Loader.setTranscoderPath( '../examples/jsm/libs/basis/' );

editor.signals.rendererDetectKTX2Support.dispatch( ktx2Loader );

const loader = new GLTFLoader( manager );
loader.setDRACOLoader( dracoLoader );
loader.setKTX2Loader( ktx2Loader );
loader.setMeshoptDecoder( MeshoptDecoder );
const loader = await createGLTFLoader();

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

Expand All @@ -339,7 +309,8 @@ function Loader( editor ) {
scene.animations.push( ...result.animations );
editor.execute( new AddObjectCommand( editor, scene ) );

dracoLoader.dispose();
loader.dracoLoader.dispose();
loader.ktx2Loader.dispose();

} );

Expand Down Expand Up @@ -970,23 +941,7 @@ function Loader( editor ) {

{

const { GLTFLoader } = await import( 'three/addons/loaders/GLTFLoader.js' );
const { DRACOLoader } = await import( 'three/addons/loaders/DRACOLoader.js' );
const { KTX2Loader } = await import( 'three/addons/loaders/KTX2Loader.js' );
const { MeshoptDecoder } = await import( 'three/addons/libs/meshopt_decoder.module.js' );

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

const ktx2Loader = new KTX2Loader();
ktx2Loader.setTranscoderPath( '../examples/jsm/libs/basis/' );

editor.signals.rendererDetectKTX2Support.dispatch( ktx2Loader );

const loader = new GLTFLoader();
loader.setDRACOLoader( dracoLoader );
loader.setKTX2Loader( ktx2Loader );
loader.setMeshoptDecoder( MeshoptDecoder );
const loader = await createGLTFLoader();

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

Expand All @@ -995,7 +950,8 @@ function Loader( editor ) {
scene.animations.push( ...result.animations );
editor.execute( new AddObjectCommand( editor, scene ) );

dracoLoader.dispose();
loader.dracoLoader.dispose();
loader.ktx2Loader.dispose();

} );

Expand All @@ -1007,23 +963,7 @@ function Loader( editor ) {

{

const { GLTFLoader } = await import( 'three/addons/loaders/GLTFLoader.js' );
const { DRACOLoader } = await import( 'three/addons/loaders/DRACOLoader.js' );
const { KTX2Loader } = await import( 'three/addons/loaders/KTX2Loader.js' );
const { MeshoptDecoder } = await import( 'three/addons/libs/meshopt_decoder.module.js' );

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

const ktx2Loader = new KTX2Loader();
ktx2Loader.setTranscoderPath( '../examples/jsm/libs/basis/' );

editor.signals.rendererDetectKTX2Support.dispatch( ktx2Loader );

const loader = new GLTFLoader();
loader.setDRACOLoader( dracoLoader );
loader.setKTX2Loader( ktx2Loader );
loader.setMeshoptDecoder( MeshoptDecoder );
const loader = await createGLTFLoader();

loader.parse( strFromU8( file ), '', function ( result ) {

Expand All @@ -1032,7 +972,8 @@ function Loader( editor ) {
scene.animations.push( ...result.animations );
editor.execute( new AddObjectCommand( editor, scene ) );

dracoLoader.dispose();
loader.dracoLoader.dispose();
loader.ktx2Loader.dispose();

} );

Expand All @@ -1046,6 +987,30 @@ function Loader( editor ) {

}

async function createGLTFLoader() {

const { GLTFLoader } = await import( 'three/addons/loaders/GLTFLoader.js' );
const { DRACOLoader } = await import( 'three/addons/loaders/DRACOLoader.js' );
const { KTX2Loader } = await import( 'three/addons/loaders/KTX2Loader.js' );
const { MeshoptDecoder } = await import( 'three/addons/libs/meshopt_decoder.module.js' );

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

const ktx2Loader = new KTX2Loader();
ktx2Loader.setTranscoderPath( '../examples/jsm/libs/basis/' );

editor.signals.rendererDetectKTX2Support.dispatch( ktx2Loader );

const loader = new GLTFLoader();
loader.setDRACOLoader( dracoLoader );
loader.setKTX2Loader( ktx2Loader );
loader.setMeshoptDecoder( MeshoptDecoder );

return loader;

}

}

export { Loader };