未验证 提交 b7ca8be1 编写于 作者: M Mr.doob 提交者: GitHub

Merge pull request #17319 from Mugen87/dev29

AnimationLoader: Inherit from Loader.
......@@ -8,6 +8,8 @@
<link type="text/css" rel="stylesheet" href="page.css" />
</head>
<body>
[page:Loader] &rarr;
<h1>[name]</h1>
<p class="desc">
......@@ -53,13 +55,10 @@
</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:null load]( [param:String url], [param:Function onLoad], [param:Function onProgress], [param:Function onError] )</h3>
<p>
......@@ -80,14 +79,6 @@
be parsed with [page:AnimationClip.parse].
</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>
[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
......
......@@ -8,6 +8,8 @@
<link type="text/css" rel="stylesheet" href="page.css" />
</head>
<body>
[page:Loader] &rarr;
<h1>[name]</h1>
<p class="desc">
......@@ -53,13 +55,10 @@
</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>
......
import { LoadingManager } from './LoadingManager';
import { Loader } from './Loader';
import { AnimationClip } from './../animation/AnimationClip';
export class AnimationLoader {
export class AnimationLoader extends Loader {
constructor( manager?: LoadingManager );
manager: LoadingManager;
load(
url: string,
onLoad?: ( response: string | ArrayBuffer ) => void,
......@@ -14,6 +13,5 @@ export class AnimationLoader {
onError?: ( event: ErrorEvent ) => void
): any;
parse( json: any ): AnimationClip[];
setPath( path: string ): AnimationLoader;
}
import { AnimationClip } from '../animation/AnimationClip.js';
import { FileLoader } from './FileLoader.js';
import { DefaultLoadingManager } from './LoadingManager.js';
import { Loader } from './Loader.js';
/**
* @author bhouston / http://clara.io/
......@@ -8,11 +8,11 @@ import { DefaultLoadingManager } from './LoadingManager.js';
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 ) {
......@@ -42,13 +42,6 @@ Object.assign( AnimationLoader.prototype, {
return animations;
},
setPath: function ( value ) {
this.path = value;
return this;
}
} );
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册