Skip to content

Commit

Permalink
AudioLoader: Inherit from Loader.
Browse files Browse the repository at this point in the history
  • Loading branch information
Mugen87 committed Aug 22, 2019
1 parent 027f707 commit 80e96fa
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 34 deletions.
21 changes: 5 additions & 16 deletions docs/api/en/loaders/AudioLoader.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<link type="text/css" rel="stylesheet" href="page.css" />
</head>
<body>
[page:Loader] &rarr;

<h1>[name]</h1>

<p class="desc">
Expand Down Expand Up @@ -62,23 +64,18 @@ <h2>Example</h2>

<h2>Constructor</h2>

<h3>[name]( [param:String context], [param:LoadingManager manager] )</h3>
<h3>[name]( [param:LoadingManager manager] )</h3>
<p>
[page:String context] — The [page:String AudioContext] for the loader to use. Default is [page:String window.AudioContext].<br />
[page:LoadingManager manager] — The [page:LoadingManager loadingManager] for the loader to use. Default is [page:LoadingManager THREE.DefaultLoadingManager].<br /><br />

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:null load]( [param:String url], [param:Function onLoad], [param:Function onProgress], [param:Function onError] )</h3>
<p>
Expand All @@ -92,14 +89,6 @@ <h3>[method:null load]( [param:String url], [param:Function onLoad], [param:Func
Begin loading from url and pass the loaded [page:String AudioBuffer] to onLoad.
</p>

<h3>[method:AudioLoader 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 audios from the same directory.
</p>

<h2>Source</h2>

[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
Expand Down
13 changes: 5 additions & 8 deletions docs/api/zh/loaders/AudioLoader.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<link type="text/css" rel="stylesheet" href="page.css" />
</head>
<body>
[page:Loader] &rarr;

<h1>[name]</h1>

<p class="desc">
Expand Down Expand Up @@ -62,23 +64,18 @@ <h2>例子</h2>

<h2>构造函数</h2>

<h3>[name]( [param:String context], [param:LoadingManager manager] )</h3>
<h3>[name]( [param:LoadingManager manager] )</h3>
<p>
[page:String context] — 加载器使用的[page:String AudioContext]。 默认为[page:String window.AudioContext].<br />
[page:LoadingManager manager] — 加载器使用的[page:LoadingManager loadingManager]。默认为[page:LoadingManager THREE.DefaultLoadingManager].<br /><br />

创建一个新的[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>
Expand Down
15 changes: 5 additions & 10 deletions src/loaders/AudioLoader.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
import { AudioContext } from '../audio/AudioContext.js';
import { FileLoader } from './FileLoader.js';
import { DefaultLoadingManager } from './LoadingManager.js';
import { Loader } from './Loader.js';

/**
* @author Reece Aaron Lecrivain / http://reecenotes.com/
*/

function AudioLoader( manager ) {

this.manager = ( manager !== undefined ) ? manager : DefaultLoadingManager;
Loader.call( this, manager );

}

Object.assign( AudioLoader.prototype, {
AudioLoader.prototype = Object.assign( Object.create( Loader.prototype ), {

constructor: AudioLoader,

load: function ( url, onLoad, onProgress, onError ) {

Expand All @@ -34,13 +36,6 @@ Object.assign( AudioLoader.prototype, {

}, onProgress, onError );

},

setPath: function ( value ) {

this.path = value;
return this;

}

} );
Expand Down

0 comments on commit 80e96fa

Please sign in to comment.