Merge pull request #184 from dli7319/modetoggle

Allow configuring the simulator mode toggler order.

Author: ruofeidu

src/addons/simulator/ui/EnterXRButton.ts

@@ -34,7 +34,9 @@ export class EnterXRButton extends LitElement {
   }
 
   onClick() {
-    this.setSimulatorMode(xb.NEXT_SIMULATOR_MODE[this.simulatorMode]);
+    this.setSimulatorMode(
+      xb.core.options.simulator.modeToggle.toggleOrder[this.simulatorMode]
+    );
     this.blur(); // Removes focus from the button after click
   }
 

src/addons/simulator/ui/ModeIndicator.ts

@@ -38,7 +38,9 @@ export class SimulatorModeIndicator extends LitElement {
   }
 
   onClick() {
-    this.setSimulatorMode(xb.NEXT_SIMULATOR_MODE[this.simulatorMode]);
+    this.setSimulatorMode(
+      xb.core.options.simulator.modeToggle.toggleOrder[this.simulatorMode]
+    );
     this.blur(); // Removes focus from the button after click
   }
 

src/simulator/SimulatorControls.ts

@@ -13,11 +13,7 @@ import {SimulatorRenderMode} from './SimulatorConstants';
 import {SimulatorControllerState} from './SimulatorControllerState';
 import {SimulatorHands} from './SimulatorHands';
 import {SimulatorInterface} from './SimulatorInterface';
-import {
-  NEXT_SIMULATOR_MODE,
-  SimulatorMode,
-  SimulatorOptions,
-} from './SimulatorOptions';
+import {SimulatorMode, SimulatorOptions} from './SimulatorOptions';
 
 function preventDefault(event: Event) {
   event.preventDefault();
@@ -39,6 +35,7 @@ export class SimulatorControls {
   simulatorModeControls: SimulatorControlMode;
   simulatorModes: {[key: string]: SimulatorControlMode};
   renderer!: THREE.WebGLRenderer;
+  private simulatorOptions?: SimulatorOptions;
 
   private _onPointerDown = this.onPointerDown.bind(this);
   private _onPointerUp = this.onPointerUp.bind(this);
@@ -112,6 +109,7 @@ export class SimulatorControls {
     this.setSimulatorMode(simulatorOptions.defaultMode);
     this.simulatorControllerState.currentControllerIndex =
       simulatorOptions.defaultHand === Handedness.LEFT ? 0 : 1;
+    this.simulatorOptions = simulatorOptions;
     this.connect();
   }
 
@@ -157,8 +155,13 @@ export class SimulatorControls {
       return;
     }
     this.downKeys.add(event.code as Keycodes);
-    if (event.code == Keycodes.LEFT_SHIFT_CODE) {
-      this.setSimulatorMode(NEXT_SIMULATOR_MODE[this.simulatorMode]);
+    if (
+      this.simulatorOptions &&
+      event.code === this.simulatorOptions.modeToggle.toggleKey
+    ) {
+      this.setSimulatorMode(
+        this.simulatorOptions.modeToggle.toggleOrder[this.simulatorMode]
+      );
     }
     this.simulatorModeControls.onKeyDown(event);
   }

src/simulator/SimulatorOptions.ts

@@ -4,14 +4,15 @@ import {XR_BLOCKS_ASSETS_PATH} from '../constants';
 import {Handedness} from '../input/Hands';
 import {deepMerge} from '../utils/OptionsUtils';
 import {DeepPartial, DeepReadonly} from '../utils/Types';
+import {Keycodes} from '../utils/Keycodes';
 
 export enum SimulatorMode {
   USER = 'User',
   POSE = 'Navigation',
   CONTROLLER = 'Hands',
 }
 
-export const NEXT_SIMULATOR_MODE = {
+const DEFAULT_MODE_TOGGLE_ORDER = {
   [SimulatorMode.USER]: SimulatorMode.POSE,
   [SimulatorMode.POSE]: SimulatorMode.CONTROLLER,
   [SimulatorMode.CONTROLLER]: SimulatorMode.USER,
@@ -34,6 +35,10 @@ export class SimulatorOptions {
   initialScenePosition = {x: -1.6, y: 0.3, z: 0};
   defaultMode = SimulatorMode.USER;
   defaultHand = Handedness.LEFT;
+  modeToggle = {
+    toggleKey: Keycodes.LEFT_SHIFT_CODE as Keycodes | null,
+    toggleOrder: DEFAULT_MODE_TOGGLE_ORDER,
+  };
   modeIndicator = {
     enabled: true,
     element: 'xrblocks-simulator-mode-indicator',