Merge pull request #17405 from Mugen87/dev29

Examples: Inherit from Loader V.

examples/js/loaders/LDrawLoader.js

@@ -522,7 +522,7 @@ THREE.LDrawLoader = ( function () {
 
 	function LDrawLoader( manager ) {
 
-		this.manager = ( manager !== undefined ) ? manager : THREE.DefaultLoadingManager;
+		THREE.Loader.call( this, manager );
 
 		// This is a stack of 'parse scopes' with one level per subobject loaded file.
 		// Each level contains a material lib and also other runtime variables passed between parent and child subobjects
@@ -530,8 +530,6 @@ THREE.LDrawLoader = ( function () {
 		// Each material library is an object map keyed by colour codes.
 		this.parseScopesStack = null;
 
-		this.path = '';
-
 		// Array of THREE.Material
 		this.materials = [];
 
@@ -576,7 +574,7 @@ THREE.LDrawLoader = ( function () {
 	LDrawLoader.FILE_LOCATION_TRY_ABSOLUTE = 5;
 	LDrawLoader.FILE_LOCATION_NOT_FOUND = 6;
 
-	LDrawLoader.prototype = {
+	LDrawLoader.prototype = Object.assign( Object.create( THREE.Loader.prototype ), {
 
 		constructor: LDrawLoader,
 
@@ -608,14 +606,6 @@ THREE.LDrawLoader = ( function () {
 
 		},
 
-		setPath: function ( value ) {
-
-			this.path = value;
-
-			return this;
-
-		},
-
 		setMaterials: function ( materials ) {
 
 			// Clears parse scopes stack, adds new scope with material library
@@ -1947,7 +1937,7 @@ THREE.LDrawLoader = ( function () {
 
 		}
 
-	};
+	} );
 
 	return LDrawLoader;
 

examples/js/loaders/LWOLoader.js

@@ -2021,25 +2021,23 @@ var lwoTree;
 
 THREE.LWOLoader = function ( manager, parameters ) {
 
-	this.manager = ( manager !== undefined ) ? manager : THREE.DefaultLoadingManager;
+	THREE.Loader.call( this, manager );
 
 	parameters = parameters || {};
 
-	this.resourcePath = ( parameters.resourcePath !== undefined ) ? parameters.resourcePath : undefined;
+	this.resourcePath = ( parameters.resourcePath !== undefined ) ? parameters.resourcePath : '';
 
 };
 
-THREE.LWOLoader.prototype = {
+THREE.LWOLoader.prototype = Object.assign( Object.create( THREE.Loader.prototype ), {
 
 	constructor: THREE.LWOLoader,
 
-	crossOrigin: 'anonymous',
-
 	load: function ( url, onLoad, onProgress, onError ) {
 
 		var self = this;
 
-		var path = ( self.path === undefined ) ? extractParentUrl( url, 'Objects' ) : self.path;
+		var path = ( self.path === '' ) ? extractParentUrl( url, 'Objects' ) : self.path;
 
 		// give the mesh a default name based on the filename
 		var modelName = url.split( path ).pop().split( '.' )[ 0 ];
@@ -2058,27 +2056,6 @@ THREE.LWOLoader.prototype = {
 
 	},
 
-	setCrossOrigin: function ( value ) {
-
-		this.crossOrigin = value;
-		return this;
-
-	},
-
-	setPath: function ( value ) {
-
-		this.path = value;
-		return this;
-
-	},
-
-	setResourcePath: function ( value ) {
-
-		this.resourcePath = value;
-		return this;
-
-	},
-
 	parse: function ( iffBuffer, path, modelName ) {
 
 		lwoTree = new IFFParser().parse( iffBuffer );
@@ -2091,7 +2068,7 @@ THREE.LWOLoader.prototype = {
 
 	}
 
-};
+} );
 
 // Parse the lwoTree object
 function LWOTreeParser( textureLoader ) {

examples/jsm/loaders/LDrawLoader.d.ts

@@ -1,16 +1,14 @@
 import {
+	Loader,
 	LoadingManager,
 	Group,
 	Material
 } from '../../../src/Three';
 
-export class LDrawLoader {
+export class LDrawLoader extends Loader {
 	constructor(manager?: LoadingManager);
-	manager: LoadingManager;
-	path: string;
 
 	load(url: string, onLoad: (data: Group) => void, onProgress?: (event: ProgressEvent) => void, onError?: (event: ErrorEvent) => void) : void;
-	setPath(path: string) : this;
 	setFileMap(fileMap: Record<string, string>): void;
 	setMaterials(materials: Material[]): void;
 

examples/jsm/loaders/LDrawLoader.js

@@ -10,12 +10,12 @@ import {
 	BufferAttribute,
 	BufferGeometry,
 	Color,
-	DefaultLoadingManager,
 	FileLoader,
 	Float32BufferAttribute,
 	Group,
 	LineBasicMaterial,
 	LineSegments,
+	Loader,
 	Matrix4,
 	Mesh,
 	MeshPhongMaterial,
@@ -540,7 +540,7 @@ var LDrawLoader = ( function () {
 
 	function LDrawLoader( manager ) {
 
-		this.manager = ( manager !== undefined ) ? manager : DefaultLoadingManager;
+		Loader.call( this, manager );
 
 		// This is a stack of 'parse scopes' with one level per subobject loaded file.
 		// Each level contains a material lib and also other runtime variables passed between parent and child subobjects
@@ -548,8 +548,6 @@ var LDrawLoader = ( function () {
 		// Each material library is an object map keyed by colour codes.
 		this.parseScopesStack = null;
 
-		this.path = '';
-
 		// Array of THREE.Material
 		this.materials = [];
 
@@ -594,7 +592,7 @@ var LDrawLoader = ( function () {
 	LDrawLoader.FILE_LOCATION_TRY_ABSOLUTE = 5;
 	LDrawLoader.FILE_LOCATION_NOT_FOUND = 6;
 
-	LDrawLoader.prototype = {
+	LDrawLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
 
 		constructor: LDrawLoader,
 
@@ -626,14 +624,6 @@ var LDrawLoader = ( function () {
 
 		},
 
-		setPath: function ( value ) {
-
-			this.path = value;
-
-			return this;
-
-		},
-
 		setMaterials: function ( materials ) {
 
 			// Clears parse scopes stack, adds new scope with material library
@@ -1965,7 +1955,7 @@ var LDrawLoader = ( function () {
 
 		}
 
-	};
+	} );
 
 	return LDrawLoader;
 

examples/jsm/loaders/LWOLoader.d.ts

@@ -1,4 +1,5 @@
 import {
+	Loader,
 	LoadingManager,
 	Material,
 	Object3D
@@ -18,15 +19,9 @@ export interface LWOLoaderParameters {
 
 }
 
-export class LWOLoader {
+export class LWOLoader extends Loader {
 	constructor(manager?: LoadingManager, parameters?: LWOLoaderParameters);
-	crossOrigin: string;
-	path: string;
-	resourcePath: string;
 
 	load(url: string, onLoad: (lwo: LWO) => void, onProgress?: (event: ProgressEvent) => void, onError?: (event: ErrorEvent) => void) : void;
-	setPath(path: string): this;
-	setResourcePath(path: string): this;
-	setCrossOrigin(value: string): this;
 	parse(data: ArrayBuffer, path: string, modelName: string): LWO;
 }

examples/jsm/loaders/LWOLoader.js

@@ -24,7 +24,6 @@ import {
 	BufferGeometry,
 	ClampToEdgeWrapping,
 	Color,
-	DefaultLoadingManager,
 	DoubleSide,
 	EquirectangularReflectionMapping,
 	EquirectangularRefractionMapping,
@@ -33,6 +32,7 @@ import {
 	FrontSide,
 	LineBasicMaterial,
 	LineSegments,
+	Loader,
 	LoaderUtils,
 	Mesh,
 	MeshPhongMaterial,
@@ -2050,25 +2050,23 @@ var lwoTree;
 
 var LWOLoader = function ( manager, parameters ) {
 
-	this.manager = ( manager !== undefined ) ? manager : DefaultLoadingManager;
+	Loader.call( this, manager );
 
 	parameters = parameters || {};
 
-	this.resourcePath = ( parameters.resourcePath !== undefined ) ? parameters.resourcePath : undefined;
+	this.resourcePath = ( parameters.resourcePath !== undefined ) ? parameters.resourcePath : '';
 
 };
 
-LWOLoader.prototype = {
+LWOLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
 
 	constructor: LWOLoader,
 
-	crossOrigin: 'anonymous',
-
 	load: function ( url, onLoad, onProgress, onError ) {
 
 		var self = this;
 
-		var path = ( self.path === undefined ) ? extractParentUrl( url, 'Objects' ) : self.path;
+		var path = ( self.path === '' ) ? extractParentUrl( url, 'Objects' ) : self.path;
 
 		// give the mesh a default name based on the filename
 		var modelName = url.split( path ).pop().split( '.' )[ 0 ];
@@ -2087,27 +2085,6 @@ LWOLoader.prototype = {
 
 	},
 
-	setCrossOrigin: function ( value ) {
-
-		this.crossOrigin = value;
-		return this;
-
-	},
-
-	setPath: function ( value ) {
-
-		this.path = value;
-		return this;
-
-	},
-
-	setResourcePath: function ( value ) {
-
-		this.resourcePath = value;
-		return this;
-
-	},
-
 	parse: function ( iffBuffer, path, modelName ) {
 
 		lwoTree = new IFFParser().parse( iffBuffer );
@@ -2120,7 +2097,7 @@ LWOLoader.prototype = {
 
 	}
 
-};
+} );
 
 // Parse the lwoTree object
 function LWOTreeParser( textureLoader ) {