2
0
Эх сурвалжийг харах

TextureLoader: Inherit from Loader.

Mugen87 6 жил өмнө
parent
commit
3ffa8d4bbc

+ 4 - 26
docs/api/en/loaders/TextureLoader.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">
@@ -68,24 +70,10 @@
 
 
 		<h2>Properties</h2>
-
-		<h3>[property:String crossOrigin]</h3>
-		<p>
-		If set, assigns the [link:https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_settings_attributes crossOrigin]
-	 attribute of the image to the value of *crossOrigin*, prior to starting the load. Default is *"anonymous"*.
-		</p>
-
-
-		<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:Texture load]( [param:String url], [param:Function onLoad], [param:Function onProgress], [param:Function onError] )</h3>
 		<p>
@@ -99,16 +87,6 @@
 		If you do it this way, the texture may pop up in your scene once the respective loading process is finished.
 		</p>
 
-		<h3>[method:null setCrossOrigin]( [param:String value] )</h3>
-		<p>Set the [page:.crossOrigin] attribute.</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 models from the same directory.
-		</p>
-
-
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

+ 4 - 26
docs/api/zh/loaders/TextureLoader.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">
@@ -66,26 +68,11 @@
 		创建一个新的[name].
 		</p>
 
-
 		<h2>属性</h2>
-
-		<h3>[property:String crossOrigin]</h3>
-		<p>
-            如果设置了,在开始加载前, 将为图片分配 [link:https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_settings_attributes crossOrigin]
-            属性,其值为 *crossOrigin*, 默认为"anonymous"。
-		</p>
-
-
-		<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:Texture load]( [param:String url], [param:Function onLoad], [param:Function onProgress], [param:Function onError] )</h3>
 		<p>
@@ -99,15 +86,6 @@
             如果采用此方法,一旦相应的加载过程完成,纹理可能会在场景中出现。
 		</p>
 
-		<h3>[method:null setCrossOrigin]( [param:String value] )</h3>
-		<p>设置[page:.crossOrigin]的属性。</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 - 14
src/loaders/TextureLoader.d.ts

@@ -1,3 +1,4 @@
+import { Loader } from './Loader';
 import { LoadingManager } from './LoadingManager';
 import { Texture } from './../textures/Texture';
 
@@ -5,28 +6,15 @@ import { Texture } from './../textures/Texture';
  * Class for loading a texture.
  * Unlike other loaders, this one emits events instead of using predefined callbacks. So if you're interested in getting notified when things happen, you need to add listeners to the object.
  */
-export class TextureLoader {
+export class TextureLoader extends Loader {
 
 	constructor( manager?: LoadingManager );
 
-	manager: LoadingManager;
-	crossOrigin: string;
-	withCredentials: string;
-	path: string;
-
-	/**
-	 * Begin loading from url
-	 *
-	 * @param url
-	 */
 	load(
 		url: string,
 		onLoad?: ( texture: Texture ) => void,
 		onProgress?: ( event: ProgressEvent ) => void,
 		onError?: ( event: ErrorEvent ) => void
 	): Texture;
-	setCrossOrigin( crossOrigin: string ): TextureLoader;
-	setWithCredentials( value: string ): TextureLoader;
-	setPath( path: string ): TextureLoader;
 
 }

+ 4 - 19
src/loaders/TextureLoader.js

@@ -5,18 +5,17 @@
 import { RGBAFormat, RGBFormat } from '../constants.js';
 import { ImageLoader } from './ImageLoader.js';
 import { Texture } from '../textures/Texture.js';
-import { DefaultLoadingManager } from './LoadingManager.js';
-
+import { Loader } from './Loader.js';
 
 function TextureLoader( manager ) {
 
-	this.manager = ( manager !== undefined ) ? manager : DefaultLoadingManager;
+	Loader.call( this, manager );
 
 }
 
-Object.assign( TextureLoader.prototype, {
+TextureLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
 
-	crossOrigin: 'anonymous',
+	constructor: TextureLoader,
 
 	load: function ( url, onLoad, onProgress, onError ) {
 
@@ -46,20 +45,6 @@ Object.assign( TextureLoader.prototype, {
 
 		return texture;
 
-	},
-
-	setCrossOrigin: function ( value ) {
-
-		this.crossOrigin = value;
-		return this;
-
-	},
-
-	setPath: function ( value ) {
-
-		this.path = value;
-		return this;
-
 	}
 
 } );