Merge branch feature/settings into main (#85)

* Implement settings

- Implement SettingsManager
- Implement Settings classes
- Let SettingsManager be available through Services

* Bugfixes

Fixed usage of isIComplexEntity in renderers.
Adapt level1 and level2 to new syntax.

src/ts/engine/entitiy/icomplexentity.ts

@@ -6,7 +6,7 @@ interface IComplexEntity extends Entity {
   update(tickDelta: number): void;
 }
 
-function isIComplexEntity(object: any): object is IComplexEntity {
+function isIComplexEntity(object: any): boolean {
   return "parts" in object;
 }
 

src/ts/engine/game.ts

@@ -7,10 +7,12 @@ import InputHandler from "./input/inputhandler.js";
 import LevelManager from "./level/levelmanager.js";
 import Compositor from "./renderer/compositor.js";
 import SceneManager from "./scene/scenemanager.js";
+import SettingsManager from "./settings/settingsmanager.js";
 
 class Game {
   private _assetLoader: AssetLoader;
   private _assetManager: AssetManager;
+  private _settingsManager: SettingsManager;
   private _inputHandler: InputHandler;
   private _sceneManager: SceneManager;
   private _entityManager: EntityManager;
@@ -42,6 +44,7 @@ class Game {
   constructor(htmlCanvasElement: HTMLCanvasElement, engineSetup: EngineSetup) {
     this._assetLoader = new AssetLoader();
     this._assetManager = new AssetManager();
+    this._settingsManager = new SettingsManager();
     this._inputHandler = new InputHandler(htmlCanvasElement);
     this._sceneManager = new SceneManager(this._inputHandler);
     this._entityManager = new EntityManager();
@@ -65,6 +68,7 @@ class Game {
 
     Services.register(this._assetLoader);
     Services.register(this._assetManager);
+    Services.register(this._settingsManager);
     Services.register(this._inputHandler);
     Services.register(this._sceneManager);
     Services.register(this._entityManager);

src/ts/engine/level/levelmanager.ts

@@ -16,7 +16,7 @@ class LevelManager {
     this._entityManager = entityManager;
   }
 
-  public hasLevel(name: string): boolean {
+  public has(name: string): boolean {
     return this._levels.has(name);
   }
 

src/ts/engine/renderer/renderers/debugrenderer.ts

@@ -3,7 +3,9 @@ import ComplexEntity from "../../entitiy/complexentity.js";
 import ComplexMovingEntity from "../../entitiy/complexmovingentity.js";
 import Entity from "../../entitiy/entity.js";
 import EntityManager from "../../entitiy/entitymanager.js";
-import { isIComplexEntity } from "../../entitiy/icomplexentity.js";
+import IComplexEntity, {
+  isIComplexEntity,
+} from "../../entitiy/icomplexentity.js";
 import Game from "../../game.js";
 import InputHandler from "../../input/inputhandler.js";
 import Renderer from "../renderer.js";
@@ -120,7 +122,9 @@ class DebugRenderer extends Renderer {
     glContext.setTransform(1, 0, 0, 1, 0, 0);
 
     if (isIComplexEntity(entity)) {
-      for (let part of entity.parts) this.drawBoundingBoxes(glContext, part[1]);
+      let complexEntity = entity as IComplexEntity;
+      for (let part of complexEntity.parts)
+        this.drawBoundingBoxes(glContext, part[1]);
     }
   }
 

src/ts/engine/renderer/renderers/entityrenderer.ts

@@ -34,7 +34,8 @@ class EntityRenderer extends Renderer {
     glContext.setTransform(1, 0, 0, 1, 0, 0);
 
     if (isIComplexEntity(entity)) {
-      for (let part of entity.parts) {
+      let complexEntity = entity as IComplexEntity;
+      for (let part of complexEntity.parts) {
         this.renderEntity(glContext, part[1]);
       }
     }

src/ts/engine/scene/scenemanager.ts

@@ -20,7 +20,7 @@ class SceneManager {
     this._inputHandler.mouseClickEvent.subscribe(this.onMouseClick.bind(this));
   }
 
-  public hasScene(name: string): boolean {
+  public has(name: string): boolean {
     return this._scenes.has(name);
   }
 
@@ -33,7 +33,7 @@ class SceneManager {
     this._scenes.set(name, scene);
   }
 
-  public switchScene(name: string): void {
+  public switch(name: string): void {
     let scene: Scene | undefined = this._scenes.get(name);
     if (!scene) {
       throw new Error(`Scene with name ${name} does not exist!`);

src/ts/engine/settings/setting.ts

@@ -0,0 +1,28 @@
+class Setting<T> {
+  private _get: (() => T) | undefined;
+  private _set: ((value: T) => void) | undefined;
+
+  public get(): T {
+    if (!this._get) {
+      throw new Error("Get-Method not implemented for this setting.");
+    }
+    return this._get();
+  }
+
+  public set(value: T): void {
+    if (!this._set) {
+      throw new Error("Set-Method not implemented for this setting.");
+    }
+    this._set(value);
+  }
+
+  public constructor(
+    get: (() => T) | undefined,
+    set: ((value: T) => void) | undefined
+  ) {
+    this._get = get;
+    this._set = set;
+  }
+}
+
+export default Setting;

src/ts/engine/settings/settingsmanager.ts

@@ -0,0 +1,23 @@
+import Setting from "./setting.js";
+
+class SettingsManager {
+  private _settings: Map<string, Setting<any>>;
+
+  constructor() {
+    this._settings = new Map();
+  }
+
+  public has(key: string): boolean {
+    return this._settings.has(key);
+  }
+
+  public get<T>(key: string): Setting<T> {
+    return this._settings.get(key) as Setting<T>;
+  }
+
+  public set<T>(key: string, value: Setting<T>): void {
+    this._settings.set(key, value);
+  }
+}
+
+export default SettingsManager;

src/ts/engine/settings/simplesetting.ts

@@ -0,0 +1,27 @@
+import Setting from "./setting";
+
+class SimpleSetting<T> extends Setting<T> {
+  private _value: T;
+
+  private getValue(): T {
+    return this._value;
+  }
+
+  private setValue(value: T) {
+    this._value = value;
+  }
+
+  constructor(value: T) {
+    super(
+      undefined, //Can't use "this" keyword here, so we'll define the methods below
+      undefined
+    );
+
+    this._value = value;
+
+    this.getValue = this.getValue.bind(this);
+    this.setValue = this.setValue.bind(this);
+  }
+}
+
+export default SimpleSetting;

src/ts/game/gamesetup.ts

@@ -8,12 +8,12 @@ import SceneManager from "../engine/scene/scenemanager.js";
 import Level1 from "./levels/level1.js";
 import Level2 from "./levels/level2.js";
 import Level3 from "./levels/level3.js";
-import GameOver from "./scenes/gameover.js";
+import MainMenu from "./scenes/mainmenu.js";
 import InGame from "./scenes/ingame.js";
 import Level1Scene from "./scenes/level1scene.js";
 import Level2Scene from "./scenes/level2scene.js";
 import LevelOverview from "./scenes/leveloverview.js";
-import MainMenu from "./scenes/mainmenu.js";
+import GameOver from "./scenes/gameover.js";
 
 class GameSetup extends EngineSetup {
   public loadAssets(

src/ts/game/levels/level1.ts

@@ -176,7 +176,7 @@ class Level1 implements Level {
     );
 
     this._goal.onTouch.subscribe((engineEvent: EngineEvent<Goal>) => {
-      Services.resolve<SceneManager>("SceneManager").switchScene("level2Scene");
+      Services.resolve<SceneManager>("SceneManager").switch("level2Scene");
       let levelManager: LevelManager =
         Services.resolve<LevelManager>("LevelManager");
       levelManager.start("level2");

src/ts/game/levels/level2.ts

@@ -31,7 +31,7 @@ class Level2 implements Level {
 
   public load(): void {
     this._goal.onTouch.subscribe((engineEvent: EngineEvent<Goal>) => {
-      Services.resolve<SceneManager>("SceneManager").switchScene("ingame");
+      Services.resolve<SceneManager>("SceneManager").switch("ingame");
       let levelManager: LevelManager =
         Services.resolve<LevelManager>("LevelManager");
       levelManager.start("level3");

src/ts/game/levels/level3.ts

@@ -142,7 +142,7 @@ class Level3 implements Level {
   public load(): void {
     this._goal.onTouch.subscribe((engineEvent: EngineEvent<Goal>) => {
       Services.resolve<LevelManager>("LevelManager").unload();
-      Services.resolve<SceneManager>("SceneManager").switchScene("gameover");
+      Services.resolve<SceneManager>("SceneManager").switch("gameover");
     });
     this._buttonGround1.onUnpress.subscribe(
       (engineEvent: EngineEvent<ButtonGround>) => {

src/ts/game/main.ts

@@ -39,7 +39,7 @@ function start(): void {
 
   let sceneManager: SceneManager =
     Services.resolve<SceneManager>("SceneManager");
-  sceneManager.switchScene("mainmenu");
+  sceneManager.switch("mainmenu");
 }
 
 window.addEventListener("DOMContentLoaded", start);

src/ts/game/scenes/gameover.ts

@@ -55,7 +55,7 @@ class GameOver extends Base {
     );
 
     this._runAgain.onClick = (mouseClickEvent: MouseClickEvent) => {
-      Services.resolve<SceneManager>("SceneManager").switchScene("ingame");
+      Services.resolve<SceneManager>("SceneManager").switch("ingame");
       Services.resolve<LevelManager>("LevelManager").start("level1");
     };
 
@@ -79,7 +79,7 @@ class GameOver extends Base {
     );
 
     this._backToMainMenu.onClick = (mouseClickEvent: MouseClickEvent) => {
-      Services.resolve<SceneManager>("SceneManager").switchScene("mainmenu");
+      Services.resolve<SceneManager>("SceneManager").switch("mainmenu");
     };
 
     this._buttonLevelOverview = new Button(
@@ -102,9 +102,7 @@ class GameOver extends Base {
     );
 
     this._buttonLevelOverview.onClick = (mouseClickEvent: MouseClickEvent) => {
-      Services.resolve<SceneManager>("SceneManager").switchScene(
-        "leveloverview"
-      );
+      Services.resolve<SceneManager>("SceneManager").switch("leveloverview");
     };
 
     this.addElement(title);

src/ts/game/scenes/ingame.ts

@@ -32,7 +32,7 @@ class InGame extends Base {
 
     leftButton.onClick = (mouseClickEvent: MouseClickEvent) => {
       Services.resolve<LevelManager>("LevelManager").unload();
-      Services.resolve<SceneManager>("SceneManager").switchScene("mainmenu");
+      Services.resolve<SceneManager>("SceneManager").switch("mainmenu");
     };
 
     this.addElement(leftButton);

src/ts/game/scenes/leveloverview.ts

@@ -113,21 +113,21 @@ class LevelOverview extends Base {
     );
 
     this._backToMainMenu.onClick = (mouseClickEvent: MouseClickEvent) => {
-      Services.resolve<SceneManager>("SceneManager").switchScene("mainmenu");
+      Services.resolve<SceneManager>("SceneManager").switch("mainmenu");
     };
 
     this._level1.onClick = (mouseClickEvent: MouseClickEvent) => {
-      Services.resolve<SceneManager>("SceneManager").switchScene("level1Scene");
+      Services.resolve<SceneManager>("SceneManager").switch("level1Scene");
       Services.resolve<LevelManager>("LevelManager").start("level1");
     };
 
     this._level2.onClick = (mouseClickEvent: MouseClickEvent) => {
-      Services.resolve<SceneManager>("SceneManager").switchScene("level2Scene");
+      Services.resolve<SceneManager>("SceneManager").switch("level2Scene");
       Services.resolve<LevelManager>("LevelManager").start("level2");
     };
 
     this._level3.onClick = (mouseClickEvent: MouseClickEvent) => {
-      Services.resolve<SceneManager>("SceneManager").switchScene("ingame");
+      Services.resolve<SceneManager>("SceneManager").switch("ingame");
       Services.resolve<LevelManager>("LevelManager").start("level3");
     };
 

src/ts/game/scenes/mainmenu.ts

@@ -54,7 +54,7 @@ class MainMenu extends Base {
     );
 
     this._buttonStart.onClick = (mouseClickEvent: MouseClickEvent) => {
-      Services.resolve<SceneManager>("SceneManager").switchScene("level1Scene");
+      Services.resolve<SceneManager>("SceneManager").switch("level1Scene");
       Services.resolve<LevelManager>("LevelManager").start("level1");
     };
 
@@ -78,9 +78,7 @@ class MainMenu extends Base {
     );
 
     this._buttonLevelOverview.onClick = (mouseClickEvent: MouseClickEvent) => {
-      Services.resolve<SceneManager>("SceneManager").switchScene(
-        "leveloverview"
-      );
+      Services.resolve<SceneManager>("SceneManager").switch("leveloverview");
     };
 
     this.addElement(title);