Skip to content

Commit 0aab41b

Browse files
committed
FontLoader: Inherit from Loader.
1 parent 4e50228 commit 0aab41b

File tree

4 files changed

+15
-40
lines changed

4 files changed

+15
-40
lines changed

docs/api/en/loaders/FontLoader.html

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<link type="text/css" rel="stylesheet" href="page.css" />
99
</head>
1010
<body>
11+
[page:Loader] &rarr;
12+
1113
<h1>[name]</h1>
1214

1315
<p class="desc">
@@ -58,16 +60,10 @@ <h3>[name]( [param:LoadingManager manager] )</h3>
5860
</p>
5961

6062
<h2>Properties</h2>
61-
62-
<h3>[property:LoadingManager manager]</h3>
63-
<p>
64-
The [page:LoadingManager loadingManager] the loader is using. Default is [page:DefaultLoadingManager].
65-
</p>
66-
67-
<h3>[property:String path]</h3>
68-
<p>The base path from which fonts will be loaded. See [page:.setPath]. Default is *undefined*.</p>
63+
<p>See the base [page:Loader] class for common properties.</p>
6964

7065
<h2>Methods</h2>
66+
<p>See the base [page:Loader] class for common methods.</p>
7167

7268
<h3>[method:null load]( [param:String url], [param:Function onLoad], [param:Function onProgress], [param:Function onError] )</h3>
7369
<p>
@@ -86,12 +82,6 @@ <h3>[method:Font parse]( [param:Object json] )</h3>
8682
Parse a <em>JSON</em> structure and return a [page:Font].
8783
</p>
8884

89-
<h3>[method:FontLoader setPath]( [param:String path] )</h3>
90-
<p>
91-
Set the base path or URL from which to load fonts. This can be useful if
92-
you are loading many fonts from the same directory.
93-
</p>
94-
9585
<h2>Source</h2>
9686

9787
[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/zh/loaders/FontLoader.html

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<link type="text/css" rel="stylesheet" href="page.css" />
99
</head>
1010
<body>
11+
[page:Loader] &rarr;
12+
1113
<h1>[name]</h1>
1214

1315
<p class="desc">
@@ -57,16 +59,10 @@ <h3>[name]( [param:LoadingManager manager] )</h3>
5759
</p>
5860

5961
<h2>属性</h2>
60-
61-
<h3>[property:LoadingManager manager]</h3>
62-
<p>
63-
加载器正在使用的[page:LoadingManager loadingManager]。默认值为[page:DefaultLoadingManager].
64-
</p>
65-
66-
<h3>[property:String path]</h3>
67-
<p>所要加载字体的基本路径。 具体参考[page:.setPath]。 默认为*undefined*.</p>
62+
<p>See the base [page:Loader] class for common properties.</p>
6863

6964
<h2>方法</h2>
65+
<p>See the base [page:Loader] class for common methods.</p>
7066

7167
<h3>[method:null load]( [param:String url], [param:Function onLoad], [param:Function onProgress], [param:Function onError] )</h3>
7268
<p>
@@ -85,11 +81,6 @@ <h3>[method:Font parse]( [param:Object json] )</h3>
8581
<em>JSON</em>格式进行解析,并返回一个[page:Font].
8682
</p>
8783

88-
<h3>[method:FontLoader setPath]( [param:String path] )</h3>
89-
<p>
90-
设置加载字体的基本路径或URL。当加载同一目录中下的许多字体时,此方法将很有用。
91-
</p>
92-
9384
<h2></h2>
9485

9586
[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

src/loaders/FontLoader.d.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1+
import { Loader } from './Loader';
12
import { LoadingManager } from './LoadingManager';
23
import { Font } from './../extras/core/Font';
34

4-
export class FontLoader {
5+
export class FontLoader extends Loader {
56

67
constructor( manager?: LoadingManager );
78

8-
manager: LoadingManager;
9-
109
load(
1110
url: string,
1211
onLoad?: ( responseFont: Font ) => void,

src/loaders/FontLoader.js

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
import { Font } from '../extras/core/Font.js';
22
import { FileLoader } from './FileLoader.js';
3-
import { DefaultLoadingManager } from './LoadingManager.js';
3+
import { Loader } from './Loader.js';
44

55
/**
66
* @author mrdoob / http://mrdoob.com/
77
*/
88

99
function FontLoader( manager ) {
1010

11-
this.manager = ( manager !== undefined ) ? manager : DefaultLoadingManager;
11+
Loader.call( this, manager );
1212

1313
}
1414

15-
Object.assign( FontLoader.prototype, {
15+
FontLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
16+
17+
constructor: FontLoader,
1618

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

@@ -47,13 +49,6 @@ Object.assign( FontLoader.prototype, {
4749

4850
return new Font( json );
4951

50-
},
51-
52-
setPath: function ( value ) {
53-
54-
this.path = value;
55-
return this;
56-
5752
}
5853

5954
} );

0 commit comments

Comments
 (0)