Ver código fonte

Merge remote-tracking branch 'mrdoob/dev' into gltf_loader_request_headers

Wojciech 5 anos atrás
pai
commit
c516ead680
100 arquivos alterados com 839 adições e 739 exclusões
  1. 3 2
      .github/CONTRIBUTING.md
  2. 26 4
      .travis.yml
  3. 7 11
      README.md
  4. 13 11
      build/three.js
  5. 458 533
      build/three.min.js
  6. 13 11
      build/three.module.js
  7. 1 1
      docs/api/en/animation/KeyframeTrack.html
  8. 3 3
      docs/api/en/cameras/StereoCamera.html
  9. 2 1
      docs/api/en/core/Object3D.html
  10. 12 0
      docs/api/en/core/Raycaster.html
  11. 2 2
      docs/api/en/deprecated/DeprecatedList.html
  12. 1 1
      docs/api/en/lights/RectAreaLight.html
  13. 2 2
      docs/api/en/loaders/CompressedTextureLoader.html
  14. 1 1
      docs/api/en/loaders/DataTextureLoader.html
  15. 1 1
      docs/api/en/loaders/managers/LoadingManager.html
  16. 24 3
      docs/api/en/materials/MeshPhysicalMaterial.html
  17. 18 0
      docs/api/en/math/Matrix4.html
  18. 17 4
      docs/api/en/renderers/shaders/UniformsUtils.html
  19. 1 1
      docs/api/en/textures/Texture.html
  20. 1 1
      docs/api/zh/animation/KeyframeTrack.html
  21. 0 1
      docs/api/zh/cameras/OrthographicCamera.html
  22. 3 3
      docs/api/zh/cameras/StereoCamera.html
  23. 3 2
      docs/api/zh/core/Object3D.html
  24. 12 0
      docs/api/zh/core/Raycaster.html
  25. 3 3
      docs/api/zh/deprecated/DeprecatedList.html
  26. 1 1
      docs/api/zh/geometries/TorusKnotBufferGeometry.html
  27. 1 1
      docs/api/zh/lights/RectAreaLight.html
  28. 2 2
      docs/api/zh/loaders/CompressedTextureLoader.html
  29. 1 1
      docs/api/zh/loaders/DataTextureLoader.html
  30. 2 3
      docs/api/zh/loaders/managers/LoadingManager.html
  31. 24 3
      docs/api/zh/materials/MeshPhysicalMaterial.html
  32. 18 0
      docs/api/zh/math/Matrix4.html
  33. 14 3
      docs/api/zh/renderers/shaders/UniformsUtils.html
  34. 2 2
      docs/examples/en/animations/CCDIKSolver.html
  35. 3 3
      docs/examples/en/animations/MMDAnimationHelper.html
  36. 3 3
      docs/examples/en/animations/MMDPhysics.html
  37. 6 6
      docs/examples/en/controls/DeviceOrientationControls.html
  38. 13 2
      docs/examples/en/controls/DragControls.html
  39. 1 1
      docs/examples/en/controls/FirstPersonControls.html
  40. 1 1
      docs/examples/en/controls/FlyControls.html
  41. 2 2
      docs/examples/en/controls/OrbitControls.html
  42. 1 1
      docs/examples/en/controls/PointerLockControls.html
  43. 1 1
      docs/examples/en/controls/TrackballControls.html
  44. 4 2
      docs/examples/en/controls/TransformControls.html
  45. 2 2
      docs/examples/en/exporters/ColladaExporter.html
  46. 2 2
      docs/examples/en/exporters/GLTFExporter.html
  47. 2 2
      docs/examples/en/exporters/PLYExporter.html
  48. 2 2
      docs/examples/en/geometries/ConvexBufferGeometry.html
  49. 2 2
      docs/examples/en/geometries/ConvexGeometry.html
  50. 2 2
      docs/examples/en/geometries/DecalGeometry.html
  51. 1 1
      docs/examples/en/helpers/FaceNormalsHelper.html
  52. 1 1
      docs/examples/en/helpers/RectAreaLightHelper.html
  53. 1 1
      docs/examples/en/helpers/VertexNormalsHelper.html
  54. 1 1
      docs/examples/en/helpers/VertexTangentsHelper.html
  55. 5 5
      docs/examples/en/loaders/BasisTextureLoader.html
  56. 3 3
      docs/examples/en/loaders/DRACOLoader.html
  57. 5 5
      docs/examples/en/loaders/GLTFLoader.html
  58. 2 2
      docs/examples/en/loaders/MMDLoader.html
  59. 1 1
      docs/examples/en/loaders/MTLLoader.html
  60. 2 2
      docs/examples/en/loaders/OBJLoader.html
  61. 1 1
      docs/examples/en/loaders/OBJLoader2.html
  62. 2 2
      docs/examples/en/loaders/PCDLoader.html
  63. 2 2
      docs/examples/en/loaders/PDBLoader.html
  64. 2 2
      docs/examples/en/loaders/PRWMLoader.html
  65. 2 2
      docs/examples/en/loaders/SVGLoader.html
  66. 2 2
      docs/examples/en/loaders/TGALoader.html
  67. 2 2
      docs/examples/en/math/Lut.html
  68. 2 2
      docs/examples/en/math/MeshSurfaceSampler.html
  69. 1 1
      docs/examples/en/math/convexhull/ConvexHull.html
  70. 1 1
      docs/examples/en/math/convexhull/Face.html
  71. 1 1
      docs/examples/en/math/convexhull/HalfEdge.html
  72. 1 1
      docs/examples/en/math/convexhull/VertexList.html
  73. 1 1
      docs/examples/en/math/convexhull/VertexNode.html
  74. 5 5
      docs/examples/en/objects/Lensflare.html
  75. 1 1
      docs/examples/en/postprocessing/EffectComposer.html
  76. 1 1
      docs/examples/en/renderers/CSS2DRenderer.html
  77. 1 1
      docs/examples/en/renderers/CSS3DRenderer.html
  78. 1 1
      docs/examples/en/renderers/SVGRenderer.html
  79. 1 1
      docs/examples/en/utils/BufferGeometryUtils.html
  80. 1 1
      docs/examples/en/utils/SceneUtils.html
  81. 1 1
      docs/examples/en/utils/SkeletonUtils.html
  82. 2 2
      docs/examples/zh/animations/CCDIKSolver.html
  83. 3 3
      docs/examples/zh/animations/MMDAnimationHelper.html
  84. 3 3
      docs/examples/zh/animations/MMDPhysics.html
  85. 1 1
      docs/examples/zh/controls/DeviceOrientationControls.html
  86. 13 2
      docs/examples/zh/controls/DragControls.html
  87. 1 1
      docs/examples/zh/controls/FirstPersonControls.html
  88. 1 1
      docs/examples/zh/controls/FlyControls.html
  89. 2 2
      docs/examples/zh/controls/OrbitControls.html
  90. 1 1
      docs/examples/zh/controls/PointerLockControls.html
  91. 1 1
      docs/examples/zh/controls/TrackballControls.html
  92. 4 2
      docs/examples/zh/controls/TransformControls.html
  93. 2 2
      docs/examples/zh/exporters/ColladaExporter.html
  94. 2 2
      docs/examples/zh/exporters/GLTFExporter.html
  95. 2 2
      docs/examples/zh/exporters/PLYExporter.html
  96. 2 2
      docs/examples/zh/geometries/ConvexBufferGeometry.html
  97. 2 2
      docs/examples/zh/geometries/ConvexGeometry.html
  98. 2 2
      docs/examples/zh/geometries/DecalGeometry.html
  99. 1 1
      docs/examples/zh/helpers/FaceNormalsHelper.html
  100. 1 1
      docs/examples/zh/helpers/RectAreaLightHelper.html

+ 3 - 2
.github/CONTRIBUTING.md

@@ -1,5 +1,5 @@
 
 
-# Help 
+# Help
 #### The issues section is for bug reports and feature requests only. If you need help, please use the [forum](http://discourse.threejs.org/) or [stackoverflow](http://stackoverflow.com/questions/tagged/three.js).
 #### The issues section is for bug reports and feature requests only. If you need help, please use the [forum](http://discourse.threejs.org/) or [stackoverflow](http://stackoverflow.com/questions/tagged/three.js).
 ---
 ---
 # Bugs
 # Bugs
@@ -25,4 +25,5 @@
 2. Fork the repository on GitHub.
 2. Fork the repository on GitHub.
 3. Check the [Contribution Guidelines](https://github.com/mrdoob/three.js/wiki/How-to-contribute-to-three.js).
 3. Check the [Contribution Guidelines](https://github.com/mrdoob/three.js/wiki/How-to-contribute-to-three.js).
 4. Make changes to your clone of the repository.
 4. Make changes to your clone of the repository.
-5. Submit a pull request. Don't include build files in the PR.
+5. If your changes leads to a change in examples, make a new screenshot with `npm run make-screenshot <example_name>`.
+6. Submit a pull request. Don't include build files in the PR.

+ 26 - 4
.travis.yml

@@ -1,5 +1,27 @@
 language: node_js
 language: node_js
-node_js:
-  - node
-script:
-  - npm run travis
+node_js: node
+services: xvfb
+cache: bundler
+
+jobs:
+  include:
+
+    - &lint-n-unit
+      stage: Lint & Unit
+      name: lint
+      script: npm run test-lint
+    - <<: *lint-n-unit
+      name: unit
+      script: npm run test-unit
+
+    - &e2e
+      stage: E2E
+      name: e2e
+      script: npm run test-e2e
+      env: FORCE_COLOR=0 CI=0
+    - <<: *e2e
+      env: FORCE_COLOR=0 CI=1
+    - <<: *e2e
+      env: FORCE_COLOR=0 CI=2
+    - <<: *e2e
+      env: FORCE_COLOR=0 CI=3

+ 7 - 11
README.md

@@ -1,10 +1,9 @@
 three.js
 three.js
 ========
 ========
 
 
-[![NPM package][npm]][npm-url]
+[![NPM Package][npm]][npm-url]
 [![Build Size][build-size]][build-size-url]
 [![Build Size][build-size]][build-size-url]
-[![Build Status][build-status]][build-status-url]
-[![Dependencies][dependencies]][dependencies-url]
+[![NPM Downloads][npm-downloads]][npmtrends-url]
 [![Dev Dependencies][dev-dependencies]][dev-dependencies-url]
 [![Dev Dependencies][dev-dependencies]][dev-dependencies-url]
 [![Language Grade][lgtm]][lgtm-url]
 [![Language Grade][lgtm]][lgtm-url]
 
 
@@ -18,7 +17,6 @@ The aim of the project is to create an easy to use, lightweight, 3D library with
 [Migrating](https://github.com/mrdoob/three.js/wiki/Migration-Guide) &mdash;
 [Migrating](https://github.com/mrdoob/three.js/wiki/Migration-Guide) &mdash;
 [Questions](http://stackoverflow.com/questions/tagged/three.js) &mdash;
 [Questions](http://stackoverflow.com/questions/tagged/three.js) &mdash;
 [Forum](https://discourse.threejs.org/) &mdash;
 [Forum](https://discourse.threejs.org/) &mdash;
-[Gitter](https://gitter.im/mrdoob/three.js) &mdash;
 [Slack](https://join.slack.com/t/threejs/shared_invite/enQtMzYxMzczODM2OTgxLTQ1YmY4YTQxOTFjNDAzYmQ4NjU2YzRhNzliY2RiNDEyYjU2MjhhODgyYWQ5Y2MyZTU3MWNkOGVmOGRhOTQzYTk)
 [Slack](https://join.slack.com/t/threejs/shared_invite/enQtMzYxMzczODM2OTgxLTQ1YmY4YTQxOTFjNDAzYmQ4NjU2YzRhNzliY2RiNDEyYjU2MjhhODgyYWQ5Y2MyZTU3MWNkOGVmOGRhOTQzYTk)
 
 
 ### Usage ###
 ### Usage ###
@@ -72,15 +70,13 @@ If everything went well you should see [this](https://jsfiddle.net/f2Lommf5/).
 [Releases](https://github.com/mrdoob/three.js/releases)
 [Releases](https://github.com/mrdoob/three.js/releases)
 
 
 
 
-[npm]: https://img.shields.io/npm/v/three.svg
+[npm]: https://img.shields.io/npm/v/three
 [npm-url]: https://www.npmjs.com/package/three
 [npm-url]: https://www.npmjs.com/package/three
 [build-size]: https://badgen.net/bundlephobia/minzip/three
 [build-size]: https://badgen.net/bundlephobia/minzip/three
 [build-size-url]: https://bundlephobia.com/result?p=three
 [build-size-url]: https://bundlephobia.com/result?p=three
-[build-status]: https://travis-ci.org/mrdoob/three.js.svg?branch=dev
-[build-status-url]: https://travis-ci.org/mrdoob/three.js
-[dependencies]: https://img.shields.io/david/mrdoob/three.js.svg
-[dependencies-url]: https://david-dm.org/mrdoob/three.js
-[dev-dependencies]: https://img.shields.io/david/dev/mrdoob/three.js.svg
+[npm-downloads]: https://img.shields.io/npm/dw/three
+[npmtrends-url]: https://www.npmtrends.com/three
+[dev-dependencies]: https://img.shields.io/david/dev/mrdoob/three.js
 [dev-dependencies-url]: https://david-dm.org/mrdoob/three.js#info=devDependencies
 [dev-dependencies-url]: https://david-dm.org/mrdoob/three.js#info=devDependencies
-[lgtm]: https://img.shields.io/lgtm/grade/javascript/g/mrdoob/three.js.svg?label=code%20quality
+[lgtm]: https://img.shields.io/lgtm/alerts/github/mrdoob/three.js
 [lgtm-url]: https://lgtm.com/projects/g/mrdoob/three.js/
 [lgtm-url]: https://lgtm.com/projects/g/mrdoob/three.js/

Diferenças do arquivo suprimidas por serem muito extensas
+ 13 - 11
build/three.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 458 - 533
build/three.min.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 13 - 11
build/three.module.js


+ 1 - 1
docs/api/en/animation/KeyframeTrack.html

@@ -58,7 +58,7 @@
 
 
 		<p>
 		<p>
 			Some examples of how to manually create [page:AnimationClip AnimationClips] with different sorts
 			Some examples of how to manually create [page:AnimationClip AnimationClips] with different sorts
-			of KeyframeTracks can be found in the [link:https://threejs.org/examples/js/animation/AnimationClipCreator.js AnimationClipCreator]
+			of KeyframeTracks can be found in the [link:https://threejs.org/examples/jsm/animation/AnimationClipCreator.js AnimationClipCreator]
 			file.
 			file.
 		</p>
 		</p>
 
 

+ 3 - 3
docs/api/en/cameras/StereoCamera.html

@@ -25,9 +25,9 @@
 
 
 		<p>
 		<p>
 		This class is used internally in the files<br /><br />
 		This class is used internally in the files<br /><br />
-		[link:https://github.com/mrdoob/three.js/blob/master/examples/js/effects/AnaglyphEffect.js examples/js/effects/AnaglyphEffect.js]<br /><br />
-		[link:https://github.com/mrdoob/three.js/blob/master/examples/js/effects/ParallaxBarrierEffect.js examples/js/effects/ParallaxBarrierEffect.js]<br /><br />
-		[link:https://github.com/mrdoob/three.js/blob/master/examples/js/effects/StereoEffect.js examples/js/effects/StereoEffect.js]<br /><br />
+		[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/effects/AnaglyphEffect.js examples/jsm/effects/AnaglyphEffect.js]<br /><br />
+		[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/effects/ParallaxBarrierEffect.js examples/jsm/effects/ParallaxBarrierEffect.js]<br /><br />
+		[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/effects/StereoEffect.js examples/jsm/effects/StereoEffect.js]<br /><br />
 		used in the above examples.
 		used in the above examples.
 		</p>
 		</p>
 
 

+ 2 - 1
docs/api/en/core/Object3D.html

@@ -61,7 +61,8 @@
 		<h3>[property:Layers layers]</h3>
 		<h3>[property:Layers layers]</h3>
 		<p>
 		<p>
 		The layer membership of the object. The object is only visible if it has at least one
 		The layer membership of the object. The object is only visible if it has at least one
-		layer in common with the [page:Camera] in use.
+		layer in common with the [page:Camera] in use. This property can also be used to filter out
+		unwanted objects in ray-intersection tests when using [page:Raycaster].
 		</p>
 		</p>
 
 
 		<h3>[property:Matrix4 matrix]</h3>
 		<h3>[property:Matrix4 matrix]</h3>

+ 12 - 0
docs/api/en/core/Raycaster.html

@@ -107,6 +107,18 @@
 		Defaults to null.
 		Defaults to null.
 		</p>
 		</p>
 
 
+		<h3>[property:Layers layers]</h3>
+		<p>
+		Used by [name] to selectively ignore 3D objects when performing intersection tests. The following code example ensures that
+		only 3D objects on layer *1* will be honored by the instance of [name].
+
+		<code>
+		raycaster.layers.set( 1 );
+		object.layers.enable( 1 );
+		</code>
+
+		</p>
+
 		<h3>[property:Object params]</h3>
 		<h3>[property:Object params]</h3>
 		<p>
 		<p>
 		An object with the following properties:
 		An object with the following properties:

+ 2 - 2
docs/api/en/deprecated/DeprecatedList.html

@@ -473,7 +473,7 @@
 
 
 		<h3>[page:LensFlare]</h3>
 		<h3>[page:LensFlare]</h3>
 		<p>
 		<p>
-			LensFlare has been moved to [link:https://github.com/mrdoob/three.js/blob/master/examples/js/objects/Lensflare.js /examples/js/objects/Lensflare.js].
+			LensFlare has been moved to [link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/objects/Lensflare.js /examples/jsm/objects/Lensflare.js].
 		</p>
 		</p>
 
 
 
 
@@ -509,7 +509,7 @@
 		<h3>[page:Projector]</h3>
 		<h3>[page:Projector]</h3>
 		<p>
 		<p>
 			Projector has been moved to
 			Projector has been moved to
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/renderers/Projector.js 	/examples/js/renderers/Projector.js].<br /><br />
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/renderers/Projector.js 	/examples/jsm/renderers/Projector.js].<br /><br />
 
 
 			Projector.projectVector() is now [page:Vector.project]().<br /><br />
 			Projector.projectVector() is now [page:Vector.project]().<br /><br />
 
 

+ 1 - 1
docs/api/en/lights/RectAreaLight.html

@@ -20,7 +20,7 @@
 			<ul>
 			<ul>
 				<li>There is no shadow support.</li>
 				<li>There is no shadow support.</li>
 				<li>Only [page:MeshStandardMaterial MeshStandardMaterial] and [page:MeshPhysicalMaterial MeshPhysicalMaterial] are supported.</li>
 				<li>Only [page:MeshStandardMaterial MeshStandardMaterial] and [page:MeshPhysicalMaterial MeshPhysicalMaterial] are supported.</li>
-				<li>You have to include [link:https://threejs.org/examples/js/lights/RectAreaLightUniformsLib.js RectAreaLightUniformsLib] into your scene and call *init()*.</li>
+				<li>You have to include [link:https://threejs.org/examples/jsm/lights/RectAreaLightUniformsLib.js RectAreaLightUniformsLib] into your scene and call *init()*.</li>
 			</ul>
 			</ul>
 		</p>
 		</p>
 
 

+ 2 - 2
docs/api/en/loaders/CompressedTextureLoader.html

@@ -20,8 +20,8 @@
 		<h2>Examples</h2>
 		<h2>Examples</h2>
 
 
 		<p>
 		<p>
-			See the [link:https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/DDSLoader.js DDSLoader]
-			and [link:https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/PVRLoader.js PVRLoader]
+			See the [link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/loaders/DDSLoader.js DDSLoader]
+			and [link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/loaders/PVRLoader.js PVRLoader]
 			for examples of derived classes.
 			for examples of derived classes.
 		</p>
 		</p>
 
 

+ 1 - 1
docs/api/en/loaders/DataTextureLoader.html

@@ -21,7 +21,7 @@
 		<h2>Examples</h2>
 		<h2>Examples</h2>
 
 
 		<p>
 		<p>
-			See the [link:https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/RGBELoader.js RGBELoader]
+			See the [link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/loaders/RGBELoader.js RGBELoader]
 			for an example of a derived class.
 			for an example of a derived class.
 		</p>
 		</p>
 
 

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

@@ -25,7 +25,7 @@
 		<p>
 		<p>
 			[example:webgl_loader_fbx WebGL / loader / fbx]<br />
 			[example:webgl_loader_fbx WebGL / loader / fbx]<br />
 			[example:webgl_loader_obj WebGL / loader / obj]<br />
 			[example:webgl_loader_obj WebGL / loader / obj]<br />
-			[example:webgl_materials_reflectivity WebGL / materials / reflectivity]<br />
+			[example:webgl_materials_physical_reflectivity WebGL / materials / physical / reflectivity]<br />
 			[example:webgl_postprocessing_outline WebGL / postprocesing / outline]
 			[example:webgl_postprocessing_outline WebGL / postprocesing / outline]
 		</p>
 		</p>
 
 

+ 24 - 3
docs/api/en/materials/MeshPhysicalMaterial.html

@@ -39,7 +39,9 @@
 		<h2>Examples</h2>
 		<h2>Examples</h2>
 		<p>
 		<p>
 			[example:webgl_materials_variations_physical materials / variations / physical]<br />
 			[example:webgl_materials_variations_physical materials / variations / physical]<br />
-			[example:webgl_materials_reflectivity materials / reflectivity]
+			[example:webgl_materials_physical_clearcoat materials / physical / clearcoat]<br />
+			[example:webgl_materials_physical_reflectivity materials / physical / reflectivity]<br />
+			[example:webgl_materials_physical_transparency materials / physical / transparency]
 		</p>
 		</p>
 
 
 		<h2>Constructor</h2>
 		<h2>Constructor</h2>
@@ -59,11 +61,19 @@
 
 
 		<h3>[property:Float clearcoat]</h3>
 		<h3>[property:Float clearcoat]</h3>
 		<p>
 		<p>
-		Clearcoat level, from *0.0* to *1.0*. Default is *0.0*.
+		Represents the thickness of the clear coat layer, from *0.0* to *1.0*. You can use clear coat related properties to enable multilayer
+		materials that have a thin translucent layer over the base layer. Typical examples for this model are car paints or acrylic.
+		Default is *0.0*.
 		</p>
 		</p>
 
 
+		<h3>[property:Float clearcoatNormalMap]</h3>
+		<p>Can be used to enable independent normals for the clear coat layer. Default is *null*.</p>
+
+		<h3>[property:Vector2 clearcoatNormalScale]</h3>
+		<p>How much [page:.clearcoatNormalMap] affects the clear coat layer, from *(0,0)* to *(1,1)*. Default is *(1,1)*.</p>
+
 		<h3>[property:Float clearcoatRoughness]</h3>
 		<h3>[property:Float clearcoatRoughness]</h3>
-		<p>How rough the clearcoat appears, from *0.0* to *1.0*. Default is *0.0*.</p>
+		<p>Roughness of the clear coat layer, from *0.0* to *1.0*. Default is *0.0*.</p>
 
 
 		<h3>[property:Object defines]</h3>
 		<h3>[property:Object defines]</h3>
 		<p>An object of the form:
 		<p>An object of the form:
@@ -86,6 +96,17 @@
 		This models the reflectivity of non-metallic materials. It has no effect when [page:MeshStandardMaterial.metalness metalness] is *1.0*
 		This models the reflectivity of non-metallic materials. It has no effect when [page:MeshStandardMaterial.metalness metalness] is *1.0*
 		</p>
 		</p>
 
 
+		<h3>[property:Float transparency]</h3>
+		<p>
+		Degree of transparency, from *0.0* to *1.0*. Default is *0.0*.<br />
+		
+		Thin, transparent or semitransparent, plastic or glass materials remain largely reflective even if they are mostly transparent.
+		
+		The transparency property can be used to model these materials.<br />
+		
+		When transparency is non-zero, [page:Material.opacity opacity] should be set to *1*.
+		</p>
+
 		<h2>Methods</h2>
 		<h2>Methods</h2>
 		<p>See the base [page:Material] and [page:MeshStandardMaterial] classes for common methods.</p>
 		<p>See the base [page:Material] and [page:MeshStandardMaterial] classes for common methods.</p>
 
 

+ 18 - 0
docs/api/en/math/Matrix4.html

@@ -77,6 +77,24 @@ m.elements = [ 11, 21, 31, 41,
 		code, you'll have to take the [link:https://en.wikipedia.org/wiki/Transpose transpose] of any matrices outlined here to make sense of the calculations.
 		code, you'll have to take the [link:https://en.wikipedia.org/wiki/Transpose transpose] of any matrices outlined here to make sense of the calculations.
 		</p>
 		</p>
 
 
+		<h2>Extracting position, rotation and scale</h2>
+		<p>
+			There are several options available for extracting position, rotation and scale from a Matrix4.
+			<ul>
+				<li>
+					[page:Vector3.setFromMatrixPosition]: can be used to extract the translation component.
+				</li>
+				<li>
+					[page:Vector3.setFromMatrixScale]: can be used to extract the scale component.
+				</li>
+				<li>
+					[page:Quaternion.setFromRotationMatrix], [page:Euler.setFromRotationMatrix] or [page:.extractRotation extractRotation] can be used to extract the rotation component.
+				</li>
+				<li>
+					[page:.decompose decompose] can be used to extract position, rotation and scale all at once.
+				</li>
+			</ul>
+		</p>
 
 
 		<h2>Constructor</h2>
 		<h2>Constructor</h2>
 
 

+ 17 - 4
docs/api/en/renderers/shaders/UniformsUtils.html

@@ -10,15 +10,28 @@
 	<body>
 	<body>
 		<h1>[name]</h1>
 		<h1>[name]</h1>
 
 
-		<p class="desc">Uniform Utilities. Support merging and cloning of uniform variables</p>
-
-		<h2>Properties</h2>
+		<p class="desc">
+			Provides utility functions for managing uniforms.
+		</p>
 
 
+		<h2>Methods</h2>
 
 
+		<h3>[method:Object clone]( [param:Object src] )</h3>
+		<p>
+		src -- An object representing uniform definitions.<br /><br />
 
 
-		<h2>Methods</h2>
+		Clones the given uniform definitions by performing a deep-copy. That means if
+		the [page:Uniform.value value] of a uniform refers to an object like a [page:Vector3]
+		or [page:Texture], the cloned uniform will refer to a new object reference.
+		</p>
 
 
+		<h3>[method:Object merge]( [param:Array uniforms] )</h3>
+		<p>
+		uniforms -- An array of objects containing uniform definitions.<br /><br />
 
 
+		Merges the given uniform definitions into a single object. Since the method
+		internally uses [page:.clone](), it performs a deep-copy when producing the
+		merged uniform definitions.
 
 
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 

+ 1 - 1
docs/api/en/textures/Texture.html

@@ -191,7 +191,7 @@
 
 
 		<h3>[property:boolean premultiplyAlpha]</h3>
 		<h3>[property:boolean premultiplyAlpha]</h3>
 		<p>
 		<p>
-		If set to *true*, the alpha channel, if present, is multiplied into the color channels when the texture is uploaded to the GPU. Defaut is *false*.<br /><br />
+		If set to *true*, the alpha channel, if present, is multiplied into the color channels when the texture is uploaded to the GPU. Default is *false*.<br /><br />
 
 
 		Note that this property has no effect for [link:https://developer.mozilla.org/de/docs/Web/API/ImageBitmap ImageBitmap].
 		Note that this property has no effect for [link:https://developer.mozilla.org/de/docs/Web/API/ImageBitmap ImageBitmap].
 		You need to configure on bitmap creation instead. See [page:ImageBitmapLoader].
 		You need to configure on bitmap creation instead. See [page:ImageBitmapLoader].

+ 1 - 1
docs/api/zh/animation/KeyframeTrack.html

@@ -49,7 +49,7 @@
 		</ul>
 		</ul>
 
 
 		<p>
 		<p>
-			可以在[link:https://threejs.org/examples/js/animation/AnimationClipCreator.js AnimationClipCreator]文件中找到用不同类型的关键帧轨道创建动画剪辑([page:AnimationClip AnimationClips])的示例。
+			可以在[link:https://threejs.org/examples/jsm/animation/AnimationClipCreator.js AnimationClipCreator]文件中找到用不同类型的关键帧轨道创建动画剪辑([page:AnimationClip AnimationClips])的示例。
 		</p>
 		</p>
 
 
 		<p>
 		<p>

+ 0 - 1
docs/api/zh/cameras/OrthographicCamera.html

@@ -34,7 +34,6 @@
 		<p>[example:webgl_rtt rtt ]</p>
 		<p>[example:webgl_rtt rtt ]</p>
 		<p>[example:webgl_shaders_tonemapping shaders / tonemapping ]</p>
 		<p>[example:webgl_shaders_tonemapping shaders / tonemapping ]</p>
 		<p>[example:webgl_shadowmap shadowmap ]</p>
 		<p>[example:webgl_shadowmap shadowmap ]</p>
-		<p>[example:webgl_terrain_dynamic terrain / dynamic ]</p>
 
 
 		<code>var camera = new THREE.OrthographicCamera( width / - 2, width / 2, height / 2, height / - 2, 1, 1000 );
 		<code>var camera = new THREE.OrthographicCamera( width / - 2, width / 2, height / 2, height / - 2, 1, 1000 );
 scene.add( camera );</code>
 scene.add( camera );</code>

+ 3 - 3
docs/api/zh/cameras/StereoCamera.html

@@ -25,9 +25,9 @@
 
 
 		<p>
 		<p>
 			这些类在以上示例中的文件内部使用:<br /><br />
 			这些类在以上示例中的文件内部使用:<br /><br />
-		[link:https://github.com/mrdoob/three.js/blob/master/examples/js/effects/AnaglyphEffect.js examples/js/effects/AnaglyphEffect.js]<br /><br />
-		[link:https://github.com/mrdoob/three.js/blob/master/examples/js/effects/ParallaxBarrierEffect.js examples/js/effects/ParallaxBarrierEffect.js]<br /><br />
-		[link:https://github.com/mrdoob/three.js/blob/master/examples/js/effects/StereoEffect.js examples/js/effects/StereoEffect.js]<br /><br />
+		[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/effects/AnaglyphEffect.js examples/jsm/effects/AnaglyphEffect.js]<br /><br />
+		[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/effects/ParallaxBarrierEffect.js examples/jsm/effects/ParallaxBarrierEffect.js]<br /><br />
+		[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/effects/StereoEffect.js examples/jsm/effects/StereoEffect.js]<br /><br />
 		</p>
 		</p>
 
 
 
 

+ 3 - 2
docs/api/zh/core/Object3D.html

@@ -59,7 +59,8 @@
 	<h3>[property:Layers layers]</h3>
 	<h3>[property:Layers layers]</h3>
 	<p>
 	<p>
 		物体的层级关系。
 		物体的层级关系。
-		物体只有和一个正在使用的[page:Camera]至少在同一个层时才可见。
+		物体只有和一个正在使用的[page:Camera]至少在同一个层时才可见。This property can also be used to filter out
+		unwanted objects in ray-intersection tests when using [page:Raycaster].
 	</p>
 	</p>
 
 
 	<h3>[property:Matrix4 matrix]</h3>
 	<h3>[property:Matrix4 matrix]</h3>
@@ -199,7 +200,7 @@
 	<h3>[method:Object3D applyQuaternion]( [param:Quaternion quaternion] )</h3>
 	<h3>[method:Object3D applyQuaternion]( [param:Quaternion quaternion] )</h3>
 	<p>对当前物体应用由四元数所表示的变换。</p>
 	<p>对当前物体应用由四元数所表示的变换。</p>
 
 
-	
+
 	<h3>[method:this attach]( [param:Object3D object] )</h3>
 	<h3>[method:this attach]( [param:Object3D object] )</h3>
 	<p>将*object*作为子级来添加到该对象中,同时保持该object的世界变换。</p>
 	<p>将*object*作为子级来添加到该对象中,同时保持该object的世界变换。</p>
 
 

+ 12 - 0
docs/api/zh/core/Raycaster.html

@@ -105,6 +105,18 @@
 		Defaults to null.
 		Defaults to null.
 		</p>
 		</p>
 
 
+		<h3>[property:Layers layers]</h3>
+		<p>
+		Used by [name] to selectively ignore 3D objects when performing intersection tests. The following code example ensures that
+		only 3D objects on layer *1* will be honored by the instance of [name].
+
+		<code>
+		raycaster.layers.set( 1 );
+		object.layers.enable( 1 );
+		</code>
+
+		</p>
+
 		<h3>[property:Object params]</h3>
 		<h3>[property:Object params]</h3>
 		<p>
 		<p>
 			具有以下属性的对象:<code>
 			具有以下属性的对象:<code>

+ 3 - 3
docs/api/zh/deprecated/DeprecatedList.html

@@ -454,7 +454,7 @@
 
 
 		<h3>[page:LensFlare]</h3>
 		<h3>[page:LensFlare]</h3>
 		<p>
 		<p>
-			LensFlare 已被移动到了 [link:https://github.com/mrdoob/three.js/blob/master/examples/js/objects/Lensflare.js /examples/js/objects/Lensflare.js].
+			LensFlare 已被移动到了 [link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/objects/Lensflare.js /examples/jsm/objects/Lensflare.js].
 		</p>
 		</p>
 
 
 
 
@@ -484,13 +484,13 @@
 
 
 		<h3>[page:Projector]</h3>
 		<h3>[page:Projector]</h3>
 		<p>
 		<p>
-			CanvasRenderer 已被移动到了 [link:https://github.com/mrdoob/three.js/blob/master/examples/js/renderers/CanvasRenderer.js /examples/js/renderers/CanvasRenderer.js].
+			CanvasRenderer has been removed.
 		</p>
 		</p>
 
 
 		<h3>[page:Projector]</h3>
 		<h3>[page:Projector]</h3>
 		<p>
 		<p>
 			Projector 已被移动到了
 			Projector 已被移动到了
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/renderers/Projector.js 	/examples/js/renderers/Projector.js]。<br /><br />
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/renderers/Projector.js 	/examples/jsm/renderers/Projector.js]。<br /><br />
 
 
 			Projector.projectVector() 现在是 [page:Vector.project]()。<br /><br />
 			Projector.projectVector() 现在是 [page:Vector.project]()。<br /><br />
 
 

+ 1 - 1
docs/api/zh/geometries/TorusKnotBufferGeometry.html

@@ -10,7 +10,7 @@
 	<body>
 	<body>
 		[page:BufferGeometry] &rarr;
 		[page:BufferGeometry] &rarr;
 
 
-		<h1>圆环缓冲几何体([name])</h1>
+		<h1>圆环缓冲扭结几何体([name])</h1>
 
 
 		<p class="desc">This is the [page:BufferGeometry] port of [page:TorusKnotGeometry].</p>
 		<p class="desc">This is the [page:BufferGeometry] port of [page:TorusKnotGeometry].</p>
 
 

+ 1 - 1
docs/api/zh/lights/RectAreaLight.html

@@ -19,7 +19,7 @@
 			<ul>
 			<ul>
 				<li>不支持阴影。</li>
 				<li>不支持阴影。</li>
 				<li>只支持 [page:MeshStandardMaterial MeshStandardMaterial] 和 [page:MeshPhysicalMaterial MeshPhysicalMaterial] 两种材质。</li>
 				<li>只支持 [page:MeshStandardMaterial MeshStandardMaterial] 和 [page:MeshPhysicalMaterial MeshPhysicalMaterial] 两种材质。</li>
-				<li>你必须在你的场景中加入 [link:https://threejs.org/examples/js/lights/RectAreaLightUniformsLib.js RectAreaLightUniformsLib] ,并调用*init()*。</li>
+				<li>你必须在你的场景中加入 [link:https://threejs.org/examples/jsm/lights/RectAreaLightUniformsLib.js RectAreaLightUniformsLib] ,并调用*init()*。</li>
 			</ul>
 			</ul>
 		</p>
 		</p>
 
 

+ 2 - 2
docs/api/zh/loaders/CompressedTextureLoader.html

@@ -20,8 +20,8 @@
 		<h2>例子</h2>
 		<h2>例子</h2>
 
 
 		<p>
 		<p>
-			请参考[link:https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/DDSLoader.js DDSLoader]
-			和[link:https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/PVRLoader.js PVRLoader]
+			请参考[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/loaders/DDSLoader.js DDSLoader]
+			和[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/loaders/PVRLoader.js PVRLoader]
 			子类的例子
 			子类的例子
 		</p>
 		</p>
 
 

+ 1 - 1
docs/api/zh/loaders/DataTextureLoader.html

@@ -21,7 +21,7 @@
 		<h2>例子</h2>
 		<h2>例子</h2>
 
 
 		<p>
 		<p>
-			请参考[link:https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/RGBELoader.js RGBELoader]
+			请参考[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/loaders/RGBELoader.js RGBELoader]
 			这个子类的例子。
 			这个子类的例子。
 		</p>
 		</p>
 
 

+ 2 - 3
docs/api/zh/loaders/managers/LoadingManager.html

@@ -25,9 +25,8 @@
 		<p>
 		<p>
 			[example:webgl_loader_fbx WebGL / loader / fbx]<br />
 			[example:webgl_loader_fbx WebGL / loader / fbx]<br />
 			[example:webgl_loader_obj WebGL / loader / obj]<br />
 			[example:webgl_loader_obj WebGL / loader / obj]<br />
-			[example:webgl_materials_reflectivity WebGL / materials / reflectivity]<br />
-			[example:webgl_postprocessing_outline WebGL / postprocesing / outline]<br />
-			[example:webgl_terrain_dynamic WebGL / terrain / dynamic]
+			[example:webgl_materials_physical_reflectivity WebGL / materials / physical / reflectivity]<br />
+			[example:webgl_postprocessing_outline WebGL / postprocesing / outline]
 		</p>
 		</p>
 
 
 		<p>
 		<p>

+ 24 - 3
docs/api/zh/materials/MeshPhysicalMaterial.html

@@ -38,7 +38,9 @@
 
 
 		<p>
 		<p>
 			[example:webgl_materials_variations_physical materials / variations / physical]<br />
 			[example:webgl_materials_variations_physical materials / variations / physical]<br />
-			[example:webgl_materials_reflectivity materials / reflectivity]
+			[example:webgl_materials_physical_clearcoat materials / physical / clearcoat]<br />
+			[example:webgl_materials_physical_reflectivity materials / physical / reflectivity]<br />
+			[example:webgl_materials_physical_transparency materials / physical / transparency]
 		</p>
 		</p>
 
 
 		<h2>构造函数(Constructor)</h2>
 		<h2>构造函数(Constructor)</h2>
@@ -55,11 +57,19 @@
 
 
 		<h3>[property:Float clearcoat]</h3>
 		<h3>[property:Float clearcoat]</h3>
 		<p>
 		<p>
-			Clearcoat级别,从*0.0*到*1.0*。默认值为*0.0*。
+		Represents the thickness of the clear coat layer, from *0.0* to *1.0*. You can use clear coat related properties to enable multilayer
+		materials that have a thin translucent layer over the base layer. Typical examples for this model are car paints or acrylic.
+		Default is *0.0*.
 		</p>
 		</p>
 
 
+		<h3>[property:Float clearcoatNormalMap]</h3>
+		<p>Can be used to enable independent normals for the clear coat layer. Default is *null*.</p>
+
+		<h3>[property:Vector2 clearcoatNormalScale]</h3>
+		<p>How much [page:.clearcoatNormalMap] affects the clear coat layer, from *(0,0)* to *(1,1)*. Default is *(1,1)*.</p>
+
 		<h3>[property:Float clearcoatRoughness]</h3>
 		<h3>[property:Float clearcoatRoughness]</h3>
-		<p> clearcoat看起来的粗糙程度,从*0.0*到*1.0*。默认值为*0.0*。</p>
+		<p>Roughness of the clear coat layer, from *0.0* to *1.0*. Default is *0.0*.</p>
 
 
 		<h3>[property:Object defines]</h3>
 		<h3>[property:Object defines]</h3>
 		<p> 如下形式的对象:
 		<p> 如下形式的对象:
@@ -79,6 +89,17 @@
 			这模拟了非金属材质的反射率。当[page:MeshStandardMaterial]为*1.0*时,此属性无效。
 			这模拟了非金属材质的反射率。当[page:MeshStandardMaterial]为*1.0*时,此属性无效。
 		</p>
 		</p>
 
 
+		<h3>[property:Float transparency]</h3>
+		<p>
+		Degree of transparency, from *0.0* to *1.0*. Default is *0.0*.<br />
+		
+		Thin, transparent or semitransparent, plastic or glass materials remain largely reflective even if they are mostly transparent.
+		
+		The transparency property can be used to model these materials.<br />
+		
+		When transparency is non-zero, [page:Material.opacity opacity] should be set to *1*.
+		</p>
+
 		<h2>方法(Methods)</h2>
 		<h2>方法(Methods)</h2>
 		<p>共有方法请参见其基类[page:Material] 和[page:MeshStandardMaterial]。</p>
 		<p>共有方法请参见其基类[page:Material] 和[page:MeshStandardMaterial]。</p>
 
 

+ 18 - 0
docs/api/zh/math/Matrix4.html

@@ -71,6 +71,24 @@ m.elements = [ 11, 21, 31, 41,
 		请记住,如果您正在阅读源代码,您必须对这里列出的任何矩阵进行转置[link:https://en.wikipedia.org/wiki/Transpose transpose],以理解计算。
 		请记住,如果您正在阅读源代码,您必须对这里列出的任何矩阵进行转置[link:https://en.wikipedia.org/wiki/Transpose transpose],以理解计算。
 		</p>
 		</p>
 
 
+		<h2>Extracting position, rotation and scale</h2>
+		<p>
+			There are several options available for extracting position, rotation and scale from a Matrix4.
+			<ul>
+				<li>
+					[page:Vector3.setFromMatrixPosition]: can be used to extract the translation component.
+				</li>
+				<li>
+					[page:Vector3.setFromMatrixScale]: can be used to extract the scale component.
+				</li>
+				<li>
+					[page:Quaternion.setFromRotationMatrix], [page:Euler.setFromRotationMatrix] or [page:.extractRotation extractRotation] can be used to extract the rotation component.
+				</li>
+				<li>
+					[page:.decompose decompose] can be used to extract position, rotation and scale all at once.
+				</li>
+			</ul>
+		</p>
 
 
 		<h2>构造器(Constructor)</h2>
 		<h2>构造器(Constructor)</h2>
 
 

+ 14 - 3
docs/api/zh/renderers/shaders/UniformsUtils.html

@@ -12,13 +12,24 @@
 
 
 		<p class="desc">Uniform工具. 支持uniform变量的合并和克隆</p>
 		<p class="desc">Uniform工具. 支持uniform变量的合并和克隆</p>
 
 
-		<h2>属性</h2>
-
+		<h2>方法</h2>
 
 
+		<h3>[method:Object clone]( [param:Object src] )</h3>
+		<p>
+		src -- An object representing uniform definitions.<br /><br />
 
 
-		<h2>方法</h2>
+		Clones the given uniform definitions by performing a deep-copy. That means if
+		the [page:Uniform.value value] of a uniform refers to an object like a [page:Vector3]
+		or [page:Texture], the cloned uniform will refer to a new object reference.
+		</p>
 
 
+		<h3>[method:Object merge]( [param:Array uniforms] )</h3>
+		<p>
+		uniforms -- An array of objects containing uniform definitions.<br /><br />
 
 
+		Merges the given uniform definitions into a single object. Since the method
+		internally uses [page:.clone](), it performs a deep-copy when producing the
+		merged uniform definitions.
 
 
 		<h2>源码</h2>
 		<h2>源码</h2>
 
 

+ 2 - 2
docs/examples/en/animations/CCDIKSolver.html

@@ -21,7 +21,7 @@
 		var ikSolver;
 		var ikSolver;
 
 
 		// Load MMD resources and instantiate CCDIKSolver
 		// Load MMD resources and instantiate CCDIKSolver
-		new THREE.MMDLoader().load(
+		new MMDLoader().load(
 			'models/mmd/miku.pmd',
 			'models/mmd/miku.pmd',
 			function ( mesh ) {
 			function ( mesh ) {
 
 
@@ -98,7 +98,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/animation/CCDIKSolver.js examples/js/animation/CCDIKSolver.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/animation/CCDIKSolver.js examples/jsm/animation/CCDIKSolver.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 3 - 3
docs/examples/en/animations/MMDAnimationHelper.html

@@ -19,10 +19,10 @@
 
 
 		<code>
 		<code>
 		// Instantiate a helper
 		// Instantiate a helper
-		var helper = new THREE.MMDAnimationHelper();
+		var helper = new MMDAnimationHelper();
 
 
 		// Load MMD resources and add to helper
 		// Load MMD resources and add to helper
-		new THREE.MMDLoader().loadWithAnimation(
+		new MMDLoader().loadWithAnimation(
 			'models/mmd/miku.pmd',
 			'models/mmd/miku.pmd',
 			'models/mmd/dance.vmd',
 			'models/mmd/dance.vmd',
 			function ( mmd ) {
 			function ( mmd ) {
@@ -165,7 +165,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/animation/MMDAnimationHelper.js examples/js/animation/MMDAnimationHelper.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/animation/MMDAnimationHelper.js examples/jsm/animation/MMDAnimationHelper.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 3 - 3
docs/examples/en/animations/MMDPhysics.html

@@ -20,11 +20,11 @@
 		var physics;
 		var physics;
 
 
 		// Load MMD resources and instantiate MMDPhysics
 		// Load MMD resources and instantiate MMDPhysics
-		new THREE.MMDLoader().load(
+		new MMDLoader().load(
 			'models/mmd/miku.pmd',
 			'models/mmd/miku.pmd',
 			function ( mesh ) {
 			function ( mesh ) {
 
 
-				physics = new THREE.MMDPhysics( mesh )
+				physics = new MMDPhysics( mesh )
 				scene.add( mesh );
 				scene.add( mesh );
 
 
 			}
 			}
@@ -108,7 +108,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/animation/MMDPhysics.js examples/js/animation/MMDPhysics.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/animation/MMDPhysics.js examples/jsm/animation/MMDPhysics.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 6 - 6
docs/examples/en/controls/DeviceOrientationControls.html

@@ -12,7 +12,7 @@
 		<h1>[name]</h1>
 		<h1>[name]</h1>
 
 
 		<p class="desc">
 		<p class="desc">
-			Can be used to orient an object based on the mobile device's orientation.
+			Can be used to orient the camera based on the mobile device's orientation.
 		</p>
 		</p>
 
 
 		<h2>Example</h2>
 		<h2>Example</h2>
@@ -21,10 +21,10 @@
 
 
 		<h2>Constructor</h2>
 		<h2>Constructor</h2>
 
 
-		<h3>[name]( [param:Object3D object] )</h3>
+		<h3>[name]( [param:Camera object] )</h3>
 		<p>
 		<p>
 			<p>
 			<p>
-				[page:Object3D object]: The object to be controlled.
+				[page:Camera object]: The camera to be controlled.
 			</p>
 			</p>
 			<p>
 			<p>
 				Creates a new instance of [name].
 				Creates a new instance of [name].
@@ -48,9 +48,9 @@
 			Whether or not the controls are enabled.
 			Whether or not the controls are enabled.
 		</p>
 		</p>
 
 
-		<h3>[property:Object3D object]</h3>
+		<h3>[property:Camera object]</h3>
 		<p>
 		<p>
-			The object to be controlled.
+			The camera to be controlled.
 		</p>
 		</p>
 
 
 		<h3>[property:Number screenOrientation]</h3>
 		<h3>[property:Number screenOrientation]</h3>
@@ -83,7 +83,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/controls/DeviceOrientationControls.js examples/js/controls/DeviceOrientationControls.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/controls/DeviceOrientationControls.js examples/jsm/controls/DeviceOrientationControls.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 13 - 2
docs/examples/en/controls/DragControls.html

@@ -21,7 +21,7 @@
 		<p>[example:misc_controls_drag misc / controls / drag ]</p>
 		<p>[example:misc_controls_drag misc / controls / drag ]</p>
 
 
 		<code>
 		<code>
-var controls = new THREE.DragControls( objects, camera, renderer.domElement );
+var controls = new DragControls( objects, camera, renderer.domElement );
 
 
 // add event listener to highlight dragged objects
 // add event listener to highlight dragged objects
 
 
@@ -91,6 +91,12 @@ controls.addEventListener( 'dragend', function ( event ) {
 			Whether or not the controls are enabled.
 			Whether or not the controls are enabled.
 		</p>
 		</p>
 
 
+		<h3>[property:Boolean transformGroup]</h3>
+		<p>
+			This option only works if the [page:DragControls.objects] array contains a single draggable group object.
+			If set to *true*, [name] does not transform individual objects but the entire group. Default is *false*.
+		</p>
+
 		<h2>Methods</h2>
 		<h2>Methods</h2>
 
 
 		<p>See the base [page:EventDispatcher] class for common methods.</p>
 		<p>See the base [page:EventDispatcher] class for common methods.</p>
@@ -110,10 +116,15 @@ controls.addEventListener( 'dragend', function ( event ) {
 			Should be called if the controls is no longer required.
 			Should be called if the controls is no longer required.
 		</p>
 		</p>
 
 
+		<h3>[method:Array getObjects] ()</h3>
+		<p>
+			Returns the array of draggable objects.
+		</p>
+
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/controls/DragControls.js examples/js/controls/DragControls.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/controls/DragControls.js examples/jsm/controls/DragControls.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/en/controls/FirstPersonControls.html

@@ -159,7 +159,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/controls/FirstPersonControls.js examples/js/controls/FirstPersonControls.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/controls/FirstPersonControls.js examples/jsm/controls/FirstPersonControls.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/en/controls/FlyControls.html

@@ -88,7 +88,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/controls/FlyControls.js examples/js/controls/FlyControls.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/controls/FlyControls.js examples/jsm/controls/FlyControls.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 2 - 2
docs/examples/en/controls/OrbitControls.html

@@ -32,7 +32,7 @@ var scene = new THREE.Scene();
 
 
 var camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 10000 );
 var camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 10000 );
 
 
-var controls = new THREE.OrbitControls( camera, renderer.domElement );
+var controls = new OrbitControls( camera, renderer.domElement );
 
 
 //controls.update() must be called after any manual changes to the camera's transform
 //controls.update() must be called after any manual changes to the camera's transform
 camera.position.set( 0, 20, 100 );
 camera.position.set( 0, 20, 100 );
@@ -292,7 +292,7 @@ controls.touches = {
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/controls/OrbitControls.js examples/js/controls/OrbitControls.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/controls/OrbitControls.js examples/jsm/controls/OrbitControls.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/en/controls/PointerLockControls.html

@@ -143,7 +143,7 @@ controls.addEventListener( 'unlock', function () {
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/controls/PointerLockControls.js examples/js/controls/PointerLockControls.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/controls/PointerLockControls.js examples/jsm/controls/PointerLockControls.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/en/controls/TrackballControls.html

@@ -201,7 +201,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/controls/TrackballControls.js examples/js/controls/TrackballControls.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/controls/TrackballControls.js examples/jsm/controls/TrackballControls.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 4 - 2
docs/examples/en/controls/TransformControls.html

@@ -14,7 +14,9 @@
 
 
 		<p class="desc">
 		<p class="desc">
 			This class can be used to transform objects in 3D space by adapting a similar interaction model of DCC tools like Blender.
 			This class can be used to transform objects in 3D space by adapting a similar interaction model of DCC tools like Blender.
-			Unlike other controls, it is not intended to transform the scene's camera.
+			Unlike other controls, it is not intended to transform the scene's camera.<br /><br />
+
+			[name] expects that its attached 3D object is part of the scene graph.
 		</p>
 		</p>
 
 
 		<h2>Example</h2>
 		<h2>Example</h2>
@@ -218,7 +220,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/controls/TransformControls.js examples/js/controls/TransformControls.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/controls/TransformControls.js examples/jsm/controls/TransformControls.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 2 - 2
docs/examples/en/exporters/ColladaExporter.html

@@ -22,7 +22,7 @@
 
 
 		<code>
 		<code>
 		// Instantiate an exporter
 		// Instantiate an exporter
-		var exporter = new THREE.ColladaExporter();
+		var exporter = new ColladaExporter();
 
 
 		// Parse the input and generate the ply output
 		// Parse the input and generate the ply output
 		var data = exporter.parse( scene, null, options );
 		var data = exporter.parse( scene, null, options );
@@ -77,7 +77,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/exporters/ColladaExporter.js examples/js/exporters/ColladaExporter.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/exporters/ColladaExporter.js examples/jsm/exporters/ColladaExporter.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 2 - 2
docs/examples/en/exporters/GLTFExporter.html

@@ -38,7 +38,7 @@
 
 
 		<code>
 		<code>
 		// Instantiate a exporter
 		// Instantiate a exporter
-		var exporter = new THREE.GLTFExporter();
+		var exporter = new GLTFExporter();
 
 
 		// Parse the input and generate the glTF output
 		// Parse the input and generate the glTF output
 		exporter.parse( scene, function ( gltf ) {
 		exporter.parse( scene, function ( gltf ) {
@@ -108,7 +108,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/exporters/GLTFExporter.js examples/js/exporters/GLTFExporter.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/exporters/GLTFExporter.js examples/jsm/exporters/GLTFExporter.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 2 - 2
docs/examples/en/exporters/PLYExporter.html

@@ -23,7 +23,7 @@
 
 
 		<code>
 		<code>
 		// Instantiate an exporter
 		// Instantiate an exporter
-		var exporter = new THREE.PLYExporter();
+		var exporter = new PLYExporter();
 
 
 		// Parse the input and generate the ply output
 		// Parse the input and generate the ply output
 		var data = exporter.parse( scene, options );
 		var data = exporter.parse( scene, options );
@@ -60,7 +60,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/exporters/PLYExporter.js examples/js/exporters/PLYExporter.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/exporters/PLYExporter.js examples/jsm/exporters/PLYExporter.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 2 - 2
docs/examples/en/geometries/ConvexBufferGeometry.html

@@ -36,7 +36,7 @@
 
 
 		<p>[example:webgl_geometry_convex geometry / convex ]</p>
 		<p>[example:webgl_geometry_convex geometry / convex ]</p>
 
 
-		<code>var geometry = new THREE.ConvexBufferGeometry( points );
+		<code>var geometry = new ConvexBufferGeometry( points );
 		var material = new THREE.MeshBasicMaterial( {color: 0x00ff00} );
 		var material = new THREE.MeshBasicMaterial( {color: 0x00ff00} );
 		var mesh = new THREE.Mesh( geometry, material );
 		var mesh = new THREE.Mesh( geometry, material );
 		scene.add( mesh );
 		scene.add( mesh );
@@ -53,7 +53,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/geometries/ConvexGeometry.js examples/js/geometries/ConvexGeometry.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/geometries/ConvexGeometry.js examples/jsm/geometries/ConvexGeometry.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 2 - 2
docs/examples/en/geometries/ConvexGeometry.html

@@ -35,7 +35,7 @@
 
 
 		<p>[example:webgl_geometry_convex geometry / convex ]</p>
 		<p>[example:webgl_geometry_convex geometry / convex ]</p>
 
 
-		<code>var geometry = new THREE.ConvexGeometry( points );
+		<code>var geometry = new ConvexGeometry( points );
 		var material = new THREE.MeshBasicMaterial( {color: 0x00ff00} );
 		var material = new THREE.MeshBasicMaterial( {color: 0x00ff00} );
 		var mesh = new THREE.Mesh( geometry, material );
 		var mesh = new THREE.Mesh( geometry, material );
 		scene.add( mesh );
 		scene.add( mesh );
@@ -52,7 +52,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/geometries/ConvexGeometry.js examples/js/geometries/ConvexGeometry.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/geometries/ConvexGeometry.js examples/jsm/geometries/ConvexGeometry.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 2 - 2
docs/examples/en/geometries/DecalGeometry.html

@@ -34,7 +34,7 @@
 
 
 		<p>[example:webgl_decals WebGL / decals]</p>
 		<p>[example:webgl_decals WebGL / decals]</p>
 
 
-		<code>var geometry =  new THREE.DecalGeometry( mesh, position, orientation, size );
+		<code>var geometry =  new DecalGeometry( mesh, position, orientation, size );
 		var material = new THREE.MeshBasicMaterial( { color: 0x00ff00 } );
 		var material = new THREE.MeshBasicMaterial( { color: 0x00ff00 } );
 		var mesh = new THREE.Mesh( geometry, material );
 		var mesh = new THREE.Mesh( geometry, material );
 		scene.add( mesh );
 		scene.add( mesh );
@@ -53,7 +53,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/geometries/DecalGeometry.js examples/js/geometries/DecalGeometry.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/geometries/DecalGeometry.js examples/jsm/geometries/DecalGeometry.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/en/helpers/FaceNormalsHelper.html

@@ -31,7 +31,7 @@
 		material = new THREE.MeshBasicMaterial( { color: 0xff0000 } );
 		material = new THREE.MeshBasicMaterial( { color: 0xff0000 } );
 		box = new THREE.Mesh( geometry, material );
 		box = new THREE.Mesh( geometry, material );
 
 
-		helper = new THREE.FaceNormalsHelper( box, 2, 0x00ff00, 1 );
+		helper = new FaceNormalsHelper( box, 2, 0x00ff00, 1 );
 
 
 		scene.add( box );
 		scene.add( box );
 		scene.add( helper );
 		scene.add( helper );

+ 1 - 1
docs/examples/en/helpers/RectAreaLightHelper.html

@@ -21,7 +21,7 @@
 		<code>
 		<code>
 var light = new THREE.RectAreaLight( 0xffffbb, 1.0, 5, 5 );
 var light = new THREE.RectAreaLight( 0xffffbb, 1.0, 5, 5 );
 
 
-var helper = new THREE.RectAreaLightHelper( light );
+var helper = new RectAreaLightHelper( light );
 
 
 light.add( helper ); // helper must be added as a child of the light
 light.add( helper ); // helper must be added as a child of the light
 		</code>
 		</code>

+ 1 - 1
docs/examples/en/helpers/VertexNormalsHelper.html

@@ -30,7 +30,7 @@
 		var material = new THREE.MeshBasicMaterial( { color: 0xff0000 } );
 		var material = new THREE.MeshBasicMaterial( { color: 0xff0000 } );
 		var box = new THREE.Mesh( geometry, material );
 		var box = new THREE.Mesh( geometry, material );
 
 
-		var helper = new THREE.VertexNormalsHelper( box, 2, 0x00ff00, 1 );
+		var helper = new VertexNormalsHelper( box, 2, 0x00ff00, 1 );
 
 
 		scene.add( box );
 		scene.add( box );
 		scene.add( helper );
 		scene.add( helper );

+ 1 - 1
docs/examples/en/helpers/VertexTangentsHelper.html

@@ -30,7 +30,7 @@
 		var material = new THREE.MeshNormalMaterial();
 		var material = new THREE.MeshNormalMaterial();
 		var box = new THREE.Mesh( geometry, material );
 		var box = new THREE.Mesh( geometry, material );
 
 
-		var helper = new THREE.VertexTangentsHelper( box, 1, 0x00ffff, 1 );
+		var helper = new VertexTangentsHelper( box, 1, 0x00ffff, 1 );
 
 
 		scene.add( box );
 		scene.add( box );
 		scene.add( helper );
 		scene.add( helper );

+ 5 - 5
docs/examples/en/loaders/BasisTextureLoader.html

@@ -25,15 +25,15 @@
 			This loader parallelizes the transcoding process across a configurable number
 			This loader parallelizes the transcoding process across a configurable number
 			of web workers, before transferring the transcoded compressed texture back
 			of web workers, before transferring the transcoded compressed texture back
 			to the main thread. The required WASM transcoder and JS wrapper are available from the
 			to the main thread. The required WASM transcoder and JS wrapper are available from the
-			[link:https://github.com/mrdoob/three.js/tree/dev/examples/js/libs/basis examples/js/libs/basis]
+			[link:https://github.com/mrdoob/three.js/tree/dev/examples/jsm/libs/basis examples/jsm/libs/basis]
 			directory.
 			directory.
 		</p>
 		</p>
 
 
 		<h2>Example</h2>
 		<h2>Example</h2>
 
 
 		<code>
 		<code>
-		var basisLoader = new THREE.BasisTextureLoader();
-		basisLoader.setTranscoderPath( 'examples/js/libs/basis/' );
+		var basisLoader = new BasisTextureLoader();
+		basisLoader.setTranscoderPath( 'examples/jsm/libs/basis/' );
 		basisLoader.detectSupport( renderer );
 		basisLoader.detectSupport( renderer );
 		basisLoader.load( 'diffuse.basis', function ( texture ) {
 		basisLoader.load( 'diffuse.basis', function ( texture ) {
 
 
@@ -114,7 +114,7 @@
 		</p>
 		</p>
 		<p>
 		<p>
 		The WASM transcoder and JS wrapper are available from the
 		The WASM transcoder and JS wrapper are available from the
-		[link:https://github.com/mrdoob/three.js/tree/dev/examples/js/libs/basis examples/js/libs/basis]
+		[link:https://github.com/mrdoob/three.js/tree/dev/examples/jsm/libs/basis examples/jsm/libs/basis]
 		directory.
 		directory.
 		</p>
 		</p>
 
 
@@ -134,7 +134,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/BasisTextureLoader.js examples/js/loaders/BasisTextureLoader.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/loaders/BasisTextureLoader.js examples/jsm/loaders/BasisTextureLoader.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 3 - 3
docs/examples/en/loaders/DRACOLoader.html

@@ -31,10 +31,10 @@
 
 
 		<code>
 		<code>
 		// Instantiate a loader
 		// Instantiate a loader
-		var loader = new THREE.DRACOLoader();
+		var loader = new DRACOLoader();
 
 
 		// Specify path to a folder containing WASM/JS decoding libraries.
 		// Specify path to a folder containing WASM/JS decoding libraries.
-		loader.setDecoderPath( '/examples/js/libs/draco/' );
+		loader.setDecoderPath( '/examples/jsm/libs/draco/' );
 
 
 		// Optional: Pre-fetch Draco WASM/JS module.
 		// Optional: Pre-fetch Draco WASM/JS module.
 		loader.preload();
 		loader.preload();
@@ -145,7 +145,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/DRACOLoader.js examples/js/loaders/DRACOLoader.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/loaders/DRACOLoader.js examples/jsm/loaders/DRACOLoader.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 5 - 5
docs/examples/en/loaders/GLTFLoader.html

@@ -55,11 +55,11 @@
 
 
 		<code>
 		<code>
 		// Instantiate a loader
 		// Instantiate a loader
-		var loader = new THREE.GLTFLoader();
+		var loader = new GLTFLoader();
 
 
 		// Optional: Provide a DRACOLoader instance to decode compressed mesh data
 		// Optional: Provide a DRACOLoader instance to decode compressed mesh data
-		var dracoLoader = new THREE.DRACOLoader();
-		dracoLoader.setDecoderPath( '/examples/js/libs/draco/' );
+		var dracoLoader = new DRACOLoader();
+		dracoLoader.setDecoderPath( '/examples/jsm/libs/draco/' );
 		loader.setDRACOLoader( dracoLoader );
 		loader.setDRACOLoader( dracoLoader );
 
 
 		// Load a glTF resource
 		// Load a glTF resource
@@ -183,7 +183,7 @@
 		[page:DRACOLoader dracoLoader] — Instance of THREE.DRACOLoader, to be used for decoding assets compressed with the KHR_draco_mesh_compression extension.
 		[page:DRACOLoader dracoLoader] — Instance of THREE.DRACOLoader, to be used for decoding assets compressed with the KHR_draco_mesh_compression extension.
 		</p>
 		</p>
 		<p>
 		<p>
-		Refer to this [link:https://github.com/mrdoob/three.js/tree/dev/examples/js/libs/draco#readme readme] for the details of Draco and its decoder.
+		Refer to this [link:https://github.com/mrdoob/three.js/tree/dev/examples/jsm/libs/draco#readme readme] for the details of Draco and its decoder.
 		</p>
 		</p>
 
 
 		<h3>[method:null setDDSLoader]( [param:DDSLoader ddsLoader] )</h3>
 		<h3>[method:null setDDSLoader]( [param:DDSLoader ddsLoader] )</h3>
@@ -205,7 +205,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/GLTFLoader.js examples/js/loaders/GLTFLoader.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/loaders/GLTFLoader.js examples/jsm/loaders/GLTFLoader.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 2 - 2
docs/examples/en/loaders/MMDLoader.html

@@ -22,7 +22,7 @@
 
 
 		<code>
 		<code>
 		// Instantiate a loader
 		// Instantiate a loader
-		var loader = new THREE.MMDLoader();
+		var loader = new MMDLoader();
 
 
 		// Load a MMD model
 		// Load a MMD model
 		loader.load(
 		loader.load(
@@ -118,7 +118,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/MMDLoader.js examples/js/loaders/MMDLoader.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/loaders/MMDLoader.js examples/jsm/loaders/MMDLoader.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/en/loaders/MTLLoader.html

@@ -73,7 +73,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/[name].js examples/js/loaders/[name].js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/loaders/[name].js examples/jsm/loaders/[name].js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 2 - 2
docs/examples/en/loaders/OBJLoader.html

@@ -24,7 +24,7 @@
 
 
 		<code>
 		<code>
 		// instantiate a loader
 		// instantiate a loader
-		var loader = new THREE.OBJLoader();
+		var loader = new OBJLoader();
 
 
 		// load a resource
 		// load a resource
 		loader.load(
 		loader.load(
@@ -102,7 +102,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/OBJLoader.js examples/js/loaders/OBJLoader.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/loaders/OBJLoader.js examples/jsm/loaders/OBJLoader.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/en/loaders/OBJLoader2.html

@@ -22,7 +22,7 @@
 
 
 		<code>
 		<code>
 		// instantiate the loader
 		// instantiate the loader
-		let loader = new THREE.OBJLoader2();
+		let loader = new OBJLoader2();
 
 
 		// function called on successful load
 		// function called on successful load
 		function callbackOnLoad ( object3d ) {
 		function callbackOnLoad ( object3d ) {

+ 2 - 2
docs/examples/en/loaders/PCDLoader.html

@@ -22,7 +22,7 @@
 		<code>
 		<code>
 
 
 		// instantiate a loader
 		// instantiate a loader
-		var loader = new THREE.PCDLoader();
+		var loader = new PCDLoader();
 
 
 		// load a resource
 		// load a resource
 		loader.load(
 		loader.load(
@@ -99,7 +99,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/PCDLoader.js examples/js/loaders/PCDLoader.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/loaders/PCDLoader.js examples/jsm/loaders/PCDLoader.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 2 - 2
docs/examples/en/loaders/PDBLoader.html

@@ -20,7 +20,7 @@
 
 
 		<code>
 		<code>
 		// instantiate a loader
 		// instantiate a loader
-		var loader = new THREE.PDBLoader();
+		var loader = new PDBLoader();
 
 
 		// load a PDB resource
 		// load a PDB resource
 		loader.load(
 		loader.load(
@@ -92,7 +92,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/PDBLoader.js examples/js/loaders/PDBLoader.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/loaders/PDBLoader.js examples/jsm/loaders/PDBLoader.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 2 - 2
docs/examples/en/loaders/PRWMLoader.html

@@ -24,7 +24,7 @@
 
 
 		<code>
 		<code>
 		// instantiate a loader
 		// instantiate a loader
-		var loader = new THREE.PRWMLoader();
+		var loader = new PRWMLoader();
 
 
 		// load a resource
 		// load a resource
 		loader.load(
 		loader.load(
@@ -99,7 +99,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/PRWMLoader.js examples/js/loaders/PRWMLoader.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/loaders/PRWMLoader.js examples/jsm/loaders/PRWMLoader.js]
 		</p>
 		</p>
 
 
 	</body>
 	</body>

+ 2 - 2
docs/examples/en/loaders/SVGLoader.html

@@ -20,7 +20,7 @@
 
 
 		<code>
 		<code>
 		// instantiate a loader
 		// instantiate a loader
-		var loader = new THREE.SVGLoader();
+		var loader = new SVGLoader();
 
 
 		// load a SVG resource
 		// load a SVG resource
 		loader.load(
 		loader.load(
@@ -105,7 +105,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/SVGLoader.js examples/js/loaders/SVGLoader.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/loaders/SVGLoader.js examples/jsm/loaders/SVGLoader.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 2 - 2
docs/examples/en/loaders/TGALoader.html

@@ -20,7 +20,7 @@
 
 
 		<code>
 		<code>
 		// instantiate a loader
 		// instantiate a loader
-		var loader = new THREE.TGALoader();
+		var loader = new TGALoader();
 
 
 		// load a resource
 		// load a resource
 		var texture = loader.load(
 		var texture = loader.load(
@@ -84,7 +84,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/TGALoader.js examples/js/loaders/TGALoader.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/loaders/TGALoader.js examples/jsm/loaders/TGALoader.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 2 - 2
docs/examples/en/math/Lut.html

@@ -18,7 +18,7 @@
 		<h2>Example</h2>
 		<h2>Example</h2>
 
 
 		<code>
 		<code>
-		var lut = new THREE.Lut( 'rainbow', 512 );
+		var lut = new Lut( 'rainbow', 512 );
 		var color = lut.getColor( 0.5 );
 		var color = lut.getColor( 0.5 );
 		</code>
 		</code>
 
 
@@ -140,7 +140,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/math/[path].js examples/js/math/[path].js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/math/[path].js examples/jsm/math/[path].js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 2 - 2
docs/examples/en/math/MeshSurfaceSampler.html

@@ -18,7 +18,7 @@
 
 
 		<code>
 		<code>
 		// Create a sampler for a Mesh surface.
 		// Create a sampler for a Mesh surface.
-		var sampler = new THREE.MeshSurfaceSampler( surfaceMesh )
+		var sampler = new MeshSurfaceSampler( surfaceMesh )
 			.setWeightAttribute( 'color' )
 			.setWeightAttribute( 'color' )
 			.build();
 			.build();
 
 
@@ -80,7 +80,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-		[link:https://github.com/mrdoob/three.js/blob/master/examples/js/math/MeshSurfaceSampler.js examples/js/math/MeshSurfaceSampler.js]
+		[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/math/MeshSurfaceSampler.js examples/jsm/math/MeshSurfaceSampler.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/en/math/convexhull/ConvexHull.html

@@ -187,7 +187,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/math/ConvexHull.js examples/js/ConvexHull.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/math/ConvexHull.js examples/jsm/ConvexHull.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/en/math/convexhull/Face.html

@@ -85,7 +85,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/math/ConvexHull.js examples/js/math/ConvexHull.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/math/ConvexHull.js examples/jsm/math/ConvexHull.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/en/math/convexhull/HalfEdge.html

@@ -75,7 +75,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/math/ConvexHull.js examples/js/math/ConvexHull.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/math/ConvexHull.js examples/jsm/math/ConvexHull.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/en/math/convexhull/VertexList.html

@@ -87,7 +87,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/math/ConvexHull.js examples/js/math/ConvexHull.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/math/ConvexHull.js examples/jsm/math/ConvexHull.js]
 		<p>
 		<p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/en/math/convexhull/VertexNode.html

@@ -48,7 +48,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/math/ConvexHull.js examples/js/math/ConvexHull.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/math/ConvexHull.js examples/jsm/math/ConvexHull.js]
 		<p>
 		<p>
 	</body>
 	</body>
 </html>
 </html>

+ 5 - 5
docs/examples/en/objects/Lensflare.html

@@ -31,11 +31,11 @@ var textureFlare0 = textureLoader.load( "textures/lensflare/lensflare0.png" );
 var textureFlare1 = textureLoader.load( "textures/lensflare/lensflare2.png" );
 var textureFlare1 = textureLoader.load( "textures/lensflare/lensflare2.png" );
 var textureFlare2 = textureLoader.load( "textures/lensflare/lensflare3.png" );
 var textureFlare2 = textureLoader.load( "textures/lensflare/lensflare3.png" );
 
 
-var lensflare = new THREE.Lensflare();
+var lensflare = new Lensflare();
 
 
-lensflare.addElement( new THREE.LensflareElement( textureFlare0, 512, 0 ) );
-lensflare.addElement( new THREE.LensflareElement( textureFlare1, 512, 0 ) );
-lensflare.addElement( new THREE.LensflareElement( textureFlare2, 60, 0.6 ) );
+lensflare.addElement( new LensflareElement( textureFlare0, 512, 0 ) );
+lensflare.addElement( new LensflareElement( textureFlare1, 512, 0 ) );
+lensflare.addElement( new LensflareElement( textureFlare2, 60, 0.6 ) );
 
 
 light.add( lensflare );
 light.add( lensflare );
 		</code>
 		</code>
@@ -58,7 +58,7 @@ light.add( lensflare );
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/objects/Lensflare.js examples/js/objects/Lensflare.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/objects/Lensflare.js examples/jsm/objects/Lensflare.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/en/postprocessing/EffectComposer.html

@@ -151,7 +151,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/postprocessing/EffectComposer.js examples/js/postprocessing/EffectComposer.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/postprocessing/EffectComposer.js examples/jsm/postprocessing/EffectComposer.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/en/renderers/CSS2DRenderer.html

@@ -61,7 +61,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/renderers/CSS2DRenderer.js examples/js/renderers/CSS2DRenderer.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/renderers/CSS2DRenderer.js examples/jsm/renderers/CSS2DRenderer.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/en/renderers/CSS3DRenderer.html

@@ -73,7 +73,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/renderers/CSS3DRenderer.js examples/js/renderers/CSS3DRenderer.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/renderers/CSS3DRenderer.js examples/jsm/renderers/CSS3DRenderer.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/en/renderers/SVGRenderer.html

@@ -103,7 +103,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/renderers/SVGRenderer.js examples/js/renderers/SVGRenderer.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/renderers/SVGRenderer.js examples/jsm/renderers/SVGRenderer.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/en/utils/BufferGeometryUtils.html

@@ -86,7 +86,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/utils/BufferGeometryUtils.js examples/js/utils/BufferGeometryUtils.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/utils/BufferGeometryUtils.js examples/jsm/utils/BufferGeometryUtils.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/en/utils/SceneUtils.html

@@ -36,7 +36,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/utils/SceneUtils.js examples/js/utils/SceneUtils.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/utils/SceneUtils.js examples/jsm/utils/SceneUtils.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/en/utils/SkeletonUtils.html

@@ -56,7 +56,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/utils/SkeletonUtils.js examples/js/utils/SkeletonUtils.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/utils/SkeletonUtils.js examples/jsm/utils/SkeletonUtils.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 2 - 2
docs/examples/zh/animations/CCDIKSolver.html

@@ -21,7 +21,7 @@
 		var ikSolver;
 		var ikSolver;
 
 
 		// Load MMD resources and instantiate CCDIKSolver
 		// Load MMD resources and instantiate CCDIKSolver
-		new THREE.MMDLoader().load(
+		new MMDLoader().load(
 			'models/mmd/miku.pmd',
 			'models/mmd/miku.pmd',
 			function ( mesh ) {
 			function ( mesh ) {
 
 
@@ -98,7 +98,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/animation/CCDIKSolver.js examples/js/animation/CCDIKSolver.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/animation/CCDIKSolver.js examples/jsm/animation/CCDIKSolver.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 3 - 3
docs/examples/zh/animations/MMDAnimationHelper.html

@@ -19,10 +19,10 @@
 
 
 		<code>
 		<code>
 		// Instantiate a helper
 		// Instantiate a helper
-		var helper = new THREE.MMDAnimationHelper();
+		var helper = new MMDAnimationHelper();
 
 
 		// Load MMD resources and add to helper
 		// Load MMD resources and add to helper
-		new THREE.MMDLoader().loadWithAnimation(
+		new MMDLoader().loadWithAnimation(
 			'models/mmd/miku.pmd',
 			'models/mmd/miku.pmd',
 			'models/mmd/dance.vmd',
 			'models/mmd/dance.vmd',
 			function ( mmd ) {
 			function ( mmd ) {
@@ -165,7 +165,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/animation/MMDAnimationHelper.js examples/js/animation/MMDAnimationHelper.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/animation/MMDAnimationHelper.js examples/jsm/animation/MMDAnimationHelper.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 3 - 3
docs/examples/zh/animations/MMDPhysics.html

@@ -20,11 +20,11 @@
 		var physics;
 		var physics;
 
 
 		// Load MMD resources and instantiate MMDPhysics
 		// Load MMD resources and instantiate MMDPhysics
-		new THREE.MMDLoader().load(
+		new MMDLoader().load(
 			'models/mmd/miku.pmd',
 			'models/mmd/miku.pmd',
 			function ( mesh ) {
 			function ( mesh ) {
 
 
-				physics = new THREE.MMDPhysics( mesh )
+				physics = new MMDPhysics( mesh )
 				scene.add( mesh );
 				scene.add( mesh );
 
 
 			}
 			}
@@ -108,7 +108,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/animation/MMDPhysics.js examples/js/animation/MMDPhysics.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/animation/MMDPhysics.js examples/jsm/animation/MMDPhysics.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/zh/controls/DeviceOrientationControls.html

@@ -83,7 +83,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/controls/DeviceOrientationControls.js examples/js/controls/DeviceOrientationControls.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/controls/DeviceOrientationControls.js examples/jsm/controls/DeviceOrientationControls.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 13 - 2
docs/examples/zh/controls/DragControls.html

@@ -21,7 +21,7 @@
 		<p>[example:misc_controls_drag misc / controls / drag ]</p>
 		<p>[example:misc_controls_drag misc / controls / drag ]</p>
 
 
 		<code>
 		<code>
-var controls = new THREE.DragControls( objects, camera, renderer.domElement );
+var controls = new DragControls( objects, camera, renderer.domElement );
 
 
 // add event listener to highlight dragged objects
 // add event listener to highlight dragged objects
 
 
@@ -91,6 +91,12 @@ controls.addEventListener( 'dragend', function ( event ) {
 			Whether or not the controls are enabled.
 			Whether or not the controls are enabled.
 		</p>
 		</p>
 
 
+		<h3>[property:Boolean transformGroup]</h3>
+		<p>
+			This option only works if the [page:DragControls.objects] array contains a single draggable group object.
+			If set to *true*, [name] does not transform individual objects but the entire group. Default is *false*.
+		</p>
+
 		<h2>Methods</h2>
 		<h2>Methods</h2>
 
 
 		<p>See the base [page:EventDispatcher] class for common methods.</p>
 		<p>See the base [page:EventDispatcher] class for common methods.</p>
@@ -110,10 +116,15 @@ controls.addEventListener( 'dragend', function ( event ) {
 			Should be called if the controls is no longer required.
 			Should be called if the controls is no longer required.
 		</p>
 		</p>
 
 
+		<h3>[method:Array getObjects] ()</h3>
+		<p>
+			Returns the array of draggable objects.
+		</p>
+
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/controls/DragControls.js examples/js/controls/DragControls.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/controls/DragControls.js examples/jsm/controls/DragControls.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/zh/controls/FirstPersonControls.html

@@ -159,7 +159,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/controls/FirstPersonControls.js examples/js/controls/FirstPersonControls.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/controls/FirstPersonControls.js examples/jsm/controls/FirstPersonControls.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/zh/controls/FlyControls.html

@@ -88,7 +88,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/controls/FlyControls.js examples/js/controls/FlyControls.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/controls/FlyControls.js examples/jsm/controls/FlyControls.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 2 - 2
docs/examples/zh/controls/OrbitControls.html

@@ -32,7 +32,7 @@ var scene = new THREE.Scene();
 
 
 var camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 10000 );
 var camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 10000 );
 
 
-var controls = new THREE.OrbitControls( camera, renderer.domElement );
+var controls = new OrbitControls( camera, renderer.domElement );
 
 
 //controls.update() must be called after any manual changes to the camera's transform
 //controls.update() must be called after any manual changes to the camera's transform
 camera.position.set( 0, 20, 100 );
 camera.position.set( 0, 20, 100 );
@@ -291,7 +291,7 @@ controls.touches = {
 		<h2>源代码</h2>
 		<h2>源代码</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/controls/OrbitControls.js examples/js/controls/OrbitControls.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/controls/OrbitControls.js examples/jsm/controls/OrbitControls.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/zh/controls/PointerLockControls.html

@@ -143,7 +143,7 @@ controls.addEventListener( 'unlock', function () {
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/controls/PointerLockControls.js examples/js/controls/PointerLockControls.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/controls/PointerLockControls.js examples/jsm/controls/PointerLockControls.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/zh/controls/TrackballControls.html

@@ -201,7 +201,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/controls/TrackballControls.js examples/js/controls/TrackballControls.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/controls/TrackballControls.js examples/jsm/controls/TrackballControls.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 4 - 2
docs/examples/zh/controls/TransformControls.html

@@ -14,7 +14,9 @@
 
 
 		<p class="desc">
 		<p class="desc">
 			This class can be used to transform objects in 3D space by adapting a similar interaction model of DCC tools like Blender.
 			This class can be used to transform objects in 3D space by adapting a similar interaction model of DCC tools like Blender.
-			Unlike other controls, it is not intended to transform the scene's camera.
+			Unlike other controls, it is not intended to transform the scene's camera.<br /><br />
+
+			[name] expects that its attached 3D object is part of the scene graph.
 		</p>
 		</p>
 
 
 		<h2>Example</h2>
 		<h2>Example</h2>
@@ -218,7 +220,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/controls/TransformControls.js examples/js/controls/TransformControls.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/controls/TransformControls.js examples/jsm/controls/TransformControls.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 2 - 2
docs/examples/zh/exporters/ColladaExporter.html

@@ -22,7 +22,7 @@
 
 
 		<code>
 		<code>
 		// Instantiate an exporter
 		// Instantiate an exporter
-		var exporter = new THREE.ColladaExporter();
+		var exporter = new ColladaExporter();
 
 
 		// Parse the input and generate the ply output
 		// Parse the input and generate the ply output
 		var data = exporter.parse( scene, null, options );
 		var data = exporter.parse( scene, null, options );
@@ -77,7 +77,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/exporters/ColladaExporter.js examples/js/exporters/ColladaExporter.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/exporters/ColladaExporter.js examples/jsm/exporters/ColladaExporter.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 2 - 2
docs/examples/zh/exporters/GLTFExporter.html

@@ -38,7 +38,7 @@
 
 
 		<code>
 		<code>
 		// Instantiate a exporter
 		// Instantiate a exporter
-		var exporter = new THREE.GLTFExporter();
+		var exporter = new GLTFExporter();
 
 
 		// Parse the input and generate the glTF output
 		// Parse the input and generate the glTF output
 		exporter.parse( scene, function ( gltf ) {
 		exporter.parse( scene, function ( gltf ) {
@@ -108,7 +108,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/exporters/GLTFExporter.js examples/js/exporters/GLTFExporter.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/exporters/GLTFExporter.js examples/jsm/exporters/GLTFExporter.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 2 - 2
docs/examples/zh/exporters/PLYExporter.html

@@ -23,7 +23,7 @@
 
 
 		<code>
 		<code>
 		// Instantiate an exporter
 		// Instantiate an exporter
-		var exporter = new THREE.PLYExporter();
+		var exporter = new PLYExporter();
 
 
 		// Parse the input and generate the ply output
 		// Parse the input and generate the ply output
 		var data = exporter.parse( scene, options );
 		var data = exporter.parse( scene, options );
@@ -60,7 +60,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/exporters/PLYExporter.js examples/js/exporters/PLYExporter.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/exporters/PLYExporter.js examples/jsm/exporters/PLYExporter.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 2 - 2
docs/examples/zh/geometries/ConvexBufferGeometry.html

@@ -36,7 +36,7 @@
 
 
 		<p>[example:webgl_geometry_convex geometry / convex ]</p>
 		<p>[example:webgl_geometry_convex geometry / convex ]</p>
 
 
-		<code>var geometry = new THREE.ConvexBufferGeometry( points );
+		<code>var geometry = new ConvexBufferGeometry( points );
 		var material = new THREE.MeshBasicMaterial( {color: 0x00ff00} );
 		var material = new THREE.MeshBasicMaterial( {color: 0x00ff00} );
 		var mesh = new THREE.Mesh( geometry, material );
 		var mesh = new THREE.Mesh( geometry, material );
 		scene.add( mesh );
 		scene.add( mesh );
@@ -53,7 +53,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/geometries/ConvexGeometry.js examples/js/geometries/ConvexGeometry.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/geometries/ConvexGeometry.js examples/jsm/geometries/ConvexGeometry.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 2 - 2
docs/examples/zh/geometries/ConvexGeometry.html

@@ -35,7 +35,7 @@
 
 
 		<p>[example:webgl_geometry_convex geometry / convex ]</p>
 		<p>[example:webgl_geometry_convex geometry / convex ]</p>
 
 
-		<code>var geometry = new THREE.ConvexGeometry( points );
+		<code>var geometry = new ConvexGeometry( points );
 		var material = new THREE.MeshBasicMaterial( {color: 0x00ff00} );
 		var material = new THREE.MeshBasicMaterial( {color: 0x00ff00} );
 		var mesh = new THREE.Mesh( geometry, material );
 		var mesh = new THREE.Mesh( geometry, material );
 		scene.add( mesh );
 		scene.add( mesh );
@@ -52,7 +52,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/geometries/ConvexGeometry.js examples/js/geometries/ConvexGeometry.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/geometries/ConvexGeometry.js examples/jsm/geometries/ConvexGeometry.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 2 - 2
docs/examples/zh/geometries/DecalGeometry.html

@@ -34,7 +34,7 @@
 
 
 		<p>[example:webgl_decals WebGL / decals]</p>
 		<p>[example:webgl_decals WebGL / decals]</p>
 
 
-		<code>var geometry =  new THREE.DecalGeometry( mesh, position, orientation, size );
+		<code>var geometry =  new DecalGeometry( mesh, position, orientation, size );
 		var material = new THREE.MeshBasicMaterial( { color: 0x00ff00 } );
 		var material = new THREE.MeshBasicMaterial( { color: 0x00ff00 } );
 		var mesh = new THREE.Mesh( geometry, material );
 		var mesh = new THREE.Mesh( geometry, material );
 		scene.add( mesh );
 		scene.add( mesh );
@@ -53,7 +53,7 @@
 		<h2>Source</h2>
 		<h2>Source</h2>
 
 
 		<p>
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/js/geometries/DecalGeometry.js examples/js/geometries/DecalGeometry.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/geometries/DecalGeometry.js examples/jsm/geometries/DecalGeometry.js]
 		</p>
 		</p>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
docs/examples/zh/helpers/FaceNormalsHelper.html

@@ -31,7 +31,7 @@
 		material = new THREE.MeshBasicMaterial( { color: 0xff0000 } );
 		material = new THREE.MeshBasicMaterial( { color: 0xff0000 } );
 		box = new THREE.Mesh( geometry, material );
 		box = new THREE.Mesh( geometry, material );
 
 
-		helper = new THREE.FaceNormalsHelper( box, 2, 0x00ff00, 1 );
+		helper = new FaceNormalsHelper( box, 2, 0x00ff00, 1 );
 
 
 		scene.add( box );
 		scene.add( box );
 		scene.add( helper );
 		scene.add( helper );

+ 1 - 1
docs/examples/zh/helpers/RectAreaLightHelper.html

@@ -21,7 +21,7 @@
 		<code>
 		<code>
 var light = new THREE.RectAreaLight( 0xffffbb, 1.0, 5, 5 );
 var light = new THREE.RectAreaLight( 0xffffbb, 1.0, 5, 5 );
 
 
-var helper = new THREE.RectAreaLightHelper( light );
+var helper = new RectAreaLightHelper( light );
 
 
 scene.add( helper );
 scene.add( helper );
 		</code>
 		</code>

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff