diff --git a/app/pages/PageEnigma/Editor/editor.ts b/app/pages/PageEnigma/Editor/editor.ts index fd7ba6f914..c70ea2efc6 100644 --- a/app/pages/PageEnigma/Editor/editor.ts +++ b/app/pages/PageEnigma/Editor/editor.ts @@ -483,6 +483,7 @@ class Editor { this.mouse_controls = new MouseControls( this.camera, this.get_camera_person_mode.bind(this), + this.cameraViewControls, this.lockControls, this.camera_last_pos, this.selectedCanvas, @@ -541,6 +542,7 @@ class Editor { this.cameraViewControls.enabled = true; this.selectedCanvas = true; } else { + this.cameraViewControls.reset(); this.cameraViewControls.enabled = false; this.selectedCanvas = false; } diff --git a/app/pages/PageEnigma/Editor/keybinds_controls.ts b/app/pages/PageEnigma/Editor/keybinds_controls.ts index b1777109f3..29a014bce3 100644 --- a/app/pages/PageEnigma/Editor/keybinds_controls.ts +++ b/app/pages/PageEnigma/Editor/keybinds_controls.ts @@ -12,6 +12,7 @@ import { } from "three/examples/jsm/Addons.js"; import { TransformControls } from "./TransformControls"; import { SceneManager, SceneObject } from "./scene_manager_api"; +import { FreeCam } from "./free_cam"; export class MouseControls { camera: THREE.PerspectiveCamera | null; @@ -40,10 +41,12 @@ export class MouseControls { setSelected: Function; sceneManager: SceneManager | undefined; private isProcessing: boolean = false; + private cameraViewControls: FreeCam; constructor( camera: THREE.PerspectiveCamera | null, camera_person_mode: boolean, + cameraViewControls: FreeCam, lockControls: PointerLockControls | undefined, camera_last_pos: THREE.Vector3, selectedCanvas: boolean, @@ -67,6 +70,7 @@ export class MouseControls { ) { this.camera = camera; this.camera_person_mode = camera_person_mode; + this.cameraViewControls = cameraViewControls; this.lockControls = lockControls; this.camera_last_pos = camera_last_pos; this.selected = []; @@ -209,6 +213,12 @@ export class MouseControls { return; } } + + if (event.shiftKey) { + this.cameraViewControls.movementSpeed = 4; + } else { + this.cameraViewControls.movementSpeed = 1.15; + } } // Sets new mouse location usually used in raycasts. diff --git a/app/pages/PageEnigma/comps/ControlsTopButtons/Help/Help.tsx b/app/pages/PageEnigma/comps/ControlsTopButtons/Help/Help.tsx index c45dd4bfd7..dcf8387777 100644 --- a/app/pages/PageEnigma/comps/ControlsTopButtons/Help/Help.tsx +++ b/app/pages/PageEnigma/comps/ControlsTopButtons/Help/Help.tsx @@ -55,25 +55,38 @@ export const Help = () => {