Merge branch 'master' into dev

.github/PULL_REQUEST_TEMPLATE.md

@@ -25,6 +25,7 @@ To check an item, place an "x" in the box like so: "- [x] Documentation"
 Remove items that are irrelevant to your changes.
 -->
 
+-   [ ] Checked the target branch (current goes `master`, next goes `dev`)
 -   [ ] Added myself to contributors table
 -   [ ] Ready to be merged
 

README.md

@@ -65,6 +65,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <tr>
     <td align="center"><a href="https://xk.io/"><img src="https://avatars.githubusercontent.com/u/1046448?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Max Kaye</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=XertroV" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/LauferAlex"><img src="https://avatars.githubusercontent.com/u/86115165?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alejandro Laufer</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/issues?q=author%3ALauferAlex" title="Bug reports">🐛</a> <a href="https://github.com/three-types/three-ts-types/commits?author=LauferAlex" title="Code">💻</a></td>
+    <td align="center"><a href="http://www.joemo.co.uk"><img src="https://avatars.githubusercontent.com/u/39060404?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joe Tipping</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=Gallahron" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/r00ster91"><img src="https://avatars.githubusercontent.com/u/35064754?v=4?s=100" width="100px;" alt=""/><br /><sub><b>r00ster91</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=Gallahron" title="Code">💻</a></td>
+  </tr>
   </tr>
 </table>
 

types/three/OTHER_FILES.txt

@@ -256,6 +256,7 @@ examples/jsm/shaders/VolumeShader.d.ts
 examples/jsm/shaders/WaterRefractionShader.d.ts
 examples/jsm/utils/BufferGeometryUtils.d.ts
 examples/jsm/utils/GeometryCompressionUtils.d.ts
+examples/jsm/utils/PackedPhongMaterial.d.ts
 examples/jsm/utils/SceneUtils.d.ts
 examples/jsm/utils/ShadowMapViewer.d.ts
 examples/jsm/utils/SkeletonUtils.d.ts

types/three/examples/jsm/WebGL.d.ts → types/three/examples/jsm/capabilities/WebGL.d.ts

@@ -1,7 +1,9 @@
-export namespace WEBGL {
+declare namespace WEBGL {
     function isWebGLAvailable(): boolean;
     function isWebGL2Available(): boolean;
     function getWebGLErrorMessage(): HTMLElement;
     function getWebGL2ErrorMessage(): HTMLElement;
     function getErrorMessage(version: number): HTMLElement;
 }
+
+export default WEBGL;

types/three/examples/jsm/controls/OrbitControls.d.ts

@@ -42,7 +42,6 @@ export class OrbitControls {
     autoRotate: boolean;
     autoRotateSpeed: number;
 
-    enableKeys: boolean;
     keys: { LEFT: string; UP: string; RIGHT: string; BOTTOM: string };
     mouseButtons: { LEFT: MOUSE; MIDDLE: MOUSE; RIGHT: MOUSE };
     touches: { ONE: TOUCH; TWO: TOUCH };

types/three/examples/jsm/utils/PackedPhongMaterial.d.ts

@@ -0,0 +1,10 @@
+/**
+ * `PackedPhongMaterial` inherited from THREE.MeshPhongMaterial
+ *
+ * @param {Object} parameters
+ */
+import { MeshPhongMaterial, MeshPhongMaterialParameters } from '../../../src/Three';
+
+export class PackedPhongMaterial extends MeshPhongMaterial {
+    constructor(parameters: MeshPhongMaterialParameters);
+}

types/three/examples/jsm/utils/SceneUtils.d.ts

@@ -1,14 +1,12 @@
 import { BufferGeometry, Group, InstancedMesh, Material, Object3D, Scene } from '../../../src/Three';
 
-export namespace SceneUtils {
-    function createMeshesFromInstancedMesh(instancedMesh: InstancedMesh): Group;
-    function createMultiMaterialObject(geometry: BufferGeometry, materials: Material[]): Group;
-    /**
-     * @deprecated Use scene.attach( child ) instead.
-     */
-    function detach(child: Object3D, parent: Object3D, scene: Scene): void;
-    /**
-     * @deprecated Use parent.attach( child ) instead.
-     */
-    function attach(child: Object3D, scene: Scene, parent: Object3D): void;
-}
+export function createMeshesFromInstancedMesh(instancedMesh: InstancedMesh): Group;
+export function createMultiMaterialObject(geometry: BufferGeometry, materials: Material[]): Group;
+/**
+ * @deprecated Use scene.attach( child ) instead.
+ */
+export function detach(child: Object3D, parent: Object3D, scene: Scene): void;
+/**
+ * @deprecated Use parent.attach( child ) instead.
+ */
+export function attach(child: Object3D, scene: Scene, parent: Object3D): void;

types/three/index.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for three 0.136
+// Type definitions for three 0.137
 // Project: https://threejs.org/
 // Definitions by: Josh Ellis <https://github.com/joshuaellis>
 //                 Nathan Bierema <https://github.com/Methuselah96>

types/three/src/constants.d.ts

@@ -302,8 +302,6 @@ export enum TextureEncoding {}
 export const LinearEncoding: TextureEncoding;
 export const sRGBEncoding: TextureEncoding;
 export const LogLuvEncoding: TextureEncoding;
-export const RGBM7Encoding: TextureEncoding;
-export const RGBM16Encoding: TextureEncoding;
 
 // Depth packing strategies
 export enum DepthPackingStrategies {}

types/three/src/core/Raycaster.d.ts

@@ -22,6 +22,7 @@ export interface Intersection<TIntersected extends Object3D = Object3D> {
     faceIndex?: number | undefined;
     object: TIntersected;
     uv?: Vector2 | undefined;
+    uv2?: Vector2 | undefined;
     instanceId?: number | undefined;
 }
 
@@ -94,7 +95,7 @@ export class Raycaster {
     /**
      * Checks all intersection between the ray and the object with or without the descendants. Intersections are returned sorted by distance, closest first.
      * @param object The object to check for intersection with the ray.
-     * @param recursive If true, it also checks all descendants. Otherwise it only checks intersecton with the object. Default is false.
+     * @param recursive If true, it also checks all descendants. Otherwise it only checks intersecton with the object. Default is true.
      * @param optionalTarget (optional) target to set the result. Otherwise a new Array is instantiated. If set, you must clear this array prior to each call (i.e., array.length = 0;).
      */
     intersectObject<TIntersected extends Object3D>(
@@ -108,7 +109,7 @@ export class Raycaster {
      * Intersections are returned sorted by distance, closest first.
      * Intersections are of the same form as those returned by .intersectObject.
      * @param objects The objects to check for intersection with the ray.
-     * @param recursive If true, it also checks all descendants of the objects. Otherwise it only checks intersecton with the objects. Default is false.
+     * @param recursive If true, it also checks all descendants of the objects. Otherwise it only checks intersecton with the objects. Default is true.
      * @param optionalTarget (optional) target to set the result. Otherwise a new Array is instantiated. If set, you must clear this array prior to each call (i.e., array.length = 0;).
      */
     intersectObjects<TIntersected extends Object3D>(

types/three/src/renderers/webxr/WebXRManager.d.ts

@@ -25,7 +25,7 @@ export class WebXRManager extends EventDispatcher {
     getSession(): XRSession | null;
     setSession(value: XRSession): Promise<void>;
     getCamera(camera: Camera): Camera;
-    setAnimationLoop(callback: XRFrameRequestCallback): void;
+    setAnimationLoop(callback: XRFrameRequestCallback | null): void;
     getFoveation(): number | undefined;
     setFoveation(foveation: number): void;
     dispose(): void;

types/three/test/loaders/loaders-voxloader.ts

@@ -2,7 +2,7 @@ import * as THREE from 'three';
 import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
 import { VOXLoader, VOXData3DTexture } from 'three/examples/jsm/loaders/VOXLoader';
 
-import { WEBGL } from 'three/examples/jsm/WebGL';
+import WEBGL from 'three/examples/jsm/capabilities/WebGL';
 
 if (!WEBGL.isWebGL2Available()) {
     document.body.appendChild(WEBGL.getWebGL2ErrorMessage());

types/three/test/materials/materials-envmaps-hdr.ts

@@ -123,11 +123,12 @@ function init() {
     });
 
     const rgbmUrls = ['px.png', 'nx.png', 'py.png', 'ny.png', 'pz.png', 'nz.png'];
-    rgbmCubeMap = new RGBMLoader().setPath('./textures/cube/pisaRGBM16/').loadCubemap(rgbmUrls, () => {
-        rgbmCubeMap.encoding = THREE.RGBM16Encoding;
-
-        rgbmCubeRenderTarget = pmremGenerator.fromCubemap(rgbmCubeMap);
-    });
+    rgbmCubeMap = new RGBMLoader()
+        .setMaxRange(16)
+        .setPath('./textures/cube/pisaRGBM16/')
+        .loadCubemap(rgbmUrls, () => {
+            rgbmCubeRenderTarget = pmremGenerator.fromCubemap(rgbmCubeMap);
+        });
 
     const pmremGenerator = new THREE.PMREMGenerator(renderer);
     pmremGenerator.compileCubemapShader();

types/three/test/materials/materials-texture3d-partialupdate.ts

@@ -2,7 +2,7 @@ import * as THREE from 'three';
 import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
 import { ImprovedNoise } from 'three/examples/jsm/math/ImprovedNoise';
 
-import { WEBGL } from 'three/examples/jsm/WebGL';
+import WEBGL from 'three/examples/jsm/capabilities/WebGL';
 
 if (!WEBGL.isWebGL2Available()) {
     document.body.appendChild(WEBGL.getWebGL2ErrorMessage());

types/three/test/renderers/renderers-renderTarget-multiple.ts

@@ -1,6 +1,6 @@
 import * as THREE from 'three';
 
-import { WEBGL } from 'three/examples/jsm/WebGL';
+import WEBGL from 'three/examples/jsm/capabilities/WebGL';
 import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
 
 let camera: THREE.PerspectiveCamera;

types/three/test/renderers/renderers-renderTarget-texture2DArray.ts

@@ -1,7 +1,7 @@
 import * as THREE from 'three';
 
 import { unzipSync } from 'three/examples/jsm/libs/fflate.module.min';
-import { WEBGL } from 'three/examples/jsm/WebGL';
+import WEBGL from 'three/examples/jsm/capabilities/WebGL';
 
 const vertextPostProcessingShader = /* glsl */ `
 	out vec2 vUv;