Przeglądaj źródła

Improved names. Added recent FollowCamera Inputs to index.ts.

duncan law 6 lat temu
rodzic
commit
21caf4069c

+ 8 - 8
src/Cameras/Inputs/BaseCameraPointersInput.ts

@@ -67,7 +67,7 @@ export abstract class BaseCameraPointersInput implements ICameraInput<Camera> {
                               evt.msMovementY ||
                               evt.msMovementY ||
                               0;
                               0;
 
 
-                this.doTouch(null, offsetX, offsetY);
+                this.onTouch(null, offsetX, offsetY);
             } else if (p.type === PointerEventTypes.POINTERDOWN && srcElement) {
             } else if (p.type === PointerEventTypes.POINTERDOWN && srcElement) {
                 try {
                 try {
                     srcElement.setPointerCapture(evt.pointerId);
                     srcElement.setPointerCapture(evt.pointerId);
@@ -92,7 +92,7 @@ export abstract class BaseCameraPointersInput implements ICameraInput<Camera> {
                     element.focus();
                     element.focus();
                 }
                 }
             } else if (p.type === PointerEventTypes.POINTERDOUBLETAP) {
             } else if (p.type === PointerEventTypes.POINTERDOUBLETAP) {
-                this.doDoubleTouch(evt.pointerType);
+                this.onDoubleTouch(evt.pointerType);
             } else if (p.type === PointerEventTypes.POINTERUP && srcElement) {
             } else if (p.type === PointerEventTypes.POINTERUP && srcElement) {
                 try {
                 try {
                     srcElement.releasePointerCapture(evt.pointerId);
                     srcElement.releasePointerCapture(evt.pointerId);
@@ -127,7 +127,7 @@ export abstract class BaseCameraPointersInput implements ICameraInput<Camera> {
                 if (previousPinchSquaredDistance !== 0 || previousMultiTouchPanPosition) {
                 if (previousPinchSquaredDistance !== 0 || previousMultiTouchPanPosition) {
                     // Previous pinch data is populated but a button has been lifted
                     // Previous pinch data is populated but a button has been lifted
                     // so pinch has ended.
                     // so pinch has ended.
-                    this.doMultiTouch(
+                    this.onMultiTouch(
                       pointA,
                       pointA,
                       pointB,
                       pointB,
                       previousPinchSquaredDistance,
                       previousPinchSquaredDistance,
@@ -151,7 +151,7 @@ export abstract class BaseCameraPointersInput implements ICameraInput<Camera> {
                 if (pointA && pointB === null) {
                 if (pointA && pointB === null) {
                     var offsetX = evt.clientX - pointA.x;
                     var offsetX = evt.clientX - pointA.x;
                     var offsetY = evt.clientY - pointA.y;
                     var offsetY = evt.clientY - pointA.y;
-                    this.doTouch(pointA, offsetX, offsetY);
+                    this.onTouch(pointA, offsetX, offsetY);
 
 
                     pointA.x = evt.clientX;
                     pointA.x = evt.clientX;
                     pointA.y = evt.clientY;
                     pointA.y = evt.clientY;
@@ -169,7 +169,7 @@ export abstract class BaseCameraPointersInput implements ICameraInput<Camera> {
                                                  pointerId: evt.pointerId,
                                                  pointerId: evt.pointerId,
                                                  type: p.type};
                                                  type: p.type};
 
 
-                    this.doMultiTouch(
+                    this.onMultiTouch(
                       pointA,
                       pointA,
                       pointB,
                       pointB,
                       previousPinchSquaredDistance,
                       previousPinchSquaredDistance,
@@ -243,14 +243,14 @@ export abstract class BaseCameraPointersInput implements ICameraInput<Camera> {
      * Called on pointer POINTERDOUBLETAP event.
      * Called on pointer POINTERDOUBLETAP event.
      * Override this method to provide functionality on POINTERDOUBLETAP event.
      * Override this method to provide functionality on POINTERDOUBLETAP event.
      */
      */
-    protected doDoubleTouch(type: string) {
+    protected onDoubleTouch(type: string) {
     }
     }
 
 
     /**
     /**
      * Called on pointer POINTERMOVE event if only a single touch is active.
      * Called on pointer POINTERMOVE event if only a single touch is active.
      * Override this method to provide functionality.
      * Override this method to provide functionality.
      */
      */
-    protected doTouch(pointA: Nullable<PointerTouch>,
+    protected onTouch(pointA: Nullable<PointerTouch>,
                       offsetX: number,
                       offsetX: number,
                       offsetY: number): void {
                       offsetY: number): void {
     }
     }
@@ -259,7 +259,7 @@ export abstract class BaseCameraPointersInput implements ICameraInput<Camera> {
      * Called on pointer POINTERMOVE event if multiple touches are active.
      * Called on pointer POINTERMOVE event if multiple touches are active.
      * Override this method to provide functionality.
      * Override this method to provide functionality.
      */
      */
-    protected doMultiTouch(pointA: Nullable<PointerTouch>,
+    protected onMultiTouch(pointA: Nullable<PointerTouch>,
                            pointB: Nullable<PointerTouch>,
                            pointB: Nullable<PointerTouch>,
                            previousPinchSquaredDistance: number,
                            previousPinchSquaredDistance: number,
                            pinchSquaredDistance: number,
                            pinchSquaredDistance: number,

+ 1 - 1
src/Cameras/Inputs/followCameraPointersInput.ts

@@ -107,7 +107,7 @@ export class FollowCameraPointersInput extends BaseCameraPointersInput {
      */
      */
     protected _className = "FollowCameraPointersInput";
     protected _className = "FollowCameraPointersInput";
 
 
-    protected doTouch(pointA: Nullable<PointerTouch>,
+    protected onTouch(pointA: Nullable<PointerTouch>,
                       offsetX: number,
                       offsetX: number,
                       offsetY: number): void
                       offsetY: number): void
     {
     {

+ 4 - 1
src/Cameras/Inputs/index.ts

@@ -5,9 +5,12 @@ export * from "./arcRotateCameraPointersInput";
 export * from "./arcRotateCameraVRDeviceOrientationInput";
 export * from "./arcRotateCameraVRDeviceOrientationInput";
 export * from "./flyCameraKeyboardInput";
 export * from "./flyCameraKeyboardInput";
 export * from "./flyCameraMouseInput";
 export * from "./flyCameraMouseInput";
+export * from "./followCameraKeyboardMoveInput";
+export * from "./followCameraMouseWheelInput";
+export * from "./followCameraPointersInput";
 export * from "./freeCameraDeviceOrientationInput";
 export * from "./freeCameraDeviceOrientationInput";
 export * from "./freeCameraGamepadInput";
 export * from "./freeCameraGamepadInput";
 export * from "./freeCameraKeyboardMoveInput";
 export * from "./freeCameraKeyboardMoveInput";
 export * from "./freeCameraMouseInput";
 export * from "./freeCameraMouseInput";
 export * from "./freeCameraTouchInput";
 export * from "./freeCameraTouchInput";
-export * from "./freeCameraVirtualJoystickInput";
+export * from "./freeCameraVirtualJoystickInput";