Merge pull request #17337 from Mugen87/dev29

Mugen87 · web-flow · commit 69f7b56119a2 · 2019-08-24T14:45:50.000+02:00
DataTextureLoader: Inherit from Loader.
diff --git a/docs/api/en/loaders/DataTextureLoader.html b/docs/api/en/loaders/DataTextureLoader.html
@@ -8,6 +8,8 @@
 		<link type="text/css" rel="stylesheet" href="page.css" />
 	</head>
 	<body>
+		[page:Loader] &rarr;
+
 		<h1>[name]</h1>
 
 		<p class="desc">
@@ -33,16 +35,11 @@ <h3>[name]( [param:LoadingManager manager] )</h3>
 		Creates a new [name].
 		</p>
 
-
 		<h2>Properties</h2>
-
-		<h3>[property:LoadingManager manager]</h3>
-		<p>
-		The [page:LoadingManager loadingManager] the loader is using. Default is [page:DefaultLoadingManager].
-		</p>
-
+		<p>See the base [page:Loader] class for common properties.</p>
 
 		<h2>Methods</h2>
+		<p>See the base [page:Loader] class for common methods.</p>
 
 		<h3>[method:DataTexture load]( [param:String url], [param:Function onLoad], [param:Function onProgress], [param:Function onError] )</h3>
 		<p>
@@ -56,14 +53,6 @@ <h3>[method:DataTexture load]( [param:String url], [param:Function onLoad], [par
 		Begin loading from url and pass the loaded texture to onLoad.
 		</p>
 
-		<h3>[method:DataTextureLoader setPath]( [param:String path] )</h3>
-		<p>
-			[page:String path] — Base path of the file to load.<br /><br />
-
-			Sets the base path or URL from which to load files. This can be useful if
-			you are loading many data textures from the same directory.
-		</p>
-
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
diff --git a/docs/api/zh/loaders/DataTextureLoader.html b/docs/api/zh/loaders/DataTextureLoader.html
@@ -8,6 +8,8 @@
 		<link type="text/css" rel="stylesheet" href="page.css" />
 	</head>
 	<body>
+		[page:Loader] &rarr;
+
 		<h1>[name]</h1>
 
 		<p class="desc">
@@ -33,16 +35,11 @@ <h3>[name]( [param:LoadingManager manager] )</h3>
 		创建一个新的[name].
 		</p>
 
-
 		<h2>属性</h2>
-
-		<h3>[property:LoadingManager manager]</h3>
-		<p>
-		加载器正在使用的[page:LoadingManager loadingManager]。默认为[page:DefaultLoadingManager].
-		</p>
-
+		<p>See the base [page:Loader] class for common properties.</p>
 
 		<h2>方法</h2>
+		<p>See the base [page:Loader] class for common methods.</p>
 
 		<h3>[method:null load]( [param:String url], [param:Function onLoad], [param:Function onProgress], [param:Function onError] )</h3>
 		<p>
diff --git a/src/loaders/DataTextureLoader.d.ts b/src/loaders/DataTextureLoader.d.ts
@@ -1,12 +1,11 @@
+import { Loader } from './Loader';
 import { LoadingManager } from './LoadingManager';
 import { DataTexture } from './../textures/DataTexture';
 
-export class DataTextureLoader {
+export class DataTextureLoader extends Loader {
 
 	constructor( manager?: LoadingManager );
 
-	manager: LoadingManager;
-
 	load(
 		url: string,
 		onLoad: ( dataTexture: DataTexture ) => void,
diff --git a/src/loaders/DataTextureLoader.js b/src/loaders/DataTextureLoader.js
@@ -1,7 +1,7 @@
 import { LinearFilter, LinearMipmapLinearFilter, ClampToEdgeWrapping } from '../constants.js';
 import { FileLoader } from './FileLoader.js';
 import { DataTexture } from '../textures/DataTexture.js';
-import { DefaultLoadingManager } from './LoadingManager.js';
+import { Loader } from './Loader.js';
 
 /**
  * @author Nikos M. / https://github.com/foo123/
@@ -11,14 +11,16 @@ import { DefaultLoadingManager } from './LoadingManager.js';
 
 function DataTextureLoader( manager ) {
 
-	this.manager = ( manager !== undefined ) ? manager : DefaultLoadingManager;
+	Loader.call( this, manager );
 
 	// override in sub classes
 	this._parser = null;
 
 }
 
-Object.assign( DataTextureLoader.prototype, {
+DataTextureLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
+
+	constructor: DataTextureLoader,
 
 	load: function ( url, onLoad, onProgress, onError ) {
 
@@ -87,13 +89,6 @@ Object.assign( DataTextureLoader.prototype, {
 
 		return texture;
 
-	},
-
-	setPath: function ( value ) {
-
-		this.path = value;
-		return this;
-
 	}
 
 } );
