Merge branch 'dev' into FixCircularReferences

fcfb1405 · Mr.doob · GitHub · 651d202b · d5adf4c9 · fcfb1405
106 changed file
--- a/build/three.js
+++ b/build/three.js
--- a/build/three.min.js
+++ b/build/three.min.js
--- a/build/three.module.js
+++ b/build/three.module.js
--- a/docs/api/animation/AnimationUtils.html
+++ b/docs/api/animation/AnimationUtils.html
@@ -18,12 +18,12 @@

    <h3>[method:Array arraySlice]( array, from, to )</h3>
    <div>
-    Convert an array to a specific type.
+    This is the same as  Array.prototype.slice, but also works on typed arrays.
    </div>

    <h3>[method:Array convertArray]( array, type, forceClone )</h3>
    <div>
-    This is the same as  Array.prototype.slice, but also works on typed arrays.
+    Convert an array to a specific type.
    </div>

    <h3>[method:Boolean isTypedArray]( object )</h3>

--- a/docs/api/extras/SceneUtils.html
+++ b/docs/api/extras/SceneUtils.html
@@ -16,14 +16,14 @@
 		<h2>Methods</h2>


-		<h3>[method:Object3D createMultiMaterialObject]( [page:Geometry geometry], [page:Array materials] )</h3>
+		<h3>[method:Group createMultiMaterialObject]( [page:Geometry geometry], [page:Array materials] )</h3>
 		<div>
-		geometry -- The geometry for the Object. <br />
+		geometry -- The geometry for the set of materials. <br />
 		materials -- The materials for the object.
 		</div>
 		<div>
-		Creates an new Object3D an new mesh for each material defined in materials. Beware that this is not the same as MultiMaterial which defines multiple material for 1 mesh.<br />
-		This is mostly useful for object that need a material and a wireframe implementation.
+		Creates a new Group that contains a new mesh for each material defined in materials. Beware that this is not the same as MultiMaterial which defines multiple material for 1 mesh.<br />
+		This is mostly useful for objects that need both a material and a wireframe implementation.
 		</div>

 		<h3>[method:null attach]( [page:Object3D child], [page:Object3D scene], [page:Object3D parent] )</h3>

--- a/docs/api/geometries/TextGeometry.html
+++ b/docs/api/geometries/TextGeometry.html
--- a/docs/api/extras/helpers/ArrowHelper.html
+++ b/docs/api/extras/helpers/ArrowHelper.html
@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

--- a/docs/api/extras/helpers/AxisHelper.html
+++ b/docs/api/extras/helpers/AxisHelper.html
@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

--- a/docs/api/extras/helpers/BoxHelper.html
+++ b/docs/api/extras/helpers/BoxHelper.html
@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

--- a/docs/api/extras/helpers/CameraHelper.html
+++ b/docs/api/extras/helpers/CameraHelper.html
@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />
@@ -24,8 +24,7 @@

 		<code>
 var camera = new THREE.PerspectiveCamera( 75, window.innerWidth / window.innerHeight, 0.1, 1000 );
-
-var helper = new THREE.CameraHelper( cameraPerspective );
+var helper = new THREE.CameraHelper( camera );
 scene.add( helper );
 		</code>


--- a/docs/api/extras/helpers/DirectionalLightHelper.html
+++ b/docs/api/extras/helpers/DirectionalLightHelper.html
--- a/docs/api/extras/helpers/FaceNormalsHelper.html
+++ b/docs/api/extras/helpers/FaceNormalsHelper.html
--- a/docs/api/extras/helpers/GridHelper.html
+++ b/docs/api/extras/helpers/GridHelper.html
--- a/docs/api/extras/helpers/HemisphereLightHelper.html
+++ b/docs/api/extras/helpers/HemisphereLightHelper.html
--- a/docs/api/extras/helpers/PointLightHelper.html
+++ b/docs/api/extras/helpers/PointLightHelper.html
--- a/docs/api/extras/helpers/PolarGridHelper.html
+++ b/docs/api/extras/helpers/PolarGridHelper.html
--- a/docs/api/extras/helpers/RectAreaLightHelper.html
+++ b/docs/api/extras/helpers/RectAreaLightHelper.html
--- a/docs/api/extras/helpers/SkeletonHelper.html
+++ b/docs/api/extras/helpers/SkeletonHelper.html
--- a/docs/api/extras/helpers/SpotLightHelper.html
+++ b/docs/api/extras/helpers/SpotLightHelper.html
--- a/docs/api/extras/helpers/VertexNormalsHelper.html
+++ b/docs/api/extras/helpers/VertexNormalsHelper.html
--- a/docs/api/lights/RectAreaLight.html
+++ b/docs/api/lights/RectAreaLight.html
--- a/docs/api/objects/Line.html
+++ b/docs/api/objects/Line.html
--- a/docs/api/objects/LineSegments.html
+++ b/docs/api/objects/LineSegments.html
--- a/docs/list.js
+++ b/docs/list.js
--- a/docs/manual/introduction/Creating-text.html
+++ b/docs/manual/introduction/Creating-text.html
--- a/docs/scenes/js/geometry.js
+++ b/docs/scenes/js/geometry.js
--- a/editor/js/Loader.js
+++ b/editor/js/Loader.js
--- a/editor/js/Viewport.js
+++ b/editor/js/Viewport.js
--- a/editor/js/libs/app/index.html
+++ b/editor/js/libs/app/index.html
--- a/examples/js/Mirror.js
+++ b/examples/js/Mirror.js
--- a/examples/js/SkyShader.js
+++ b/examples/js/SkyShader.js
--- a/examples/js/WaterShader.js
+++ b/examples/js/WaterShader.js
--- a/examples/js/loaders/AssimpJSONLoader.js
+++ b/examples/js/loaders/AssimpJSONLoader.js
--- a/examples/js/loaders/FBXLoader.js
+++ b/examples/js/loaders/FBXLoader.js
--- a/examples/js/loaders/FBXLoader2.js
+++ b/examples/js/loaders/FBXLoader2.js
--- a/examples/js/loaders/GLTFLoader.js
+++ b/examples/js/loaders/GLTFLoader.js
--- a/examples/js/loaders/MMDLoader.js
+++ b/examples/js/loaders/MMDLoader.js
--- a/examples/js/loaders/PLYLoader.js
+++ b/examples/js/loaders/PLYLoader.js
--- a/examples/js/pmrem/PMREMCubeUVPacker.js
+++ b/examples/js/pmrem/PMREMCubeUVPacker.js
--- a/examples/js/pmrem/PMREMGenerator.js
+++ b/examples/js/pmrem/PMREMGenerator.js
--- a/examples/js/postprocessing/AdaptiveToneMappingPass.js
+++ b/examples/js/postprocessing/AdaptiveToneMappingPass.js
--- a/examples/js/postprocessing/BloomPass.js
+++ b/examples/js/postprocessing/BloomPass.js
--- a/examples/js/postprocessing/BokehPass.js
+++ b/examples/js/postprocessing/BokehPass.js
--- a/examples/js/postprocessing/EffectComposer.js
+++ b/examples/js/postprocessing/EffectComposer.js
--- a/examples/js/postprocessing/OutlinePass.js
+++ b/examples/js/postprocessing/OutlinePass.js
--- a/examples/js/postprocessing/SMAAPass.js
+++ b/examples/js/postprocessing/SMAAPass.js
--- a/examples/js/postprocessing/SSAARenderPass.js
+++ b/examples/js/postprocessing/SSAARenderPass.js
--- a/examples/js/postprocessing/SavePass.js
+++ b/examples/js/postprocessing/SavePass.js
--- a/examples/js/postprocessing/TAARenderPass.js
+++ b/examples/js/postprocessing/TAARenderPass.js
--- a/examples/js/postprocessing/UnrealBloomPass.js
+++ b/examples/js/postprocessing/UnrealBloomPass.js
--- a/examples/misc_animation_authoring.html
+++ b/examples/misc_animation_authoring.html
--- a/examples/misc_controls_transform.html
+++ b/examples/misc_controls_transform.html
--- a/examples/misc_sound.html
+++ b/examples/misc_sound.html
--- a/examples/models/gltf/CesiumMan/glTF-Binary/Cesium_Man.glb
+++ b/examples/models/gltf/CesiumMan/glTF-Binary/Cesium_Man.glb
--- a/examples/models/gltf/CesiumMilkTruck/glTF-Binary/CesiumMilkTruck.glb
+++ b/examples/models/gltf/CesiumMilkTruck/glTF-Binary/CesiumMilkTruck.glb
--- a/examples/models/gltf/duck/glTF-Binary/duck.glb
+++ b/examples/models/gltf/duck/glTF-Binary/duck.glb
--- a/examples/models/gltf/monster/glTF-Binary/Monster.glb
+++ b/examples/models/gltf/monster/glTF-Binary/Monster.glb
--- a/examples/models/gltf/snowflake/line_vert.glsl
+++ b/examples/models/gltf/snowflake/line_vert.glsl
--- a/examples/models/vrml/house.wrl
+++ b/examples/models/vrml/house.wrl
--- a/examples/webgl_geometry_extrude_shapes2.html
+++ b/examples/webgl_geometry_extrude_shapes2.html
--- a/examples/webgl_geometry_spline_editor.html
+++ b/examples/webgl_geometry_spline_editor.html
--- a/examples/webgl_helpers.html
+++ b/examples/webgl_helpers.html
--- a/examples/webgl_loader_amf.html
+++ b/examples/webgl_loader_amf.html
--- a/examples/webgl_loader_bvh.html
+++ b/examples/webgl_loader_bvh.html
--- a/examples/webgl_loader_fbx.html
+++ b/examples/webgl_loader_fbx.html
--- a/examples/webgl_loader_gltf.html
+++ b/examples/webgl_loader_gltf.html
--- a/examples/webgl_loader_msgpack.html
+++ b/examples/webgl_loader_msgpack.html
--- a/examples/webgl_postprocessing_ssao.html
+++ b/examples/webgl_postprocessing_ssao.html
--- a/examples/webgl_shaders_ocean.html
+++ b/examples/webgl_shaders_ocean.html
--- a/examples/webgl_shaders_sky.html
+++ b/examples/webgl_shaders_sky.html
--- a/examples/webvr_vive_paint.html
+++ b/examples/webvr_vive_paint.html
--- a/examples/webvr_vive_sculpt.html
+++ b/examples/webvr_vive_sculpt.html
--- a/package.json
+++ b/package.json
--- a/src/animation/PropertyBinding.js
+++ b/src/animation/PropertyBinding.js
--- a/src/cameras/CubeCamera.js
+++ b/src/cameras/CubeCamera.js
--- a/src/constants.js
+++ b/src/constants.js
--- a/src/core/BufferGeometry.js
+++ b/src/core/BufferGeometry.js
--- a/src/core/Geometry.js
+++ b/src/core/Geometry.js
--- a/src/geometries/BoxGeometry.js
+++ b/src/geometries/BoxGeometry.js
--- a/src/geometries/CircleGeometry.js
+++ b/src/geometries/CircleGeometry.js
--- a/src/geometries/CylinderGeometry.js
+++ b/src/geometries/CylinderGeometry.js
--- a/src/geometries/EdgesGeometry.js
+++ b/src/geometries/EdgesGeometry.js
--- a/src/geometries/LatheGeometry.js
+++ b/src/geometries/LatheGeometry.js
--- a/src/geometries/ParametricGeometry.js
+++ b/src/geometries/ParametricGeometry.js
--- a/src/geometries/PlaneGeometry.js
+++ b/src/geometries/PlaneGeometry.js
--- a/src/geometries/PolyhedronGeometry.js
+++ b/src/geometries/PolyhedronGeometry.js
--- a/src/geometries/RingGeometry.js
+++ b/src/geometries/RingGeometry.js
--- a/src/geometries/ShapeGeometry.js
+++ b/src/geometries/ShapeGeometry.js
--- a/src/geometries/SphereGeometry.js
+++ b/src/geometries/SphereGeometry.js
--- a/src/geometries/TextGeometry.js
+++ b/src/geometries/TextGeometry.js
--- a/src/geometries/TorusGeometry.js
+++ b/src/geometries/TorusGeometry.js
--- a/src/geometries/TorusKnotGeometry.js
+++ b/src/geometries/TorusKnotGeometry.js
--- a/src/geometries/TubeGeometry.js
+++ b/src/geometries/TubeGeometry.js
--- a/src/geometries/WireframeGeometry.js
+++ b/src/geometries/WireframeGeometry.js
--- a/src/helpers/ArrowHelper.js
+++ b/src/helpers/ArrowHelper.js
--- a/src/helpers/GridHelper.js
+++ b/src/helpers/GridHelper.js
--- a/src/loaders/ObjectLoader.js
+++ b/src/loaders/ObjectLoader.js
--- a/src/math/Box3.js
+++ b/src/math/Box3.js
--- a/src/renderers/WebGLRenderer.js
+++ b/src/renderers/WebGLRenderer.js
--- a/src/renderers/webgl/WebGLIndexedBufferRenderer.js
+++ b/src/renderers/webgl/WebGLIndexedBufferRenderer.js
--- a/src/renderers/webgl/WebGLObjects.js
+++ b/src/renderers/webgl/WebGLObjects.js
--- a/src/renderers/webgl/WebGLShadowMap.js
+++ b/src/renderers/webgl/WebGLShadowMap.js
--- a/src/renderers/webgl/WebGLUniforms.js
+++ b/src/renderers/webgl/WebGLUniforms.js
--- a/src/textures/Texture.js
+++ b/src/textures/Texture.js
--- a/src/utils.js
+++ b/src/utils.js
--- a/utils/exporters/blender/addons/io_three/constants.py
+++ b/utils/exporters/blender/addons/io_three/constants.py