未验证 提交 fd2cf7b0 编写于 作者: M Michael Herzog 提交者: GitHub

Merge pull request #17333 from Mugen87/dev29

FontLoader: Inherit from Loader.
...@@ -8,6 +8,8 @@ ...@@ -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">
...@@ -58,16 +60,10 @@ ...@@ -58,16 +60,10 @@
</p> </p>
<h2>Properties</h2> <h2>Properties</h2>
<p>See the base [page:Loader] class for common properties.</p>
<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>
<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>
...@@ -86,12 +82,6 @@ ...@@ -86,12 +82,6 @@
Parse a <em>JSON</em> structure and return a [page:Font]. Parse a <em>JSON</em> structure and return a [page:Font].
</p> </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> <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]
......
...@@ -8,6 +8,8 @@ ...@@ -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">
...@@ -57,16 +59,10 @@ ...@@ -57,16 +59,10 @@
</p> </p>
<h2>属性</h2> <h2>属性</h2>
<p>See the base [page:Loader] class for common properties.</p>
<h3>[property:LoadingManager manager]</h3>
<p>
加载器正在使用的[page:LoadingManager loadingManager]。默认值为[page:DefaultLoadingManager].
</p>
<h3>[property:String path]</h3>
<p>所要加载字体的基本路径。 具体参考[page:.setPath]。 默认为*undefined*.</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>
...@@ -85,11 +81,6 @@ ...@@ -85,11 +81,6 @@
<em>JSON</em>格式进行解析,并返回一个[page:Font]. <em>JSON</em>格式进行解析,并返回一个[page:Font].
</p> </p>
<h3>[method:FontLoader setPath]( [param:String path] )</h3>
<p>
设置加载字体的基本路径或URL。当加载同一目录中下的许多字体时,此方法将很有用。
</p>
<h2></h2> <h2></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]
......
import { Loader } from './Loader';
import { LoadingManager } from './LoadingManager'; import { LoadingManager } from './LoadingManager';
import { Font } from './../extras/core/Font'; import { Font } from './../extras/core/Font';
export class FontLoader { export class FontLoader extends Loader {
constructor( manager?: LoadingManager ); constructor( manager?: LoadingManager );
manager: LoadingManager;
load( load(
url: string, url: string,
onLoad?: ( responseFont: Font ) => void, onLoad?: ( responseFont: Font ) => void,
......
import { Font } from '../extras/core/Font.js'; import { Font } from '../extras/core/Font.js';
import { FileLoader } from './FileLoader.js'; import { FileLoader } from './FileLoader.js';
import { DefaultLoadingManager } from './LoadingManager.js'; import { Loader } from './Loader.js';
/** /**
* @author mrdoob / http://mrdoob.com/ * @author mrdoob / http://mrdoob.com/
...@@ -8,11 +8,13 @@ import { DefaultLoadingManager } from './LoadingManager.js'; ...@@ -8,11 +8,13 @@ import { DefaultLoadingManager } from './LoadingManager.js';
function FontLoader( manager ) { 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 ) { load: function ( url, onLoad, onProgress, onError ) {
...@@ -47,13 +49,6 @@ Object.assign( FontLoader.prototype, { ...@@ -47,13 +49,6 @@ Object.assign( FontLoader.prototype, {
return new Font( json ); return new Font( json );
},
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.
先完成此消息的编辑!
想要评论请 注册