Remove JSONLoader from core

birdhello · Nov 23, 2018 · 02d9133 · 02d9133
1 parent 20406bb
commit 02d9133
Show file tree

Hide file tree

Showing 42 changed files with 600 additions and 1,989 deletions.
diff --git a/docs/api/en/animation/AnimationClip.html b/docs/api/en/animation/AnimationClip.html
@@ -96,10 +96,7 @@ <h3>[method:Array CreateClipsFromMorphTargetSequences]( [param:String name], [pa
 		<p>
 			Returns an array of new AnimationClips created from the [page:Geometry.morphTargets morph
 			target sequences] of a geometry, trying to sort morph target names into animation-group-based
-			patterns like "Walk_001, Walk_002, Run_001, Run_002 ..."<br /><br />
-
-			This method is called by the [page:JSONLoader] internally, and it uses
-			[page:.CreateFromMorphTargetSequence CreateFromMorphTargetSequence].
+			patterns like "Walk_001, Walk_002, Run_001, Run_002 ...".
 		</p>
 
 		<h3>[method:AnimationClip CreateFromMorphTargetSequence]( [param:String name], [param:Array morphTargetSequence], [param:Number fps], [param:Boolean noLoop] )</h3>

diff --git a/docs/api/en/loaders/JSONLoader.html b/docs/api/en/loaders/JSONLoader.html
diff --git a/docs/api/en/loaders/ObjectLoader.html b/docs/api/en/loaders/ObjectLoader.html
@@ -13,8 +13,6 @@ <h1>[name]</h1>
 		<p class="desc">
 			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 geometries of type [page:Geometry]. Use [page:JSONLoader] instead for that.<br /><br />
-
 			This uses the [page:FileLoader] internally for loading files.
 		</p>
 
@@ -119,7 +117,6 @@ <h3>[method:Object3D parseGeometries]( [param:Object json] )</h3>
 		[page:Object json] — required. The JSON source to parse.<br /><br />
 
 		This is used [page:.parse] to parse any [page:Geometry geometries] or [page:BufferGeometry buffer geometries]  in the JSON structure.
-		Internally it uses [page:JSONLoader] for geometries and [page:BufferGeometryLoader] for buffer geometries.
 		</p>
 
 		<h3>[method:Object3D parseMaterials]( [param:Object json] )</h3>

diff --git a/docs/api/zh/animation/AnimationClip.html b/docs/api/zh/animation/AnimationClip.html
@@ -91,10 +91,7 @@ <h2>静态方法</h2>
 		<h3>[method:Array CreateClipsFromMorphTargetSequences]( [param:String name], [param:Array morphTargetSequence], [param:Number fps], [param:Boolean noLoop] )</h3>
 		<p>
 			返回从几何体的变形目标序列([page:Geometry.morphTargets morph
-			target sequences])创建的新动画剪辑(AnimationClip)数组，并尝试将变形目标名称分类为基于动画组的模式，如“Walk_001、Walk_002、Run_001、Run_002……”。<br /><br />
-
-			该方法被[page:JSONLoader]内部调用, 并且它使用了
-			[page:.CreateFromMorphTargetSequence CreateFromMorphTargetSequence].
+			target sequences])创建的新动画剪辑(AnimationClip)数组，并尝试将变形目标名称分类为基于动画组的模式，如“Walk_001、Walk_002、Run_001、Run_002……”。
 		</p>
 
 		<h3>[method:AnimationClip CreateFromMorphTargetSequence]( [param:String name], [param:Array morphTargetSequence], [param:Number fps], [param:Boolean noLoop] )</h3>

diff --git a/docs/api/zh/loaders/JSONLoader.html b/docs/api/zh/loaders/JSONLoader.html
diff --git a/docs/api/zh/loaders/ObjectLoader.html b/docs/api/zh/loaders/ObjectLoader.html
@@ -13,8 +13,6 @@ <h1>[name]</h1>
 		<p class="desc">
 			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 geometries of type [page:Geometry]. Use [page:JSONLoader] instead for that.<br /><br />
-
 			此加载器内部使用[page:FileLoader]进行加载文件。
 		</p>
 
@@ -118,7 +116,6 @@ <h3>[method:Object3D parseGeometries]( [param:Object json] )</h3>
 		[page:Object json] — 必选参数，需要被解析的JSON源。<br /><br />
 
             此函数以JSON结构，用[page:.parse]去解析[page:Geometry geometries]或[page:BufferGeometry buffer geometries]。
-            在内部，它使用JSONLoader作为几何加载器，使用BufferGeometryLoader作为几何缓冲区加载器。
 		</p>
 
 		<h3>[method:Object3D parseMaterials]( [param:Object json] )</h3>

diff --git a/docs/list.js b/docs/list.js
@@ -233,7 +233,6 @@ var list = {
 				"FontLoader": "api/en/loaders/FontLoader",
 				"ImageBitmapLoader": "api/en/loaders/ImageBitmapLoader",
 				"ImageLoader": "api/en/loaders/ImageLoader",
-				"JSONLoader": "api/en/loaders/JSONLoader",
 				"Loader": "api/en/loaders/Loader",
 				"LoaderUtils": "api/en/loaders/LoaderUtils",
 				"MaterialLoader": "api/en/loaders/MaterialLoader",
@@ -658,7 +657,6 @@ var list = {
 				"FontLoader": "api/zh/loaders/FontLoader",
 				"ImageBitmapLoader": "api/zh/loaders/ImageBitmapLoader",
 				"ImageLoader": "api/zh/loaders/ImageLoader",
-				"JSONLoader": "api/zh/loaders/JSONLoader",
 				"Loader": "api/zh/loaders/Loader",
 				"LoaderUtils": "api/zh/loaders/LoaderUtils",
 				"MaterialLoader": "api/zh/loaders/MaterialLoader",

diff --git a/docs/manual/en/introduction/Animation-system.html b/docs/manual/en/introduction/Animation-system.html
@@ -107,7 +107,6 @@ <h3>Supported Formats and Loaders</h3>
 		</p>
 
 			<ul>
-				<li>[page:JSONLoader THREE.JSONLoader]</li>
 				<li>[page:ObjectLoader THREE.ObjectLoader]</li>
 				<li>THREE.BVHLoader</li>
 				<li>THREE.ColladaLoader</li>

diff --git a/docs/manual/en/introduction/Loading-3D-models.html b/docs/manual/en/introduction/Loading-3D-models.html
@@ -79,7 +79,7 @@ <h2>Recommended workflow</h2>
 	<h2>Loading</h2>
 
 	<p>
-		Only a few loaders ([page:ObjectLoader] and [page:JSONLoader]) are included by default with
+		Only a few loaders (e.g. [page:ObjectLoader]) are included by default with
 		three.js — others should be added to your page individually. Depending on your
 		preference and comfort with build tools, choose one of the following:
 	</p>

diff --git a/docs/manual/zh/introduction/Animation-system.html b/docs/manual/zh/introduction/Animation-system.html
@@ -32,7 +32,7 @@ <h3>Animation Clips(动画片段)</h3>
 			<br /><br />
 			每个* AnimationClip *通常保存对象的某个活动的数据。 如果
 			mesh是一个字符，例如，可以有一个用于walkcycle的动画片段，第二个
-			跳跃，三分之一的回避等等。		
+			跳跃，三分之一的回避等等。
 		</p>
 
 		<h3>Keyframe Tracks(关键帧轨道)</h3>
@@ -83,11 +83,10 @@ <h3>Supported Formats and Loaders(支持的格式和加载器)</h3>
 		<p class="desc">
 			请注意，并非所有模型格式都包含动画（尤其是OBJ，没有），而且只有一些
 			three.js加载器支持[page：AnimationClip AnimationClip]序列。 以下几个<i>确实</ i>
-			支持此动画类型：		
+			支持此动画类型：
 		</p>
 
 			<ul>
-				<li>[page:JSONLoader THREE.JSONLoader]</li>
 				<li>[page:ObjectLoader THREE.ObjectLoader]</li>
 				<li>THREE.BVHLoader</li>
 				<li>THREE.ColladaLoader</li>