code cleanup

webclient/src/components/CharacterView.tsx

@@ -1,5 +1,5 @@
 import { observer } from "mobx-react-lite";
-import type { ObjectType, RuntimeGameObjectInstance } from "../types";
+import type { ObjectType, ObjectInstance } from "../types";
 import { ObjectViewInternal, type ObjectViewInternalHandle } from "./ObjectViewInternal";
 import { useEffect, useLayoutEffect, useMemo, useRef } from "react";
 import { Euler, Quaternion, Vector3 } from "three";
@@ -25,7 +25,7 @@ const _charPos = new Vector3();
 const _lookAt = new Vector3();
 
 type PlayerObjectViewProps = {
-    object: RuntimeGameObjectInstance;
+    object: ObjectInstance;
     objectType: ObjectType;
 }
 

webclient/src/components/DebugLabelsView.tsx

@@ -2,6 +2,7 @@ import { useEffect } from "react";
 import { observer } from "mobx-react-lite";
 import { debugLabelsStore } from "../state/debugLabelsState";
 import { DebugLabel } from "./DebugLabel";
+import type { Scene } from "../types";
 
 export const DebugLabelsView = observer(function ({ scene, editMode }: { scene: Scene, editMode?: boolean }) {
     useEffect(

webclient/src/components/GameObjectView.tsx

@@ -2,6 +2,7 @@ import { observer } from "mobx-react-lite";
 import { state } from "../state";
 import { ObjectViewInternal } from "./ObjectViewInternal";
 import { PlayerObjectView } from "./CharacterView";
+import type { ObjectInstance } from "../types";
 
 export type GameObjectViewProps = {
     object: ObjectInstance;

webclient/src/components/ObjectEditorView.tsx

@@ -94,9 +94,6 @@ export const ObjectEditorView = observer(function ({ object, isPlayer }: ObjectE
     if (!objectType)
         return null;
 
-    // Track cache so observer re-renders when refreshObjectTypeCaches is called
-    void object.cache.updatedAt;
-
     function handleClick() {
         if (state.worldEditor.isEnabled) {
             // Reading selection state inside an event handler: not tracked by observer.

webclient/src/components/ObjectViewInternal.tsx

@@ -1,27 +1,12 @@
-import type { ObjectInstance, ObjectType, RuntimeGameObjectInstance, RuntimeObjectInstance } from "../types";
+import type { ObjectInstance, ObjectType } from "../types";
-import type { VoxelGroup } from "../types/runtime/voxelGroup";
+import { useEffect, useImperativeHandle, useRef, type Ref } from "react";
-import { useEffect, useImperativeHandle, useRef, type Ref, memo, useMemo } from "react";
 import { Euler, Quaternion, Mesh, MeshStandardMaterial, type Group } from "three";
 import type { ThreeEvent } from "@react-three/fiber";
-import { ConvexHullCollider, RapierRigidBody } from "@react-three/rapier";
+import { RapierRigidBody } from "@react-three/rapier";
 import { SyncRigidBody } from "./SyncRigidBody";
 import { reaction, runInAction } from "mobx";
 import { v3toRapier } from "../utils";
 import { state } from "../state";
-import { buildVoxelGroupMesh } from "../utils/graphics/voxelMesh";
-
-const VoxelGroupMesh = memo(function VoxelGroupMesh({ vg, opacity }: { vg: VoxelGroup, opacity: number }) {
-    const geo = useMemo(() => buildVoxelGroupMesh(vg.positions), [vg]);
-    useEffect(() => () => { geo.dispose(); }, [geo]);
-
-    const op = vg.opacity * opacity;
-
-    return (
-        <mesh geometry={geo} userData={{ baseOpacity: vg.opacity }}>
-            <meshStandardMaterial color={vg.color} opacity={op} transparent={op < 1} />
-        </mesh>
-    );
-});
 
 export type ObjectViewInternalHandle = {
     group: Group | null;
@@ -71,8 +56,6 @@ export const ObjectViewInternal = function ({ object, objectType, ref, ...props
         [object, object.id, props.isPlayer]
     );
 
-    const gameObj = object as RuntimeGameObjectInstance;
-
     useEffect(
         () => {
             return reaction(
@@ -98,8 +81,8 @@ export const ObjectViewInternal = function ({ object, objectType, ref, ...props
 
     useEffect(
         () => {
-            runInAction(() => { gameObj.rb = () => rbRef.current; });
+            runInAction(() => { object.rb = () => rbRef.current; });
-            return () => { runInAction(() => { gameObj.rb = () => null; }); };
+            return () => { runInAction(() => { object.rb = () => null; }); };
         },
         // eslint-disable-next-line react-hooks/exhaustive-deps
         [object.id],
@@ -130,9 +113,11 @@ export const ObjectViewInternal = function ({ object, objectType, ref, ...props
                     return;
                 const otherObj = Object.values(game.scene.objects)
                     .find((o) => o.rb()?.handle === otherHandle);
-                game.emitEvent('objectTouchStart', { object: gameObj, other: otherObj });
+
+                const context = { object: { ...object, typeId: objectType.id }, other: otherObj };
+                game.emitEvent('objectTouchStart', context);
                 if (otherObj?.id === game.scene.playerObjectId)
-                    game.emitEvent('playerTouchStart', { object: gameObj, other: otherObj });
+                    game.emitEvent('playerTouchStart', context);
             }}
             onSync={(data) => {
                 runInAction(() => {

webclient/src/components/SceneEditorView.tsx

@@ -4,7 +4,7 @@ import { OrbitControls } from '@react-three/drei';
 import { observer } from 'mobx-react-lite';
 import { state } from '../state';
 import { SceneView } from './SceneView';
-import { MOUSE, type OrthographicCamera, type PerspectiveCamera } from 'three';
+import { MOUSE } from 'three';
 import { useSyncCamera } from '../utils/hooks/useSyncCamera';
 import { Physics } from '@react-three/rapier';
 

webclient/src/components/SceneView.tsx

@@ -1,11 +1,11 @@
 import { observer } from "mobx-react-lite";
-import type { RuntimeScene } from "../types";
 import { GameObjectView } from "./GameObjectView";
 import { ObjectEditorView } from "./ObjectEditorView";
 import { DebugLabelsView } from "./DebugLabelsView";
+import type { Scene } from "../types";
 
 type SceneViewProps = {
-    scene: RuntimeScene,
+    scene: Scene,
     isEditor?: boolean;
     debugOverlay?: boolean;
 }
@@ -18,7 +18,7 @@ export const SceneView = observer(function (props: SceneViewProps) {
             Object.values(props.scene.objects)
                 .map((obj) => (
                     !props.isEditor
-                        ? <GameObjectView key={obj.id} object={obj as RuntimeGameObjectInstance} isPlayer={props.scene.playerObjectId === obj.id} isSceneEditor={props.isEditor} />
+                        ? <GameObjectView key={obj.id} object={obj} isPlayer={props.scene.playerObjectId === obj.id} isSceneEditor={props.isEditor} />
                         : <ObjectEditorView key={obj.id} object={obj} isPlayer={props.scene.playerObjectId === obj.id} />
                 ))
         }

webclient/src/components/ThreeView.tsx

@@ -8,7 +8,6 @@ import { SceneEditorView } from './SceneEditorView';
 import { JoystickView } from './JoystickView';
 import { useEffect } from 'react';
 import { runInAction } from 'mobx';
-import { IconPlayerPlayFilled, IconPlayerPauseFilled, IconPlayerStopFilled, IconPlayerSkipForwardFilled } from '@tabler/icons-react';
 
 export const ThreeView = observer(function () {
     const isGame = !!state.game;
@@ -39,23 +38,7 @@ export const ThreeView = observer(function () {
                     {isGame ? <GameView /> : <SceneEditorView />}
                 </Canvas>
                 {isGame && <JoystickView />}
-                <div style={{ position: 'absolute', top: 8, right: 8, display: 'flex', gap: 4, fontSize: 14 }}>
+                
-                    {
-                        state.game
-                            ? <>
-                                <button onClick={() => state.stopGame()}><IconPlayerStopFilled size="1em" /></button>
-                                {
-                                    state.game!.isPaused
-                                        ? <>
-                                            <button onClick={() => state.game!.resume()}><IconPlayerPlayFilled size="1em" /></button>
-                                            <button onClick={() => state.game!.step()}><IconPlayerSkipForwardFilled size="1em" /></button>
-                                        </>
-                                        : <button onClick={() => state.game!.pause()}><IconPlayerPauseFilled size="1em" /></button>
-                                }
-                            </>
-                            : <button onClick={() => state.startGame()}><IconPlayerPlayFilled size="1em" /></button>
-                    }
-                </div>
             </div>
         </KeyboardControls>
     );

webclient/src/components/layers/LayeredThreeView.tsx

@@ -6,6 +6,7 @@ import { SceneEditorObjectSelectionLayer } from "./SceneEditor/SceneEditorObject
 import { LightsLayer } from "./LighsLayer";
 import { StatsLayer } from './StatsLayer';
 import { SceneEditorObjectGizmosLayer } from "./SceneEditor/SceneEditorObjectGizmosLayer";
+import { PlayButtonsLayer } from "./PlayButtonsLayer";
 
 export const LayeredThreeView = observer(function () {
 
@@ -20,5 +21,6 @@ export const LayeredThreeView = observer(function () {
             </ObjectGeometriesLayer>
             <StatsLayer />
         </Canvas>
+        <PlayButtonsLayer />
     </>;
 });

webclient/src/components/layers/PlayButtonsLayer.tsx

@@ -0,0 +1,23 @@
+import { observer } from "mobx-react-lite";
+import { state } from "../../state";
+import { IconPlayerPlayFilled, IconPlayerPauseFilled, IconPlayerStopFilled, IconPlayerSkipForwardFilled } from '@tabler/icons-react';
+
+export const PlayButtonsLayer = observer(function () {
+    return <div style={{ position: 'absolute', top: 8, right: 8, display: 'flex', gap: 4, fontSize: 14 }}>
+        {
+            state.game
+                ? <>
+                    <button onClick={() => state.stopGame()}><IconPlayerStopFilled size="1em" /></button>
+                    {
+                        state.game!.isPaused
+                            ? <>
+                                <button onClick={() => state.game!.resume()}><IconPlayerPlayFilled size="1em" /></button>
+                                <button onClick={() => state.game!.step()}><IconPlayerSkipForwardFilled size="1em" /></button>
+                            </>
+                            : <button onClick={() => state.game!.pause()}><IconPlayerPauseFilled size="1em" /></button>
+                    }
+                </>
+                : <button onClick={() => state.startGame()}><IconPlayerPlayFilled size="1em" /></button>
+        }
+    </div>;
+});

webclient/src/model/gameFactory.ts

@@ -1,7 +1,6 @@
 import { toJS } from "mobx";
 import type { Game, Scene, ScriptAction, ScriptCoroutineContext, World } from "../types";
 import { clone } from "../utils";
-import { populateRuntimeScene } from "../utils/runtime";
 import { ScriptGameEventBus } from "../scripts/eventBus";
 import * as ScriptActions from "../scripts/actions";
 import { positionOfObject } from "../scripts/positionOfObject";
@@ -19,7 +18,7 @@ import type { ScriptCoroutines } from "../scripts/coroutines";
 export class GameFactory {
 
     public static create(world: World): Game {
-        const scene = populateRuntimeScene(clone(world.initialScene), world);
+        const scene = clone(world.initialScene);
 
         const game = {
             paused: false,

webclient/src/model/worldFactory.ts

@@ -1,11 +1,10 @@
-import { type RuntimeWorld, type World } from "../types";
+import { type World } from "../types";
-import { depopulateRuntimeWorld, populateRuntimeWorld } from "../utils/runtime";
 import { DEFAULT_VOXEL_TYPES } from "./defaultVoxelTypes";
 
 export class WorldFactory {
 
-    public static create(): RuntimeWorld {
+    public static create(): World {
-        return populateRuntimeWorld({
+        return {
             objectTypes: {},
             voxelTypes: DEFAULT_VOXEL_TYPES,
             initialScene: {
@@ -19,17 +18,17 @@ export class WorldFactory {
                 position: [0, 5, 10],
                 look: [0, 0, 0],
             },
-        });
+        };
     }
 
-    public static load(): RuntimeWorld | undefined {
+    public static load(): World | undefined {
         const json = localStorage.getItem("world");
         if (json) {
-            return populateRuntimeWorld(JSON.parse(json) as World);
+            return JSON.parse(json) as World;
         }
     }
 
-    public static save(world: RuntimeWorld): void {
+    public static save(world: World): void {
-        localStorage.setItem("world", JSON.stringify(depopulateRuntimeWorld(world)));
+        localStorage.setItem("world", JSON.stringify(world));
     }
 }

webclient/src/scripts/positionOfObject.ts

@@ -1,6 +1,6 @@
-import type { RuntimeGameObjectInstance, V3 } from "../types";
+import type { ObjectInstance, V3 } from "../types";
 
-export function positionOfObject(obj: RuntimeGameObjectInstance): V3 {
+export function positionOfObject(obj: ObjectInstance): V3 {
     const t = obj.rb()?.translation();
     const result: V3 = t
         ? [t.x, t.y, t.z]

webclient/src/state/worldEditorState.ts

@@ -4,7 +4,6 @@ import { type ObjectInstance, type Pos3, type R3, type V3, type ObjectType, type
 import { createObjectInstance } from "../utils/object";
 import { randomId } from "../utils";
 import { state } from "./rootState";
-import { populateRuntimeObject } from "../utils/runtime";
 import { DEFAULT_VOXEL_TYPE } from "../model/defaultVoxelTypes";
 
 export const ObjectEditModeEnum = [
@@ -130,7 +129,7 @@ export class WorldEditorState {
         typeId: string,
         pos: { x: number; y: number; z: number; },
     ): ObjectInstance {
-        const obj = populateRuntimeObject(createObjectInstance(randomId(), typeId), this.world.data);
+        const obj = createObjectInstance(randomId(), typeId);
         obj.position = [pos.x, pos.y, pos.z];
         obj.rotation = [0, 0, 0];
 

webclient/src/state/worldState.ts

@@ -5,7 +5,6 @@ import { state } from "./rootState";
 import { DEFAULT_VOXEL_TYPES } from "../model/defaultVoxelTypes";
 import { wolf } from "../model/objectPrefabs/wolf";
 import { terrainXZ } from "../model/objectPrefabs/terrain";
-import { populateRuntimeWorld } from "../utils/runtime";
 
 export class WorldState {
     public data: World = WorldFactory.create();
@@ -58,7 +57,7 @@ export class WorldState {
             objects.map((obj) => [obj.id, obj]),
         ) as Record<string, ObjectInstance>;
 
-        this.data = populateRuntimeWorld({
+        this.data = {
             objectTypes: {
                 wolf: {
                     id: 'wolf',
@@ -97,7 +96,7 @@ export class WorldState {
             gameRules: {
                 gravity: true,
             },
-        });
+        };
 
         console.log(objects);
         state.worldEditor.resetSelection();

webclient/src/types/scripts/eventBus.ts

@@ -1,4 +1,4 @@
-import type { ObjectInstance, ObjectType, RuntimeGameObjectInstance, Scene, World } from "../model";
+import type { ObjectInstance, ObjectType, Scene, World } from "../model";
 import type { ScriptAction } from "./actions";
 
 export type ScriptCoroutine = Generator<ScriptAction, void, void>;
@@ -9,15 +9,15 @@ export type NamedScriptCoroutine = {
 }
 
 export type ScriptCoroutineContext = {
-    thisObject: RuntimeGameObjectInstance,
+    thisObject: ObjectInstance,
     thisObjectType: ObjectType;
 };
 
 export type ScriptContext = ScriptCoroutineContext & {
     world: World;
     scene: Scene;
-    object?: RuntimeGameObjectInstance;
+    object?: ObjectInstance;
-    other?: RuntimeGameObjectInstance;
+    other?: ObjectInstance;
 }
 
 export type ScriptGameEventHandler = (context: ScriptContext) => ScriptCoroutine;

webclient/src/utils/object.ts

@@ -10,5 +10,8 @@ export function createObjectInstance(id: string, typeId: string): ObjectInstance
         position: [0, 0, 0],
         rotation: [0, 0, 0],
         scale: [1, 1, 1],
+        
+        linearVelocity: [0, 0, 0],
+        angularVelocity: [0, 0, 0],
     };
 }

webclient/src/utils/runtime/index.ts

@@ -1,3 +1 @@
-export * from './world';
-export * from './scene';
 export * from './object';

webclient/src/utils/runtime/object.ts

@@ -1,6 +1,4 @@
-import { getObjectVoxelGroups } from "../graphics/voxelGroup";
+import type { ObjectType, V3 } from "../../types";
-import type { ObjectInstance, ObjectType, RuntimeObjectInstance, RuntimeObjectType, V3, World } from "../../types";
-import { buildObjectTrimesh } from "../graphics/mesh";
 
 export function computeBoundingBox(objectType: ObjectType): { min: V3; max: V3 } {
     if (!objectType.voxels.length)
@@ -17,35 +15,3 @@ export function computeBoundingBox(objectType: ObjectType): { min: V3; max: V3 }
     }
     return { min: [minX, minY, minZ], max: [maxX, maxY, maxZ] };
 }
-
-export function populateRuntimeObjectType(value: ObjectType, world: World): RuntimeObjectType {
-    return {
-        ...value,
-        runtime: {
-            voxelGroups: getObjectVoxelGroups(value, world.voxelTypes),
-            colliderMesh: buildObjectTrimesh(value, world.voxelTypes),
-            boundingBox: computeBoundingBox(value),
-            updatedAt: 0,
-        },
-    };
-}
-
-export function populateRuntimeObject(value: ObjectInstance, _world: World): RuntimeObjectInstance {
-    return {
-        ...value,
-        runtime: {
-            rb: () => null,
-        },
-    };
-}
-
-export function depopulateRuntimeObjectType(value: RuntimeObjectType, _world: World): ObjectType {
-    const { runtime: _, ...result } = value;
-    return result;
-}
-
-
-export function depopulateRuntimeObject(value: RuntimeObjectInstance, _world: World): ObjectInstance {
-    const { runtime: _, ...result } = value;
-    return result;
-}

webclient/src/utils/runtime/scene.ts

@@ -1,16 +0,0 @@
-import type { RuntimeScene, Scene, World } from "../../types";
-import { depopulateRuntimeObject, populateRuntimeObject } from "./object";
-
-export function populateRuntimeScene(scene: Scene, world: World): RuntimeScene {
-    return {
-        ...scene,
-        objects: Object.fromEntries(Object.entries(scene.objects).map(([id, obj]) => [id, populateRuntimeObject(obj, world)])),
-    };
-}
-
-export function depopulateRuntimeScene(scene: RuntimeScene, world: World): Scene {
-    return {
-        ...scene,
-        objects: Object.fromEntries(Object.entries(scene.objects).map(([id, obj]) => [id, depopulateRuntimeObject(obj, world)])),
-    };
-}

webclient/src/utils/runtime/world.ts

@@ -1,16 +0,0 @@
-import type { RuntimeWorld, World } from "../../types";
-import { depopulateRuntimeScene, populateRuntimeScene } from "./scene";
-
-export function populateRuntimeWorld(world: World): RuntimeWorld {
-    return {
-        ...world,
-        initialScene: populateRuntimeScene(world.initialScene, world),
-    };
-}
-
-export function depopulateRuntimeWorld(world: RuntimeWorld): World {
-    return {
-        ...world,
-        initialScene: depopulateRuntimeScene(world.initialScene, world),
-    };
-}