Merge pull request #17333 from Mugen87/dev29

FontLoader: Inherit from Loader.

Merge pull request #17333 from Mugen87/dev29
FontLoader: Inherit from Loader.
fd2cf7b0 · Michael Herzog · GitHub · 7ce5c75a · c90eed97 · fd2cf7b0
4 changed file
--- a/docs/api/en/loaders/FontLoader.html
+++ b/docs/api/en/loaders/FontLoader.html
@@ -8,6 +8,8 @@
 		<link type="text/css" rel="stylesheet" href="page.css" />
 	</head>
 	<body>
+		[page:Loader] &rarr;
+
 		<h1>[name]</h1>

 		<p class="desc">
@@ -58,16 +60,10 @@
 		</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>
@@ -86,12 +82,6 @@
 		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]

--- a/docs/api/zh/loaders/FontLoader.html
+++ b/docs/api/zh/loaders/FontLoader.html
@@ -8,6 +8,8 @@
 		<link type="text/css" rel="stylesheet" href="page.css" />
 	</head>
 	<body>
+		[page:Loader] &rarr;
+
 		<h1>[name]</h1>

 		<p class="desc">
@@ -57,16 +59,10 @@
 		</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>
@@ -85,11 +81,6 @@
 		以<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]

--- a/src/loaders/FontLoader.d.ts
+++ b/src/loaders/FontLoader.d.ts
+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,

--- a/src/loaders/FontLoader.js
+++ b/src/loaders/FontLoader.js
 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/
@@ -8,11 +8,13 @@ import { DefaultLoadingManager } from './LoadingManager.js';

 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 ) {

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

 		return new Font( json );

-	},
-
-	setPath: function ( value ) {
-
-		this.path = value;
-		return this;
-
 	}

 } );