Refactor and prototype polyburn gym environment

packages/learning-gym/package.json

@@ -18,7 +18,7 @@
         "gl": "^8.0.2",
         "pngjs": "^7.0.0",
         "custom-rapier2d-node": "*",
-        "three": "^0.124.0",
+        "three": "0.145.0",
         "tsconfig": "*",
         "web-game": "*"
     },

packages/web-game/src/game/game-agent-as-player.ts

@@ -0,0 +1,55 @@
+import * as THREE from "three"
+import { GameInterface } from "./game"
+import { GameAgentWrapper } from "./game-agent-wrapper"
+import { GameSettings } from "./game-settings"
+import { ModuleInput } from "./modules/module-input/module-input"
+import { ExtendedRuntime, newExtendedRuntime } from "./runtime-extension/new-extended-runtime"
+
+export class GameAgentAsPlayer implements GameInterface {
+    runtime: ExtendedRuntime
+    input: ModuleInput
+    gameWrapper: GameAgentWrapper
+
+    constructor(settings: GameSettings) {
+        settings.canvas.width = 64
+        settings.canvas.height = 64
+        settings.gamemode = "Normal"
+
+        const renderer = new THREE.WebGLRenderer({
+            canvas: settings.canvas,
+            antialias: false,
+            alpha: true,
+        })
+
+        this.runtime = newExtendedRuntime(settings, new THREE.Scene(), renderer)
+
+        renderer.setClearColor(THREE.Color.NAMES["black"], 1)
+
+        this.gameWrapper = new GameAgentWrapper(this.runtime, this.runtime.factoryContext.scene)
+        this.input = new ModuleInput(this.runtime)
+    }
+
+    dispose() {
+        this.input.dispose()
+    }
+
+    onPreFixedUpdate(delta: number) {
+        this.input.onPreFixedUpdate(delta)
+    }
+
+    onFixedUpdate() {
+        const context = {
+            thrust: this.input.thrust(),
+            rotation: this.input.rotation(),
+        }
+
+        this.gameWrapper.step(context)
+
+        this.runtime.factoryContext.renderer.render(
+            this.runtime.factoryContext.scene,
+            this.gameWrapper.camera,
+        )
+    }
+
+    onUpdate() {}
+}

packages/web-game/src/game/game-agent-wrapper.ts

@@ -3,11 +3,7 @@ import { RuntimeComponents } from "runtime/src/core/runtime-components"
 import { RuntimeSystemContext } from "runtime/src/core/runtime-system-stack"
 import { Runtime } from "runtime/src/runtime"
 import * as THREE from "three"
-import { GameInterface } from "./game"
-import { GameSettings } from "./game-settings"
-import { ModuleInput } from "./modules/module-input/module-input"
 import { ModuleSceneAgent } from "./modules/module-scene-agent/module-scene-agent"
-import { ExtendedRuntime, newExtendedRuntime } from "./runtime-extension/new-extended-runtime"
 
 export class GameAgentWrapper {
     sceneModule: ModuleSceneAgent
@@ -30,6 +26,8 @@ export class GameAgentWrapper {
             this.rocket.components.rigidBody.translation().y,
             10,
         )
+
+        this.sceneModule.onUpdate()
     }
 
     step(context: RuntimeSystemContext) {
@@ -44,51 +42,3 @@ export class GameAgentWrapper {
         )
     }
 }
-
-export class GameAgentAsPlayer implements GameInterface {
-    runtime: ExtendedRuntime
-    input: ModuleInput
-    gameWrapper: GameAgentWrapper
-
-    constructor(settings: GameSettings) {
-        settings.canvas.width = 64
-        settings.canvas.height = 64
-
-        const renderer = new THREE.WebGLRenderer({
-            canvas: settings.canvas,
-            antialias: false,
-            alpha: true,
-        })
-
-        this.runtime = newExtendedRuntime(settings, new THREE.Scene(), renderer)
-
-        renderer.setClearColor(THREE.Color.NAMES["black"], 1)
-
-        this.gameWrapper = new GameAgentWrapper(this.runtime, this.runtime.factoryContext.scene)
-        this.input = new ModuleInput(this.runtime)
-    }
-
-    dispose() {
-        this.input.dispose()
-    }
-
-    onPreFixedUpdate(delta: number) {
-        this.input.onPreFixedUpdate(delta)
-    }
-
-    onFixedUpdate() {
-        const context = {
-            thrust: this.input.thrust(),
-            rotation: this.input.rotation(),
-        }
-
-        this.gameWrapper.step(context)
-
-        this.runtime.factoryContext.renderer.render(
-            this.runtime.factoryContext.scene,
-            this.gameWrapper.camera,
-        )
-    }
-
-    onUpdate() {}
-}

packages/web-game/src/game/modules/module-scene-agent/module-scene-agent.ts

@@ -86,10 +86,14 @@ export class ModuleSceneAgent {
             const tl = currentLevel.components.level.boundsTL
             const br = currentLevel.components.level.boundsBR
 
-            this.upBound.position.set((tl.x + br.x) / 2, br.y + 87.25, 0)
-            this.leftBound.position.set(tl.x - 50, (tl.y + br.y) / 2, 0)
-            this.downBound.position.set((tl.x + br.x) / 2, tl.y - 87.25, 0)
-            this.rightBound.position.set(br.x + 50, (tl.y + br.y) / 2, 0)
+            const center = new THREE.Vector2((tl.x + br.x) / 2, (tl.y + br.y) / 2)
+            const width = Math.abs(br.x - tl.x)
+            const height = Math.abs(br.y - tl.y)
+
+            this.upBound.position.set(center.x, center.y + height / 2 + 50, 0)
+            this.downBound.position.set(center.x, center.y - height / 2 - 50, 0)
+            this.leftBound.position.set(center.x - width / 2 - 50, center.y, 0)
+            this.rightBound.position.set(center.x + width / 2 + 50, center.y, 0)
 
             this.previousCurrentLevel = currentLevel
         }

packages/web/src/app/play/Game.tsx

@@ -1,9 +1,9 @@
 import { useCallback, useEffect, useState } from "react"
 import { WorldModel } from "runtime/proto/world"
 import { Game as NativeGame } from "web-game/src/game/game"
+import { GameAgentAsPlayer } from "web-game/src/game/game-agent-as-player"
 import { GameLoop } from "web-game/src/game/game-loop"
 import { GameHooks, GameInstanceType, GameSettings } from "web-game/src/game/game-settings"
-import { GameAgentAsPlayer } from "../../../../web-game/src/game/game-agent-wrapper"
 
 export function Game(props: {
     worldname: string