Merge branch 'dev'

Author: Methuselah96

.all-contributorsrc

@@ -714,6 +714,25 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "oetherington",
+      "name": "Ollie Etherington",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5075628?v=4",
+      "profile": "https://github.com/oetherington",
+      "contributions": [
+        "code",
+        "bug"
+      ]
+    },
+    {
+      "login": "Mik-pe",
+      "name": "Mikael Pettersson",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5653426?v=4",
+      "profile": "https://github.com/Mik-pe",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "skipCi": true,

README.md

@@ -124,6 +124,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/HEOJUNFO"><img src="https://avatars.githubusercontent.com/u/100739943?v=4?s=100" width="100px;" alt="HEOJUNFO"/><br /><sub><b>HEOJUNFO</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=HEOJUNFO" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://www.oletus.fi/"><img src="https://avatars.githubusercontent.com/u/453050?v=4?s=100" width="100px;" alt="Olli Etuaho"/><br /><sub><b>Olli Etuaho</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=Oletus" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/k2d222"><img src="https://avatars.githubusercontent.com/u/16296136?v=4?s=100" width="100px;" alt="Mathis Brossier"/><br /><sub><b>Mathis Brossier</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=k2d222" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/oetherington"><img src="https://avatars.githubusercontent.com/u/5075628?v=4?s=100" width="100px;" alt="Ollie Etherington"/><br /><sub><b>Ollie Etherington</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=oetherington" title="Code">💻</a> <a href="https://github.com/three-types/three-ts-types/issues?q=author%3Aoetherington" title="Bug reports">🐛</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Mik-pe"><img src="https://avatars.githubusercontent.com/u/5653426?v=4?s=100" width="100px;" alt="Mikael Pettersson"/><br /><sub><b>Mikael Pettersson</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=Mik-pe" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

types/three/OTHER_FILES.txt

@@ -3,6 +3,7 @@ build/three.d.ts
 build/three.module.d.ts
 examples/jsm/animation/AnimationClipCreator.d.ts
 examples/jsm/csm/CSMShader.d.ts
+examples/jsm/controls/MapControls.d.ts
 examples/jsm/curves/NURBSCurve.d.ts
 examples/jsm/curves/NURBSSurface.d.ts
 examples/jsm/curves/NURBSUtils.d.ts

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

@@ -0,0 +1,21 @@
+import { OrbitControls } from './OrbitControls';
+import { Camera } from '../../../src/Three';
+
+/**
+ * MapControls performs orbiting, dollying (zooming), and panning.
+ * Unlike TrackballControls, it maintains the "up" direction
+ * object.up (+Y by default).
+ *
+ *    Orbit - right mouse, or left mouse + ctrl/meta/shiftKey / touch:
+ *    two-finger rotate
+ *    Zoom - middle mouse, or mousewheel / touch: two-finger spread or squish
+ *    Pan - left mouse, or arrow keys / touch: one-finger move
+ *
+ * @param object - The camera to be controlled. The camera must not
+ * be a child of another object, unless that object is the scene itself.
+ * @param domElement - The HTML element used for
+ * event listeners.
+ */
+export class MapControls extends OrbitControls {
+    constructor(object: Camera, domElement?: HTMLElement);
+}

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

@@ -276,7 +276,3 @@ export class OrbitControls {
 
     dispatchEvent(event: { type: string; target: any }): void;
 }
-
-export class MapControls extends OrbitControls {
-    constructor(object: Camera, domElement?: HTMLElement);
-}

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

@@ -3,6 +3,7 @@ import { Camera, EventDispatcher, Vector3 } from '../../../src/Three';
 export class PointerLockControls extends EventDispatcher {
     constructor(camera: Camera, domElement?: HTMLElement);
 
+    camera: Camera;
     domElement: HTMLElement;
 
     // API
@@ -12,6 +13,8 @@ export class PointerLockControls extends EventDispatcher {
     minPolarAngle: number;
     maxPolarAngle: number;
 
+    pointerSpeed: number;
+
     connect(): void;
     disconnect(): void;
     dispose(): void;

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

@@ -20,6 +20,8 @@ export class TrackballControls extends EventDispatcher {
     dynamicDampingFactor: number;
     minDistance: number;
     maxDistance: number;
+    minZoom: number;
+    maxZoom: number;
     keys: string[];
     mouseButtons: { LEFT: MOUSE; MIDDLE: MOUSE; RIGHT: MOUSE };