Переглянути джерело

CompressedTextureLoader: Inherit from Loader.

Mugen87 6 роки тому
батько
коміт
9e28521fd2

+ 4 - 17
docs/api/en/loaders/CompressedTextureLoader.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,20 +35,11 @@
 		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>
-
-		<h3>[property:String path]</h3>
-		<p>The base path from which files will be loaded. See [page:.setPath]. Default is *undefined*.</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:CompressedTexture load]( [param:String url], [param:Function onLoad], [param:Function onProgress], [param:Function onError] )</h3>
 		<p>
@@ -60,12 +53,6 @@
 		Begin loading from url and pass the loaded texture to onLoad.
 		</p>
 
-		<h3>[method:FileLoader setPath]( [param:String path] )</h3>
-		<p>
-			Set the base path or URL from which to load files. This can be useful if
-			you are loading many textures from the same directory.
-		</p>
-
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

+ 4 - 16
docs/api/zh/loaders/CompressedTextureLoader.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,20 +35,11 @@
 		创建一个新的[name].
 		</p>
 
-
 		<h2>属性</h2>
-
-		<h3>[property:LoadingManager manager]</h3>
-		<p>
-			加载器正在使用的[page:LoadingManager loadingManager]。默认为[page:DefaultLoadingManager]。
-		</p>
-
-		<h3>[property:String path]</h3>
-		<p>加载的基本路径。请参考[page:.setPath]。默认为*undefined*.</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>
@@ -60,11 +53,6 @@
             从URL中进行加载,并将被加载的纹理传递给onLoad。
 		</p>
 
-		<h3>[method:FileLoader setPath]( [param:String path] )</h3>
-		<p>
-            设置加载文件的基本路径或URL。当加载同一目录中的许多模型,此方法将很有用。
-		</p>
-
 		<h2>源</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

+ 2 - 9
src/loaders/CompressedTextureLoader.d.ts

@@ -1,23 +1,16 @@
+import { Loader } from './Loader';
 import { LoadingManager } from './LoadingManager';
 import { CompressedTexture } from './../textures/CompressedTexture';
 
-/**
- * @deprecated since 0.84.0. Use {@link DataTextureLoader} (renamed)
- */
-
-export class CompressedTextureLoader {
+export class CompressedTextureLoader extends Loader {
 
 	constructor( manager?: LoadingManager );
 
-	manager: LoadingManager;
-	path: string;
-
 	load(
 		url: string,
 		onLoad: ( texture: CompressedTexture ) => void,
 		onProgress?: ( event: ProgressEvent ) => void,
 		onError?: ( event: ErrorEvent ) => void
 	): void;
-	setPath( path: string ): CompressedTextureLoader;
 
 }

+ 5 - 10
src/loaders/CompressedTextureLoader.js

@@ -1,7 +1,7 @@
 import { LinearFilter } from '../constants.js';
 import { FileLoader } from './FileLoader.js';
 import { CompressedTexture } from '../textures/CompressedTexture.js';
-import { DefaultLoadingManager } from './LoadingManager.js';
+import { Loader } from './Loader.js';
 
 /**
  * @author mrdoob / http://mrdoob.com/
@@ -11,14 +11,16 @@ import { DefaultLoadingManager } from './LoadingManager.js';
 
 function CompressedTextureLoader( manager ) {
 
-	this.manager = ( manager !== undefined ) ? manager : DefaultLoadingManager;
+	Loader.call( this, manager );
 
 	// override in sub classes
 	this._parser = null;
 
 }
 
-Object.assign( CompressedTextureLoader.prototype, {
+CompressedTextureLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
+
+	constructor: CompressedTextureLoader,
 
 	load: function ( url, onLoad, onProgress, onError ) {
 
@@ -126,13 +128,6 @@ Object.assign( CompressedTextureLoader.prototype, {
 
 		return texture;
 
-	},
-
-	setPath: function ( value ) {
-
-		this.path = value;
-		return this;
-
 	}
 
 } );