Skip to content

FontLoader: Inherit from Loader. #17333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 24, 2019
Merged

FontLoader: Inherit from Loader. #17333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 4 additions & 14 deletions docs/api/en/loaders/FontLoader.html
View file
Open in desktop
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 @@ -58,16 +60,10 @@ <h3>[name]( [param:LoadingManager manager] )</h3>
</p>

<h2>Properties</h2>

<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 fonts 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:null load]( [param:String url], [param:Function onLoad], [param:Function onProgress], [param:Function onError] )</h3>
<p>
Expand All @@ -86,12 +82,6 @@ <h3>[method:Font parse]( [param:Object json] )</h3>
Parse a <em>JSON</em> structure and return a [page:Font].
</p>

<h3>[method:FontLoader setPath]( [param:String path] )</h3>
<p>
Set the base path or URL from which to load fonts. This can be useful if
you are loading many fonts 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
17 changes: 4 additions & 13 deletions docs/api/zh/loaders/FontLoader.html
View file
Open in desktop
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 @@ -57,16 +59,10 @@ <h3>[name]( [param:LoadingManager manager] )</h3>
</p>

<h2>属性</h2>

<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:null load]( [param:String url], [param:Function onLoad], [param:Function onProgress], [param:Function onError] )</h3>
<p>
Expand All @@ -85,11 +81,6 @@ <h3>[method:Font parse]( [param:Object json] )</h3>
以<em>JSON</em>格式进行解析，并返回一个[page:Font].
</p>

<h3>[method:FontLoader 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]
Expand Down
5 changes: 2 additions & 3 deletions src/loaders/FontLoader.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { Loader } from './Loader';
import { LoadingManager } from './LoadingManager';
import { Font } from './../extras/core/Font';

export class FontLoader {
export class FontLoader extends Loader {

constructor( manager?: LoadingManager );

manager: LoadingManager;

load(
url: string,
onLoad?: ( responseFont: Font ) => void,
Expand Down
15 changes: 5 additions & 10 deletions src/loaders/FontLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
import { Font } from '../extras/core/Font.js';
import { FileLoader } from './FileLoader.js';
import { DefaultLoadingManager } from './LoadingManager.js';
import { Loader } from './Loader.js';

/**
* @author mrdoob / http://mrdoob.com/
*/

function FontLoader( manager ) {

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

}

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

constructor: FontLoader,

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

Expand Down Expand Up @@ -47,13 +49,6 @@ Object.assign( FontLoader.prototype, {

return new Font( json );

},

setPath: function ( value ) {

this.path = value;
return this;

}

} );
Expand Down