Merge branch 'dev' of github.com:mrdoob/three.js into zh_doc

441c5321 · gogoend · e9142eca · 61ad2baf · 441c5321 · 441c5321
65 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/en/math/Matrix4.html
+++ b/docs/api/en/math/Matrix4.html
@@ -56,7 +56,7 @@

 			This means that calling
 		<code>
-var m = new Matrix4();
+var m = new THREE.Matrix4();

 m.set( 11, 12, 13, 14,
       21, 22, 23, 24,

--- a/docs/manual/en/introduction/Creating-a-scene.html
+++ b/docs/manual/en/introduction/Creating-a-scene.html
@@ -20,7 +20,7 @@
 		&lt;!DOCTYPE html&gt;
 		&lt;html&gt;
 			&lt;head&gt;
-				&lt;meta charset=utf-8&gt;
+				&lt;meta charset="utf-8"&gt;
 				&lt;title&gt;My first three.js app&lt;/title&gt;
 				&lt;style&gt;
 					body { margin: 0; }
@@ -118,7 +118,7 @@
 		<h2>The result</h2>
 		<p>Congratulations! You have now completed your first three.js application. It's simple, you have to start somewhere.</p>

-		<p>The full code is available below. Play around with it to get a better understanding of how it works.</p>
+		<p>The full code is available below and as an editable [link:https://jsfiddle.net/mkba0ecu/ live example]. Play around with it to get a better understanding of how it works.</p>

 		<code>
 		&lt;html&gt;

--- a/docs/manual/zh/introduction/Creating-a-scene.html
+++ b/docs/manual/zh/introduction/Creating-a-scene.html
@@ -20,7 +20,7 @@
 		&lt;!DOCTYPE html&gt;
 		&lt;html&gt;
 			&lt;head&gt;
-				&lt;meta charset=utf-8&gt;
+				&lt;meta charset="utf-8"&gt;
 				&lt;title&gt;My first three.js app&lt;/title&gt;
 				&lt;style&gt;
 					body { margin: 0; }

--- a/editor/index.html
+++ b/editor/index.html
@@ -22,8 +22,6 @@
 		<script src="../examples/js/libs/chevrotain.min.js"></script> <!-- VRML -->
 		<script src="../examples/js/libs/jszip.min.js"></script>
 		<script src="../examples/js/libs/inflate.min.js"></script> <!-- FBX -->
-		<script src="../examples/js/libs/lzma.js"></script> <!-- CTM -->
-		<script src="../examples/js/libs/ctm.js"></script> <!-- CTM -->

 		<script src="../examples/js/loaders/AMFLoader.js"></script>
 		<script src="../examples/js/loaders/AWDLoader.js"></script>
@@ -45,7 +43,6 @@
 		<script src="../examples/js/loaders/TDSLoader.js"></script>
 		<script src="../examples/js/loaders/VRMLLoader.js"></script>
 		<script src="../examples/js/loaders/VTKLoader.js"></script>
-		<script src="../examples/js/loaders/ctm/CTMLoader.js"></script>

 		<script src="../examples/js/exporters/ColladaExporter.js"></script>
 		<script src="../examples/js/exporters/GLTFExporter.js"></script>

--- a/editor/js/Loader.js
+++ b/editor/js/Loader.js
--- a/editor/sw.js
+++ b/editor/sw.js
@@ -13,8 +13,6 @@ const staticAssets = [
 	'../examples/js/libs/chevrotain.min.js',
 	'../examples/js/libs/jszip.min.js',
 	'../examples/js/libs/inflate.min.js',
-	'../examples/js/libs/lzma.js',
-	'../examples/js/libs/ctm.js',

 	'../examples/js/loaders/AMFLoader.js',
 	'../examples/js/loaders/AWDLoader.js',
@@ -36,7 +34,6 @@ const staticAssets = [
 	'../examples/js/loaders/TDSLoader.js',
 	'../examples/js/loaders/VRMLLoader.js',
 	'../examples/js/loaders/VTKLoader.js',
-	'../examples/js/loaders/ctm/CTMLoader.js',

 	'../examples/js/exporters/ColladaExporter.js',
 	'../examples/js/exporters/GLTFExporter.js',

--- a/examples/files.js
+++ b/examples/files.js
--- a/examples/js/controls/OrbitControls.js
+++ b/examples/js/controls/OrbitControls.js
--- a/examples/js/libs/ctm.js
+++ b/examples/js/libs/ctm.js
--- a/examples/js/libs/lzma.js
+++ b/examples/js/libs/lzma.js
--- a/examples/js/loaders/STLLoader.js
+++ b/examples/js/loaders/STLLoader.js
--- a/examples/js/loaders/ctm/CTMLoader.js
+++ b/examples/js/loaders/ctm/CTMLoader.js
--- a/examples/js/loaders/ctm/CTMWorker.js
+++ b/examples/js/loaders/ctm/CTMWorker.js
--- a/examples/jsm/controls/OrbitControls.js
+++ b/examples/jsm/controls/OrbitControls.js
--- a/examples/jsm/loaders/GLTFLoader.js
+++ b/examples/jsm/loaders/GLTFLoader.js
@@ -2205,6 +2205,7 @@ var GLTFLoader = ( function () {
 				pointsMaterial.color.copy( material.color );
 				pointsMaterial.map = material.map;
 				pointsMaterial.lights = false; // PointsMaterial doesn't support lights yet
+				pointsMaterial.sizeAttenuation = false; // glTF spec says points should be 1px

 				this.cache.add( cacheKey, pointsMaterial );


--- a/examples/jsm/loaders/STLLoader.js
+++ b/examples/jsm/loaders/STLLoader.js
--- a/examples/jsm/loaders/ctm/CTMLoader.d.ts
+++ b/examples/jsm/loaders/ctm/CTMLoader.d.ts
--- a/examples/jsm/loaders/ctm/CTMLoader.js
+++ b/examples/jsm/loaders/ctm/CTMLoader.js
--- a/examples/jsm/nodes/core/FunctionNode.js
+++ b/examples/jsm/nodes/core/FunctionNode.js
--- a/examples/jsm/nodes/materials/nodes/StandardNode.js
+++ b/examples/jsm/nodes/materials/nodes/StandardNode.js
--- a/examples/jsm/nodes/misc/TextureCubeNode.js
+++ b/examples/jsm/nodes/misc/TextureCubeNode.js
--- a/examples/models/ctm/LeePerry.ctm
+++ b/examples/models/ctm/LeePerry.ctm
--- a/examples/models/ctm/WaltHead.ctm
+++ b/examples/models/ctm/WaltHead.ctm
--- a/examples/models/ctm/ben.ctm
+++ b/examples/models/ctm/ben.ctm
--- a/examples/models/ctm/camaro/camaro.ctm
+++ b/examples/models/ctm/camaro/camaro.ctm
--- a/examples/models/ctm/camaro/camaro.js
+++ b/examples/models/ctm/camaro/camaro.js
--- a/examples/models/ctm/camaro/car-ao.png
+++ b/examples/models/ctm/camaro/car-ao.png
--- a/examples/models/ctm/camaro/plane-ao-256.png
+++ b/examples/models/ctm/camaro/plane-ao-256.png
--- a/examples/models/ctm/hand.ctm
+++ b/examples/models/ctm/hand.ctm
--- a/examples/textures/nvidia_tentacle/tentacle_object_space.png
+++ b/examples/textures/nvidia_tentacle/tentacle_object_space.png
--- a/examples/textures/nvidia_tentacle/tentacle_tangent_space.png
+++ b/examples/textures/nvidia_tentacle/tentacle_tangent_space.png
--- a/examples/textures/pbr/Scratched_gold/Scratched_gold.txt
+++ b/examples/textures/pbr/Scratched_gold/Scratched_gold.txt
--- a/examples/textures/pbr/Scratched_gold/Scratched_gold_01_1K_AO.png
+++ b/examples/textures/pbr/Scratched_gold/Scratched_gold_01_1K_AO.png
--- a/examples/textures/pbr/Scratched_gold/Scratched_gold_01_1K_Base_Color.png
+++ b/examples/textures/pbr/Scratched_gold/Scratched_gold_01_1K_Base_Color.png
--- a/examples/textures/pbr/Scratched_gold/Scratched_gold_01_1K_Height.png
+++ b/examples/textures/pbr/Scratched_gold/Scratched_gold_01_1K_Height.png
--- a/examples/textures/pbr/Scratched_gold/Scratched_gold_01_1K_Normal.png
+++ b/examples/textures/pbr/Scratched_gold/Scratched_gold_01_1K_Normal.png
--- a/examples/textures/pbr/Scratched_gold/Scratched_gold_01_1K_Roughness.png
+++ b/examples/textures/pbr/Scratched_gold/Scratched_gold_01_1K_Roughness.png
--- a/examples/webgl_furnace_test.html
+++ b/examples/webgl_furnace_test.html
--- a/examples/webgl_loader_ctm_materials.html
+++ b/examples/webgl_loader_ctm_materials.html
--- a/examples/webgl_loader_stl.html
+++ b/examples/webgl_loader_stl.html
--- a/examples/webgl_materials_clearcoat_normalmap.html
+++ b/examples/webgl_materials_clearcoat_normalmap.html
--- a/examples/webgl_materials_nodes.html
+++ b/examples/webgl_materials_nodes.html
--- a/src/Three.Legacy.js
+++ b/src/Three.Legacy.js
--- a/src/animation/PropertyBinding.js
+++ b/src/animation/PropertyBinding.js
--- a/src/core/BufferGeometry.js
+++ b/src/core/BufferGeometry.js
--- a/src/core/Geometry.js
+++ b/src/core/Geometry.js
--- a/src/core/Object3D.js
+++ b/src/core/Object3D.js
--- a/src/loaders/Loader.js
+++ b/src/loaders/Loader.js
--- a/src/loaders/MaterialLoader.js
+++ b/src/loaders/MaterialLoader.js
--- a/src/materials/Material.js
+++ b/src/materials/Material.js
--- a/src/objects/Points.js
+++ b/src/objects/Points.js
--- a/src/polyfills.js
+++ b/src/polyfills.js
--- a/src/renderers/shaders/ShaderChunk/dithering_fragment.glsl.js
+++ b/src/renderers/shaders/ShaderChunk/dithering_fragment.glsl.js
--- a/src/renderers/shaders/ShaderChunk/dithering_pars_fragment.glsl.js
+++ b/src/renderers/shaders/ShaderChunk/dithering_pars_fragment.glsl.js
--- a/src/renderers/shaders/ShaderChunk/lights_fragment_maps.glsl.js
+++ b/src/renderers/shaders/ShaderChunk/lights_fragment_maps.glsl.js
--- a/src/renderers/shaders/ShaderChunk/shadowmap_pars_fragment.glsl.js
+++ b/src/renderers/shaders/ShaderChunk/shadowmap_pars_fragment.glsl.js
--- a/src/renderers/shaders/ShaderChunk/uv_pars_fragment.glsl.js
+++ b/src/renderers/shaders/ShaderChunk/uv_pars_fragment.glsl.js
--- a/src/renderers/shaders/ShaderChunk/uv_pars_vertex.glsl.js
+++ b/src/renderers/shaders/ShaderChunk/uv_pars_vertex.glsl.js
--- a/src/renderers/shaders/ShaderChunk/uv_vertex.glsl.js
+++ b/src/renderers/shaders/ShaderChunk/uv_vertex.glsl.js
--- a/src/renderers/webgl/WebGLProgram.js
+++ b/src/renderers/webgl/WebGLProgram.js
--- a/src/renderers/webgl/WebGLPrograms.js
+++ b/src/renderers/webgl/WebGLPrograms.js
--- a/utils/modularize.js
+++ b/utils/modularize.js