Browse Source

Merge pull request #15251 from Mugen87/dev9

Docs: Updated ObjectLoader page
Michael Herzog 6 years ago
parent
commit
1715e623ec
2 changed files with 8 additions and 12 deletions
  1. 4 6
      docs/api/en/loaders/ObjectLoader.html
  2. 4 6
      docs/api/zh/loaders/ObjectLoader.html

+ 4 - 6
docs/api/en/loaders/ObjectLoader.html

@@ -11,10 +11,9 @@
 		<h1>[name]</h1>
 		<h1>[name]</h1>
 
 
 		<p class="desc">
 		<p class="desc">
-			A loader for loading a JSON resource. Unlike the [page:JSONLoader], this one make use of the
-			<em>.type</em> attributes of objects to map them to their original classes.<br /><br />
+			A loader for loading a JSON resource in the [link:https://github.com/mrdoob/three.js/wiki/JSON-Object-Scene-format-4 JSON Object/Scene format].<br /><br />
 
 
-			Note that this loader can't load [page:Geometries]. Use [page:JSONLoader] instead for that.<br /><br />
+			Note that this loader can't load geometries of type [page:Geometry]. Use [page:JSONLoader] instead for that.<br /><br />
 
 
 			This uses the [page:FileLoader] internally for loading files.
 			This uses the [page:FileLoader] internally for loading files.
 		</p>
 		</p>
@@ -22,10 +21,9 @@
 		<h2>Example</h2>
 		<h2>Example</h2>
 
 
 		<p>
 		<p>
-
-			[example:webgl_animation_scene WebGL / animation / scene]<br />
+			[example:webgl_animation_skinning_blending WebGL / animation / skinning / blending]<br />
 			[example:webgl_loader_json_claraio WebGL / loader / json / claraio]<br />
 			[example:webgl_loader_json_claraio WebGL / loader / json / claraio]<br />
-			[example:webgl_loader_msgpack WebGL / loader / msgpack]
+			[example:webgl_materials_lightmap WebGL / materials / lightmap]
 		</p>
 		</p>
 
 
 		<code>
 		<code>

+ 4 - 6
docs/api/zh/loaders/ObjectLoader.html

@@ -11,10 +11,9 @@
 		<h1>[name]</h1>
 		<h1>[name]</h1>
 
 
 		<p class="desc">
 		<p class="desc">
-			一个用来加载JSON资源的加载器。 不像[page:JSONLoader],这个加载器使用
-			<em>.type</em>对象属性,来映射它自己到源类。<br /><br />
+			A loader for loading a JSON resource in the [link:https://github.com/mrdoob/three.js/wiki/JSON-Object-Scene-format-4 JSON Object/Scene format].<br /><br />
 
 
-			请注意这个加载器不能用来加载[page:Geometries],而是用[page:JSONLoader]进行加载。<br /><br />
+			Note that this loader can't load geometries of type [page:Geometry]. Use [page:JSONLoader] instead for that.<br /><br />
 
 
 			此加载器内部使用[page:FileLoader]进行加载文件。
 			此加载器内部使用[page:FileLoader]进行加载文件。
 		</p>
 		</p>
@@ -22,10 +21,9 @@
 		<h2>例子</h2>
 		<h2>例子</h2>
 
 
 		<p>
 		<p>
-
-			[example:webgl_animation_scene WebGL / animation / scene]<br />
+			[example:webgl_animation_skinning_blending WebGL / animation / skinning / blending]<br />
 			[example:webgl_loader_json_claraio WebGL / loader / json / claraio]<br />
 			[example:webgl_loader_json_claraio WebGL / loader / json / claraio]<br />
-			[example:webgl_loader_msgpack WebGL / loader / msgpack]
+			[example:webgl_materials_lightmap WebGL / materials / lightmap]
 		</p>
 		</p>
 
 
 		<code>
 		<code>