Home Explore Help
Sign In
javascript
/
three.js
mirror of https://github.com/tazdij/three.js.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

AnimationLoader: Inherit from loader.

Mugen87 6 years ago
parent
bba76b2895
commit
f5e71c2132
4 changed files with 13 additions and 32 deletions
Unified View Show Diff Stats
  1. 4 13
      docs/api/en/loaders/AnimationLoader.html
  2. 4 5
      docs/api/zh/loaders/AnimationLoader.html
  3. 2 4
      src/loaders/AnimationLoader.d.ts
  4. 3 10
      src/loaders/AnimationLoader.js

+ 4 - 13
docs/api/en/loaders/AnimationLoader.html
View File 

@@ -8,6 +8,8 @@
 
 		<link type="text/css" rel="stylesheet" href="page.css" />
 
 		<link type="text/css" rel="stylesheet" href="page.css" />
 
 	</head>
 
 	</head>
 
 	<body>
 
 	<body>
 
+		[page:Loader] &rarr;
 
+
 
 		<h1>[name]</h1>
 
 		<h1>[name]</h1>
 
 
 
 		<p class="desc">
 
 		<p class="desc">
 
@@ -53,13 +55,10 @@
 
 		</p>
 
 		</p>
 
 
 
 		<h2>Properties</h2>
 
 		<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>
 
 		<h2>Methods</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>
 
 		<h3>[method:null load]( [param:String url], [param:Function onLoad], [param:Function onProgress], [param:Function onError] )</h3>
 
 		<p>
 
 		<p>
 
@@ -80,14 +79,6 @@
 
 		be parsed with [page:AnimationClip.parse].
 
 		be parsed with [page:AnimationClip.parse].
 
 		</p>
 
 		</p>
 
 
 
-		<h3>[method:AnimationLoader 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 animations from the same directory.
 
-		</p>
 
-
 
 		<h2>Source</h2>
 
 		<h2>Source</h2>
 
 
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

+ 4 - 5
docs/api/zh/loaders/AnimationLoader.html
View File 

@@ -8,6 +8,8 @@
 
 		<link type="text/css" rel="stylesheet" href="page.css" />
 
 		<link type="text/css" rel="stylesheet" href="page.css" />
 
 	</head>
 
 	</head>
 
 	<body>
 
 	<body>
 
+		[page:Loader] &rarr;
 
+
 
 		<h1>[name]</h1>
 
 		<h1>[name]</h1>
 
 
 
 		<p class="desc">
 
 		<p class="desc">
 
@@ -53,13 +55,10 @@
 
 		</p>
 
 		</p>
 
 
 
 		<h2>属性</h2>
 
 		<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>
 
 		<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>
 
 		<h3>[method:null load]( [param:String url], [param:Function onLoad], [param:Function onProgress], [param:Function onError] )</h3>
 
 		<p>
 
 		<p>

+ 2 - 4
src/loaders/AnimationLoader.d.ts
View File 

@@ -1,12 +1,11 @@
 
 import { LoadingManager } from './LoadingManager';
 
 import { LoadingManager } from './LoadingManager';
 
+import { Loader } from './Loader';
 
 import { AnimationClip } from './../animation/AnimationClip';
 
 import { AnimationClip } from './../animation/AnimationClip';
 
 
 
-export class AnimationLoader {
 
+export class AnimationLoader extends Loader {
 
 
 
 	constructor( manager?: LoadingManager );
 
 	constructor( manager?: LoadingManager );
 
 
 
-	manager: LoadingManager;
 
-
 
 	load(
 
 	load(
 
 		url: string,
 
 		url: string,
 
 		onLoad?: ( response: string | ArrayBuffer ) => void,
 
 		onLoad?: ( response: string | ArrayBuffer ) => void,
 
@@ -14,6 +13,5 @@ export class AnimationLoader {
 
 		onError?: ( event: ErrorEvent ) => void
 
 		onError?: ( event: ErrorEvent ) => void
 
 	): any;
 
 	): any;
 
 	parse( json: any ): AnimationClip[];
 
 	parse( json: any ): AnimationClip[];
 
-	setPath( path: string ): AnimationLoader;
 
 
 
 }
 
 }

+ 3 - 10
src/loaders/AnimationLoader.js
View File 

@@ -1,6 +1,6 @@
 
 import { AnimationClip } from '../animation/AnimationClip.js';
 
 import { AnimationClip } from '../animation/AnimationClip.js';
 
 import { FileLoader } from './FileLoader.js';
 
 import { FileLoader } from './FileLoader.js';
 
-import { DefaultLoadingManager } from './LoadingManager.js';
 
+import { Loader } from './Loader.js';
 
 
 
 /**
 
 /**
 
  * @author bhouston / http://clara.io/
 
  * @author bhouston / http://clara.io/
 
@@ -8,11 +8,11 @@ import { DefaultLoadingManager } from './LoadingManager.js';
 
 
 
 function AnimationLoader( manager ) {
 
 function AnimationLoader( manager ) {
 
 
 
-	this.manager = ( manager !== undefined ) ? manager : DefaultLoadingManager;
 
+	Loader.call( this, manager );
 
 
 
 }
 
 }
 
 
 
-Object.assign( AnimationLoader.prototype, {
 
+AnimationLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
 
 
 
 	load: function ( url, onLoad, onProgress, onError ) {
 
 	load: function ( url, onLoad, onProgress, onError ) {
 
 
 
@@ -42,13 +42,6 @@ Object.assign( AnimationLoader.prototype, {
 
 
 
 		return animations;
 
 		return animations;
 
 
 
-	},
 
-
 
-	setPath: function ( value ) {
 
-
 
-		this.path = value;
 
-		return this;
 
-
 
 	}
 
 	}
 
 
 
 } );
 
 } );