Ver código fonte

[loaders] - pr comments

Dave Buchhofer 3 anos atrás
pai
commit
fd2ac81de3

+ 0 - 6
src/base/B3DMLoaderBase.js

@@ -6,12 +6,6 @@ import { LoaderBase } from './LoaderBase.js';
 
 export class B3DMLoaderBase extends LoaderBase {
 
-	constructor() {
-
-		super();
-
-	}
-
 	parse( buffer ) {
 
 		// TODO: this should be able to take a uint8array with an offset and length

+ 0 - 6
src/base/CMPTLoaderBase.js

@@ -4,12 +4,6 @@ import { LoaderBase } from './LoaderBase.js';
 
 export class CMPTLoaderBase extends LoaderBase {
 
-	constructor() {
-
-		super();
-
-	}
-
 	parse( buffer ) {
 
 		const dataView = new DataView( buffer );

+ 0 - 6
src/base/I3DMLoaderBase.js

@@ -7,12 +7,6 @@ import { LoaderBase } from './LoaderBase.js';
 
 export class I3DMLoaderBase extends LoaderBase {
 
-	constructor() {
-
-		super();
-
-	}
-
 	parse( buffer ) {
 
 		const dataView = new DataView( buffer );

+ 2 - 0
src/base/LoaderBase.js

@@ -59,6 +59,8 @@ export class LoaderBase {
 
 	parse( buffer ) {
 
+		throw new Error( 'LoaderBase: Parse not implemented.' );
+
 	}
 
 }

+ 0 - 6
src/base/PNTSLoaderBase.js

@@ -6,12 +6,6 @@ import { LoaderBase } from './LoaderBase.js';
 
 export class PNTSLoaderBase extends LoaderBase {
 
-	constructor() {
-
-		super();
-
-	}
-
 	parse( buffer ) {
 
 		const dataView = new DataView( buffer );

+ 0 - 13
src/three/CMPTLoader.js

@@ -3,7 +3,6 @@ import { CMPTLoaderBase } from '../base/CMPTLoaderBase.js';
 import { B3DMLoader } from './B3DMLoader.js';
 import { PNTSLoader } from './PNTSLoader.js';
 import { I3DMLoader } from './I3DMLoader.js';
-import { GLTFExtensionLoader } from './GLTFExtensionLoader.js';
 
 export class CMPTLoader extends CMPTLoaderBase {
 
@@ -63,18 +62,6 @@ export class CMPTLoader extends CMPTLoaderBase {
 
 				}
 
-				// 3DTILES_content_gltf
-				case 'glb':
-				case 'gltf':
-					const slicedBuffer = buffer.slice();
-					const loader = new GLTFExtensionLoader( manager );
-					loader.workingPath = this.workingPath;
-					loader.fetchOptions = this.fetchOptions;
-
-					const promise = loader.parse( slicedBuffer.buffer );
-					promises.push( promise );
-					break;
-
 			}
 
 		}

+ 9 - 1
src/three/GLTFExtensionLoader.js

@@ -16,7 +16,15 @@ export class GLTFExtensionLoader extends LoaderBase {
 		return new Promise( ( resolve, reject ) => {
 
 			const manager = this.manager;
-			let loader = manager.getHandler( 'path.gltf' ) || manager.getHandler( 'path.glb' ) || new GLTFLoader( manager );
+			let loader = manager.getHandler( 'path.gltf' ) || manager.getHandler( 'path.glb' );
+
+			if ( ! loader ) {
+
+				loader = new GLTFLoader( manager );
+				loader.crossOrigin = this.crossOrigin;
+				loader.withCredentials = this.withCredentials;
+
+			}
 
 			// assume any pre-registered loader has paths configured as the user desires, but if we're making
 			// a new loader, use the working path during parse to support relative uris on other hosts