Merge branch 'dev' into occ

aardgoose · Sep 29, 2023 · f0947a8 · f0947a8
2 parents 55099e3 + 181e04e
commit f0947a8
Show file tree

Hide file tree

Showing 1,056 changed files with 3,949 additions and 7,197 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Git checkout
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
       - name: Install Node
         uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3
         with:
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Git checkout
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
       - name: Install Node
         uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3
         with:
@@ -63,7 +63,7 @@ jobs:
       CI: ${{ matrix.CI }}
     steps:
       - name: Git checkout
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
       - name: Install Node
         uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3
         with:
@@ -89,7 +89,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Git checkout
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
       - name: Install Node
         uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3
         with:

diff --git a/.github/workflows/codeql-code-scanning.yml b/.github/workflows/codeql-code-scanning.yml
@@ -26,20 +26,20 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+      uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2
+      uses: github/codeql-action/init@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2
       with:
         languages: ${{ matrix.language }}
         config-file: ./.github/codeql-config.yml
         queries: security-and-quality
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2
+      uses: github/codeql-action/autobuild@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2
+      uses: github/codeql-action/analyze@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/read-size.yml b/.github/workflows/read-size.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Git checkout
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
       - name: Install Node
         uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3
         with:

diff --git a/.github/workflows/report-size.yml b/.github/workflows/report-size.yml
@@ -56,7 +56,7 @@ jobs:
 
       # This runs on the base branch of the PR, meaning "dev"
       - name: Git checkout
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
       - name: Install Node
         uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3
         with:

diff --git a/build/three.cjs b/build/three.cjs
diff --git a/build/three.js b/build/three.js
diff --git a/build/three.min.js b/build/three.min.js
diff --git a/build/three.module.js b/build/three.module.js
diff --git a/build/three.module.min.js b/build/three.module.min.js
diff --git a/docs/api/ar/animation/AnimationUtils.html b/docs/api/ar/animation/AnimationUtils.html
@@ -17,11 +17,6 @@ <h1>[name]</h1>
 		<h2>الوظائف (Methods)</h2>
 
 
-		<h3>[method:Array arraySlice]( array, from, to )</h3>
-		<p>
-		نفسه عمل Array.prototype.slice ، ولكنه يعمل أيضًا على المصفوفات المكتوبة.
-		</p>
-
 		<h3>[method:Array convertArray]( array, type, forceClone )</h3>
 		<p>
 		يحول مصفوفة إلى نوع معين.

diff --git a/docs/api/ar/scenes/Fog.html b/docs/api/ar/scenes/Fog.html
@@ -17,8 +17,8 @@ <h1>[name]</h1>
 		<h2>مثال للكود</h2>
 
 		<code>
-		const scene = new THREE.Scene();
-		scene.fog = new THREE.Fog( 0xcccccc, 10, 15 );
+			const scene = new THREE.Scene();
+			scene.fog = new THREE.Fog( 0xcccccc, 10, 15 );
 		</code>
 
 		<h2>المنشئ (Constructor)</h2>

diff --git a/docs/api/ar/scenes/FogExp2.html b/docs/api/ar/scenes/FogExp2.html
@@ -18,8 +18,8 @@ <h1>[name]</h1>
 		<h2>مثال للكود</h2>
 
 		<code>
-		const scene = new THREE.Scene();
-		scene.fog = new THREE.FogExp2( 0xcccccc, 0.002 );
+			const scene = new THREE.Scene();
+			scene.fog = new THREE.FogExp2( 0xcccccc, 0.002 );
 		</code>
 
 		<h2>المنشئ (Constructor)</h2>

diff --git a/docs/api/en/animation/AnimationUtils.html b/docs/api/en/animation/AnimationUtils.html
@@ -16,11 +16,6 @@ <h1>[name]</h1>
 
 		<h2>Methods</h2>
 
-		<h3>[method:Array arraySlice]( array, from, to )</h3>
-		<p>
-			This is the same as Array.prototype.slice, but also works on typed arrays.
-		</p>
-
 		<h3>[method:Array convertArray]( array, type, forceClone )</h3>
 		<p>Converts an array to a specific type.</p>
 

diff --git a/docs/api/en/core/BufferGeometry.html b/docs/api/en/core/BufferGeometry.html
@@ -191,6 +191,7 @@ <h3>[property:Object userData]</h3>
 		<p>
 			An object that can be used to store custom data about the BufferGeometry.
 			It should not hold references to functions as these will not be cloned.
+			Default is an empty object `{}`.
 		</p>
 
 		<h3>[property:String uuid]</h3>

diff --git a/docs/api/en/core/Object3D.html b/docs/api/en/core/Object3D.html
@@ -206,6 +206,7 @@ <h3>[property:Object userData]</h3>
 		<p>
 			An object that can be used to store custom data about the Object3D. It
 			should not hold references to functions as these will not be cloned.
+			Default is an empty object `{}`.
 		</p>
 
 		<h3>[property:String uuid]</h3>

diff --git a/docs/api/en/materials/Material.html b/docs/api/en/materials/Material.html
@@ -369,6 +369,7 @@ <h3>[property:Object userData]</h3>
 		<p>
 			An object that can be used to store custom data about the Material. It
 			should not hold references to functions as these will not be cloned.
+			Default is an empty object `{}`.
 		</p>
 
 		<h2>Methods</h2>

diff --git a/docs/api/en/scenes/Fog.html b/docs/api/en/scenes/Fog.html
@@ -16,8 +16,9 @@ <h1>[name]</h1>
 
 		<h2>Code Example</h2>
 
-		<code>const scene = new THREE.Scene();
-		scene.fog = new THREE.Fog( 0xcccccc, 10, 15 );
+		<code>
+			const scene = new THREE.Scene();
+			scene.fog = new THREE.Fog( 0xcccccc, 10, 15 );
 		</code>
 
 		<h2>Constructor</h2>

diff --git a/docs/api/en/scenes/FogExp2.html b/docs/api/en/scenes/FogExp2.html
@@ -18,8 +18,8 @@ <h1>[name]</h1>
 		<h2>Code Example</h2>
 
 		<code>
-const scene = new THREE.Scene();
-scene.fog = new THREE.FogExp2( 0xcccccc, 0.002 );
+			const scene = new THREE.Scene();
+			scene.fog = new THREE.FogExp2( 0xcccccc, 0.002 );
 		</code>
 
 		<h2>Constructor</h2>

diff --git a/docs/api/en/textures/Texture.html b/docs/api/en/textures/Texture.html
@@ -281,6 +281,7 @@ <h3>[property:Object userData]</h3>
 		<p>
 			An object that can be used to store custom data about the texture. It
 			should not hold references to functions as these will not be cloned.
+			Default is an empty object `{}`.
 		</p>
 
 		<h3>[property:Source source]</h3>

diff --git a/docs/api/fr/animation/AnimationUtils.html b/docs/api/fr/animation/AnimationUtils.html
@@ -17,11 +17,6 @@ <h1>[name]</h1>
 		<h2>Méthodes</h2>
 
 
-		<h3>[method:Array arraySlice]( array, from, to )</h3>
-		<p>
-		Cette méthode est la même que Array.prototype.slice, mais fonctionne également sur les tableaux typés.
-		</p>
-
 		<h3>[method:Array convertArray]( array, type, forceClone )</h3>
 		<p>
 		Convertis un tableau en un type spécifique.

diff --git a/docs/api/it/animation/AnimationUtils.html b/docs/api/it/animation/AnimationUtils.html
@@ -17,11 +17,6 @@ <h1>[name]</h1>
 		<h2>Metodi</h2>
 
 
-		<h3>[method:Array arraySlice]( array, from, to )</h3>
-		<p>
-      È lo stesso di Array.prototype.slice, ma funziona anche su array tipizzati.
-		</p>
-
 		<h3>[method:Array convertArray]( array, type, forceClone )</h3>
 		<p>
       Converte un array in un tipo specifico.

diff --git a/docs/api/it/scenes/Fog.html b/docs/api/it/scenes/Fog.html
@@ -13,8 +13,9 @@ <h1>[name]</h1>
 
 		<h2>Codice di Esempio</h2>
 
-		<code>const scene = new THREE.Scene();
-		scene.fog = new THREE.Fog( 0xcccccc, 10, 15 );
+		<code>
+			const scene = new THREE.Scene();
+			scene.fog = new THREE.Fog( 0xcccccc, 10, 15 );
 		</code>
 
 		<h2>Costruttore</h2>

diff --git a/docs/api/it/scenes/FogExp2.html b/docs/api/it/scenes/FogExp2.html
@@ -17,8 +17,9 @@ <h1>[name]</h1>
 
 		<h2>Codice di Esempio</h2>
 
-		<code>const scene = new THREE.Scene();
-		scene.fog = new THREE.FogExp2( 0xcccccc, 0.002 );
+		<code>
+			const scene = new THREE.Scene();
+			scene.fog = new THREE.FogExp2( 0xcccccc, 0.002 );
 		</code>
 
 		<h2>Costruttore</h2>

diff --git a/docs/api/ko/animation/AnimationUtils.html b/docs/api/ko/animation/AnimationUtils.html
@@ -17,11 +17,6 @@ <h1>[name]</h1>
 		<h2>메서드</h2>
 
 
-		<h3>[method:Array arraySlice]( array, from, to )</h3>
-		<p>
-		Array.prototype.slice와 동일하지만, 타입 배열에서도 작동합니다.
-		</p>
-
 		<h3>[method:Array convertArray]( array, type, forceClone )</h3>
 		<p>
 		배열을 특정 타입으로 변환합니다.

diff --git a/docs/api/pt-br/animation/AnimationUtils.html b/docs/api/pt-br/animation/AnimationUtils.html
@@ -17,11 +17,6 @@ <h1>[name]</h1>
 		<h2>Métodos</h2>
 
 
-		<h3>[method:Array arraySlice]( array, from, to )</h3>
-		<p>
-			É o mesmo que Array.prototype.slice, mas também funciona em arrays tipados.
-		</p>
-
 		<h3>[method:Array convertArray]( array, type, forceClone )</h3>
 		<p>
 			Converte um array em um tipo específico.

diff --git a/docs/api/zh/animation/AnimationUtils.html b/docs/api/zh/animation/AnimationUtils.html
@@ -17,11 +17,6 @@ <h1>[name]</h1>
 		<h2>方法</h2>
 
 
-		<h3>[method:Array arraySlice]( array, from, to )</h3>
-		<p>
-		和Array.prototype.slice作用一样, 但也适用于类型化数组.
-		</p>
-
 		<h3>[method:Array convertArray]( array, type, forceClone )</h3>
 		<p>
 		将数组转换为某种特定类型。

diff --git a/docs/api/zh/materials/SpriteMaterial.html b/docs/api/zh/materials/SpriteMaterial.html
@@ -36,7 +36,7 @@ <h2>构造函数(Constructor)</h2>
 		<h3>[name]( [param:Object parameters] )</h3>
 		<p>
 			[page:Object parameters] - (可选)用于定义材质外观的对象，具有一个或多个属性。
-			材质的任何属性都可以从此处传入(包括从[page:Material] 和 [page:ShaderMaterial]继承的任何属性)。<br /><br />
+			材质的任何属性都可以从此处传入(包括从[page:Material]继承的任何属性)。<br /><br />
 
 			属性[page:Hexadecimal color]例外，其可以作为十六进制字符串传递，默认情况下为 *0xffffff*（白色），
 			内部调用[page:Color.set](color)。

diff --git a/docs/api/zh/scenes/Fog.html b/docs/api/zh/scenes/Fog.html
@@ -13,8 +13,9 @@ <h1>雾（[name]）</h1>
 
 		<h2>代码示例</h2>
 
-		<code>const scene = new THREE.Scene();
-		scene.fog = new THREE.Fog( 0xcccccc, 10, 15 );
+		<code>
+			const scene = new THREE.Scene();
+			scene.fog = new THREE.Fog( 0xcccccc, 10, 15 );
 		</code>
 
 		<h2>构造器</h2>

diff --git a/docs/api/zh/scenes/FogExp2.html b/docs/api/zh/scenes/FogExp2.html
@@ -13,8 +13,9 @@ <h1>雾-指数（[name]）</h1>
 
 		<h2>代码示例</h2>
 
-		<code>const scene = new THREE.Scene();
-		scene.fog = new THREE.FogExp2( 0xcccccc, 0.002 );
+		<code>
+			const scene = new THREE.Scene();
+			scene.fog = new THREE.FogExp2( 0xcccccc, 0.002 );
 		</code>
 
 		<h2>构造器</h2>

diff --git a/docs/examples/en/controls/DragControls.html b/docs/examples/en/controls/DragControls.html
@@ -100,6 +100,11 @@ <h3>[property:Boolean enabled]</h3>
 			Whether or not the controls are enabled.
 		</p>
 
+		<h3>[property:Boolean recursive]</h3>
+		<p>
+			Whether children of draggable objects can be dragged independently from their parent. Default is `true`.
+		</p>
+
 		<h3>[property:Boolean transformGroup]</h3>
 		<p>
 			This option only works if the [page:DragControls.objects] array contains a single draggable group object.

diff --git a/docs/examples/en/exporters/EXRExporter.html b/docs/examples/en/exporters/EXRExporter.html
@@ -78,6 +78,15 @@ <h3>[method:null parse]( [param:WebGLRenderer renderer], [param:WebGLRenderTarge
 		Generates a .exr output from the input render target.
 		</p>
 
+		<h3>[method:null parse]( [param:DataTexture dataTexture], [param:Object options] )</h3>
+		<p>
+		[page:Function dataTexture] — DataTexture containing data used for exporting EXR image.<br /> 
+		[page:Options options] — Export options (details above).<br />
+		</p>
+		<p>
+		Generates a .exr output from the input data texture.
+		</p>
+
 		<h2>Source</h2>
 
 		<p>

diff --git a/docs/manual/ar/introduction/Installation.html b/docs/manual/ar/introduction/Installation.html
@@ -85,8 +85,6 @@ <h2>التثبيت من CDN أو استضافة ثابتة</h2>
 		</p>
 
 		<code>
-		&lt;script async src="https://unpkg.com/es-module-shims@1.8.0/dist/es-module-shims.js">&lt;/script>
-
 		&lt;script type="importmap">
 			{
 			"imports": {
@@ -126,8 +124,6 @@ <h2>أمثلة</h2>
 		</p>
 
 		<code>
-		&lt;script async src="https://unpkg.com/es-module-shims@1.8.0/dist/es-module-shims.js">&lt;/script>
-
 		&lt;script type="importmap">
 			{
 			"imports": {

diff --git a/docs/manual/en/introduction/Installation.html b/docs/manual/en/introduction/Installation.html
@@ -149,8 +149,6 @@ <h3>Development</h3>
 					We imported code from 'three' (an npm package) in <i>main.js</i>, and web browsers don't know what that means. In <i>index.html</i> we'll need to add an [link:https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script/type/importmap import map] defining where to get the package. Put the code below inside the <i>&lt;head>&lt/head></i> tag, after the styles.
 				</p>
 				<code>
-&lt;script async src="https://unpkg.com/es-module-shims@1.8.0/dist/es-module-shims.js">&lt;/script>
-
 &lt;script type="importmap">
   {
     "imports": {
@@ -161,7 +159,7 @@ <h3>Development</h3>
 &lt;/script>
 				</code>
 				<p>
-					Don't forget to replace <i>&lt;version&gt;</i> with an actual version of three.js, like <i>"v0.149.0"</i>. The most recent version can be found on the [link:https://www.npmjs.com/package/three?activeTab=versions npm version list]. Because import maps are [link:https://caniuse.com/import-maps not yet supported] by some major browsers, we include the polyfill <i>es-module-shims.js</i>.
+					Don't forget to replace <i>&lt;version&gt;</i> with an actual version of three.js, like <i>"v0.149.0"</i>. The most recent version can be found on the [link:https://www.npmjs.com/package/three?activeTab=versions npm version list].
 				</p>
 			</li>
 			<li>

diff --git a/docs/manual/en/introduction/Libraries-and-Plugins.html b/docs/manual/en/introduction/Libraries-and-Plugins.html
@@ -96,15 +96,17 @@ <h3>Game AI</h3>
 		<ul>
 			<li>[link:https://mugen87.github.io/yuka/ yuka]</li>
 			<li>[link:https://github.com/donmccurdy/three-pathfinding three-pathfinding]</li>
+			<li>[link:https://github.com/isaac-mason/recast-navigation-js recast-navigation-js]</li>
 		</ul>
 
 		<h3>Wrappers and Frameworks</h3>
 
 		<ul>
 			<li>[link:https://aframe.io/ A-Frame]</li>
-			<li>[link:https://github.com/pmndrs/react-three-fiber react-three-fiber]</li>
+			<li>[link:https://lume.io/ Lume] - HTML elements for 3D graphics built on Three.</li>
+			<li>[link:https://github.com/pmndrs/react-three-fiber react-three-fiber] - React components for 3D graphics built on Three.</li>
 			<li>[link:https://github.com/ecsyjs/ecsy-three ECSY]</li>
-			<li>[link:https://threlte.xyz/ Threlte]</li>
+			<li>[link:https://threlte.xyz/ Threlte] - Svelte components for 3D graphics built on Three.</li>
 			<li>[link:https://needle.tools/ Needle Engine]</li>
 		</ul>