Merge pull request #17010 from Mugen87/dev36

TrackballControls: Clean up.

examples/js/controls/TrackballControls.js

@@ -35,7 +35,7 @@ THREE.TrackballControls = function ( object, domElement ) {
 
 	this.keys = [ 65 /*A*/, 83 /*S*/, 68 /*D*/ ];
 
-	this.mouseButtons = { ROTATE: THREE.MOUSE.LEFT, ZOOM: THREE.MOUSE.MIDDLE, PAN: THREE.MOUSE.RIGHT };
+	this.mouseButtons = { LEFT: THREE.MOUSE.ROTATE, MIDDLE: THREE.MOUSE.ZOOM, RIGHT: THREE.MOUSE.PAN };
 
 	// internals
 
@@ -391,15 +391,15 @@ THREE.TrackballControls = function ( object, domElement ) {
 
 			switch ( event.button ) {
 
-				case _this.mouseButtons.ROTATE:
+				case _this.mouseButtons.LEFT:
 					_state = STATE.ROTATE;
 					break;
 
-				case _this.mouseButtons.ZOOM:
+				case _this.mouseButtons.MIDDLE:
 					_state = STATE.ZOOM;
 					break;
 
-				case _this.mouseButtons.PAN:
+				case _this.mouseButtons.RIGHT:
 					_state = STATE.PAN;
 					break;
 

examples/jsm/controls/TrackballControls.js

@@ -43,7 +43,7 @@ var TrackballControls = function ( object, domElement ) {
 
 	this.keys = [ 65 /*A*/, 83 /*S*/, 68 /*D*/ ];
 
-	this.mouseButtons = { ROTATE: MOUSE.LEFT, ZOOM: MOUSE.MIDDLE, PAN: MOUSE.RIGHT };
+	this.mouseButtons = { LEFT: MOUSE.ROTATE, MIDDLE: MOUSE.ZOOM, RIGHT: MOUSE.PAN };
 
 	// internals
 
@@ -399,15 +399,15 @@ var TrackballControls = function ( object, domElement ) {
 
 			switch ( event.button ) {
 
-				case _this.mouseButtons.ROTATE:
+				case _this.mouseButtons.LEFT:
 					_state = STATE.ROTATE;
 					break;
 
-				case _this.mouseButtons.ZOOM:
+				case _this.mouseButtons.MIDDLE:
 					_state = STATE.ZOOM;
 					break;
 
-				case _this.mouseButtons.PAN:
+				case _this.mouseButtons.RIGHT:
 					_state = STATE.PAN;
 					break;
 

examples/jsm/controls/TransformControls.d.ts

@@ -2,7 +2,8 @@ import {
   Object3D,
   Camera,
   Vector3,
-  Euler
+  Euler,
+  MOUSE
 } from '../../../src/Three';
 
 export class TransformControls extends Object3D {
@@ -27,6 +28,11 @@ export class TransformControls extends Object3D {
   showZ: boolean;
   isTransformControls: boolean;
   visible: boolean;
+  mouseButtons: {
+    LEFT: MOUSE; 
+    MIDDLE: MOUSE;
+    RIGHT: MOUSE;
+  };
 
   attach(object: Object3D): this;
   detach(): this;