Provide easier access to the active SceneController instance

src/modules/avatar/controller/inputController.ts

@@ -33,7 +33,7 @@ import { IInputHandler } from "./inputs/inputHandler";
 import { KeyboardInput } from "./inputs/keyboardInput";
 import { VirtualJoystickInput } from "./inputs/virtualJoystickInput";
 import { applicationStore, userStore } from "@Stores/index";
-import type { SceneController } from "@Modules/scene/controllers";
+import { Renderer } from "@Base/modules/scene";
 import { MouseSettingsController } from "@Base/modules/avatar/controller/inputs/mouseSettings";
 
 // Custom camera controls.
@@ -496,9 +496,7 @@ export class InputController extends ScriptComponent {
                 return;
             }
             this._avatarState.state = State.Idle;
-            const sceneManager = this._scene.rootNodes.find((node) => node.id === "SceneManager") as GameObject;
-            const sceneController = sceneManager.components.get("SceneController") as SceneController | undefined;
-            sceneController?.applyGravity();
+            Renderer.getScene().sceneController?.applyGravity();
         }
     }
 
@@ -550,15 +548,13 @@ export class InputController extends ScriptComponent {
             return;
         }
 
-        // Reset the avatar's rotation (so that it is standing up).
+        // Reset the avatar's rotation (so that it is standing upright).
         if (this._gameObject && this._gameObject.rotationQuaternion) {
             this._gameObject.rotationQuaternion.x = 0;
             this._gameObject.rotationQuaternion.z = 0;
         }
 
-        const sceneManager = this._scene.rootNodes.find((node) => node.id === "SceneManager") as GameObject;
-        const sceneController = sceneManager.components.get("SceneController") as SceneController | undefined;
-        sceneController?.applyGravity();
+        Renderer.getScene().sceneController?.applyGravity();
 
         this._avatarState.duration += delta;
 

src/modules/avatar/controller/inputs/keyboardInput.ts

@@ -33,8 +33,6 @@ import { InputState, CameraMode, InputMode } from "../inputState";
 import { applicationStore, userStore } from "@Stores/index";
 import { AudioManager as AudioMgr } from "@Modules/scene/audio";
 import { Renderer } from "@Modules/scene";
-import type { GameObject } from "@Modules/object";
-import type { SceneController } from "@Modules/scene/controllers";
 
 
 export class KeyboardInput implements IInputHandler {
@@ -162,8 +160,7 @@ export class KeyboardInput implements IInputHandler {
 
         // Fly.
         if (sourceEvent.code === userStore.controls.keyboard.movement.fly?.keycode) {
-            const sceneManager = this._scene.rootNodes.find((node) => node.id === "SceneManager") as GameObject;
-            const sceneController = sceneManager.components.get("SceneController") as SceneController | undefined;
+            const sceneController = Renderer.getScene().sceneController;
 
             if (this._state.state === State.Fly) {
                 this._state.action = Action.Jump;
@@ -233,9 +230,7 @@ export class KeyboardInput implements IInputHandler {
                     this._state.action = animation;
 
                     // Remove gravity.
-                    const sceneManager = this._scene.rootNodes.find((node) => node.id === "SceneManager") as GameObject;
-                    const sceneController = sceneManager.components.get("SceneController") as SceneController | undefined;
-                    sceneController?.removeGravity();
+                    Renderer.getScene().sceneController?.removeGravity();
 
                     // Snap to the sittable object.
                     avatarMesh.setAbsolutePosition(selectedSitObject[0].getAbsolutePosition());

src/modules/scene/vscene.ts

@@ -109,6 +109,10 @@ export class VScene {
         return this._css3DRenderer;
     }
 
+    public get sceneController(): Nullable<SceneController> {
+        return this._sceneController;
+    }
+
     public render(): void {
         this._scene.render();