Browse Source

Merge pull request #17532 from Mugen87/dev38

Docs: Clarify LoadingManager page.
Michael Herzog 5 years ago
parent
commit
aaf5534515

+ 29 - 29
docs/api/en/loaders/managers/LoadingManager.html

@@ -159,14 +159,27 @@
 
 
 		<h2>Methods</h2>
 		<h2>Methods</h2>
 
 
-		<h3>[method:null setURLModifier]( [param:Function callback] )</h3>
+		<h3>[method:LoadingManager addHandler]( [param:Object regex], [param:Loader loader] )</h3>
 		<p>
 		<p>
-		[page:Function callback] — URL modifier callback. Called with [page:String url] argument, and
-		must return [page:String resolvedURL].<br /><br />
+		[page:Object regex] — A regular expression.<br />
+		[page:Loader loader] — The loader.
+		<p>
+		Registers a loader with the given regular expression. Can be used to define what loader should be used in
+		order to load specific files. A typical use case is to overwrite the default loader for textures.
+		</p>
 
 
-		If provided, the callback will be passed each resource URL before a request is sent. The
-		callback may return the original URL, or a new URL to override loading behavior. This
-		behavior can be used to load assets from .ZIP files, drag-and-drop APIs, and Data URIs.
+		<h3>[method:null getHandler]( [param:String file] )</h3>
+		<p>
+		[page:String file] — The file path.
+		<p>
+		Can be used to retrieve the registered loader for the given file path.
+		</p>
+
+		<h3>[method:LoadingManager removeHandler]( [param:Object regex] )</h3>
+		<p>
+		[page:Object regex] — A regular expression.
+		<p>
+		Removes the loader for the given regular expression.
 		</p>
 		</p>
 
 
 		<h3>[method:String resolveURL]( [param:String url] )</h3>
 		<h3>[method:String resolveURL]( [param:String url] )</h3>
@@ -177,6 +190,16 @@
 		URL modifier is set, returns the original URL.
 		URL modifier is set, returns the original URL.
 		</p>
 		</p>
 
 
+		<h3>[method:null setURLModifier]( [param:Function callback] )</h3>
+		<p>
+		[page:Function callback] — URL modifier callback. Called with [page:String url] argument, and
+		must return [page:String resolvedURL].<br /><br />
+
+		If provided, the callback will be passed each resource URL before a request is sent. The
+		callback may return the original URL, or a new URL to override loading behavior. This
+		behavior can be used to load assets from .ZIP files, drag-and-drop APIs, and Data URIs.
+		</p>
+
 		<br /><br />
 		<br /><br />
 		<p>
 		<p>
 			<em>Note: The following methods are designed to be called internally by loaders. You shouldn't call
 			<em>Note: The following methods are designed to be called internally by loaders. You shouldn't call
@@ -204,29 +227,6 @@
 		This should be called by any loader using the manager when the loader errors loading an url.
 		This should be called by any loader using the manager when the loader errors loading an url.
 		</p>
 		</p>
 
 
-		<h3>[method:LoadingManager addHandler]( [param:Object regex], [param:Loader loader] )</h3>
-		<p>
-		[page:Object regex] — A regular expression.<br />
-		[page:Loader loader] — The loader.
-		<p>
-		Registers a loader with the given regular expression. Can be used to define what loader should be used in
-		order to load specific files. A typical use case is to overwrite the default loader for textures.
-		</p>
-
-		<h3>[method:LoadingManager removeHandler]( [param:Object regex] )</h3>
-		<p>
-		[page:Object regex] — A regular expression.
-		<p>
-		Removes the loader for the given regular expression.
-		</p>
-
-		<h3>[method:null getHandler]( [param:String file] )</h3>
-		<p>
-		[page:String file] — The file path.
-		<p>
-		Can be used to retrieve the registered loader for the given file path.
-		</p>
-
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/loaders/LoadingManager.js src/loaders/LoadingManager.js]
 		[link:https://github.com/mrdoob/three.js/blob/master/src/loaders/LoadingManager.js src/loaders/LoadingManager.js]

+ 32 - 32
docs/api/zh/loaders/managers/LoadingManager.html

@@ -157,22 +157,45 @@
 
 
 		<h2>方法</h2>
 		<h2>方法</h2>
 
 
-		<h3>[method:null setURLModifier]( [param:Function callback] )</h3>
+		<h3>[method:LoadingManager addHandler]( [param:Object regex], [param:Loader loader] )</h3>
 		<p>
 		<p>
-		[page:Function callback] —
-            设置URL修饰符成功时回调。使用url参数进行回调,并且必须返回 [page:String resolvedURL] 。<br /><br />
+		[page:Object regex] — A regular expression.<br />
+		[page:Loader loader] — The loader.
+		<p>
+		Registers a loader with the given regular expression. Can be used to define what loader should be used in
+		order to load specific files. A typical use case is to overwrite the default loader for textures.
+		</p>
 
 
-            如果设置了回调,则在发送请求之前将向每个资源URL传递回调。回调可以返回最初的URL,也可以返回新URL以覆盖加载行为。
-            此行为可用于从.ZIP、拖拽API和数据URI中加载资源文件。
+		<h3>[method:LoadingManager removeHandler]( [param:Object regex] )</h3>
+		<p>
+		[page:Object regex] — A regular expression.
+		<p>
+		Removes the loader for the given regular expression.
+		</p>
+
+		<h3>[method:null getHandler]( [param:String file] )</h3>
+		<p>
+		[page:String file] — The file path.
+		<p>
+		Can be used to retrieve the registered loader for the given file path.
 		</p>
 		</p>
 
 
 		<h3>[method:String resolveURL]( [param:String url] )</h3>
 		<h3>[method:String resolveURL]( [param:String url] )</h3>
 		<p>
 		<p>
 		[page:String url] — 所要加载的url<br /><br />
 		[page:String url] — 所要加载的url<br /><br />
 
 
-            给定URL,使用URL修饰符回调(如果有)并返回已解析的URL。如果未设置URL修饰符,则返回原始URL。
+		给定URL,使用URL修饰符回调(如果有)并返回已解析的URL。如果未设置URL修饰符,则返回原始URL。
+		</p>
+
+		<h3>[method:null setURLModifier]( [param:Function callback] )</h3>
+		<p>
+		[page:Function callback] — 设置URL修饰符成功时回调。使用url参数进行回调,并且必须返回 [page:String resolvedURL] 。<br /><br />
+
+		如果设置了回调,则在发送请求之前将向每个资源URL传递回调。回调可以返回最初的URL,也可以返回新URL以覆盖加载行为。
+		此行为可用于从.ZIP、拖拽API和数据URI中加载资源文件。
 		</p>
 		</p>
 
 
+
 		<br /><br />
 		<br /><br />
 		<p>
 		<p>
 			<em>Note: The following methods are designed to be called internally by loaders. You shouldn't call
 			<em>Note: The following methods are designed to be called internally by loaders. You shouldn't call
@@ -183,14 +206,14 @@
 		<p>
 		<p>
 		[page:String url] — 所要加载的url<br /><br />
 		[page:String url] — 所要加载的url<br /><br />
 
 
-           任何使用管理器的加载器都会调用此方法, 当加载器需要开始加载URL时。
+		任何使用管理器的加载器都会调用此方法, 当加载器需要开始加载URL时。
 		</p>
 		</p>
 
 
 		<h3>[method:null itemEnd]( [param:String url] )</h3>
 		<h3>[method:null itemEnd]( [param:String url] )</h3>
 		<p>
 		<p>
 		[page:String url] — 所要加载的url<br /><br />
 		[page:String url] — 所要加载的url<br /><br />
 
 
-            任何使用管理器的加载器都会调用此方法, 当加载器需要加载URL结束时。
+		任何使用管理器的加载器都会调用此方法, 当加载器需要加载URL结束时。
 		</p>
 		</p>
 
 
 
 
@@ -198,30 +221,7 @@
 		<p>
 		<p>
 		[page:String url] — 所要加载的url<br /><br />
 		[page:String url] — 所要加载的url<br /><br />
 
 
-            任何使用管理器的加载器都会调用此方法, 当加载器出现加载错误时。
-		</p>
-
-		<h3>[method:LoadingManager addHandler]( [param:Object regex], [param:Loader loader] )</h3>
-		<p>
-		[page:Object regex] — A regular expression.<br />
-		[page:Loader loader] — The loader.
-		<p>
-		Registers a loader with the given regular expression. Can be used to define what loader should be used in
-		order to load specific files. A typical use case is to overwrite the default loader for textures.
-		</p>
-
-		<h3>[method:LoadingManager removeHandler]( [param:Object regex] )</h3>
-		<p>
-		[page:Object regex] — A regular expression.
-		<p>
-		Removes the loader for the given regular expression.
-		</p>
-
-		<h3>[method:null getHandler]( [param:String file] )</h3>
-		<p>
-		[page:String file] — The file path.
-		<p>
-		Can be used to retrieve the registered loader for the given file path.
+		任何使用管理器的加载器都会调用此方法, 当加载器出现加载错误时。
 		</p>
 		</p>
 
 
 		<h2>源</h2>
 		<h2>源</h2>