FCK

engine/Animation.ts

@@ -1,47 +0,0 @@
-import { drawSprite, type Sprite } from "./Sprite.ts";
-
-export const spriteMap = new Map<string, Sprite>();
-
-export type Animation = {
-	spriteSrc: string;
-	xIndex: number;
-	yIndex: number;
-	frameTime: number;
-	frameDelta: number;
-};
-
-export function createAnimation(
-	sprite: Sprite,
-	frameTime: number,
-	yIndex: number,
-): Animation {
-	const spriteSrc = sprite.image.src;
-	spriteMap.set(spriteSrc, sprite);
-
-	return {
-		spriteSrc,
-		xIndex: 0,
-		yIndex,
-		frameTime,
-		frameDelta: 0,
-	};
-}
-
-export function playAnimation(
-	ctx: CanvasRenderingContext2D,
-	animation: Animation,
-	x: number,
-	y: number,
-	delta: number,
-): void {
-	const sprite = spriteMap.get(animation.spriteSrc)!;
-
-	if ((animation.frameDelta += delta) > animation.frameTime) {
-		animation.frameDelta = 0;
-		if ((animation.xIndex += 1) >= sprite.xFrames) {
-			animation.xIndex = 0;
-		}
-	}
-
-	drawSprite(ctx, sprite, animation.xIndex, animation.yIndex, x, y);
-}

engine/Collision.ts

@@ -1,13 +1,5 @@
 import type { Vector } from "#/engine/Vector.ts";
 
-export type Body<T extends { position: Vector }> = {
-	shape: T;
-	offset: Vector;
-};
-
-export function moveAndCollide<T extends { position: Vector }>(
-	body: Body<T>,
-	velocity: Vector,
-): void {
+export function moveAndCollide<T>(body: T, velocity: Vector): void {
 	return;
 }

engine/Entity.ts

@@ -1,45 +1,20 @@
-import type { Animation } from "./Animation.ts";
-import { createVector, type Vector } from "./Vector.ts";
-
-export type Indirect = never;
-
-export type Entity<T> = {
+export type Entity<T extends object> = {
 	name: string;
-	position: Vector;
-	animation: Animation;
-} & T;
+	state: T;
+};
 
-export type Animate<T> = (
-	entity: Entity<T>,
-	ctx: CanvasRenderingContext2D,
-	delta: number,
-) => void;
+export type Process<T extends object> = (instance: T, delta: number) => void;
 
-export type Process<T> = (entity: Entity<T>, delta: number) => void;
+export const entityMap = new Map();
+export const entityProcessMap = new Map();
 
-export const entityMap = new Map<string, Entity<unknown>>();
-export const entityAnimateMap = new Map<string, Animate<Indirect>>();
-export const entityProcessMap = new Map<string, Process<Indirect>>();
-
-export function defineEntity<T extends { animation: Animation }>(
+export function defineEntity<T extends object>(
 	name: string,
 	state: T,
-): {
-	animate: (fn: Animate<T>) => void;
-	process: (fn: Process<T>) => void;
-} {
-	entityMap.set(name, {
-		name,
-		position: createVector(),
-		...state,
-	});
+): (fn: Process<T>) => void {
+	entityMap.set(name, state);
 
-	return {
-		animate(fn) {
-			entityAnimateMap.set(name, fn);
-		},
-		process(fn) {
-			entityProcessMap.set(name, fn);
-		},
+	return (fn) => {
+		entityProcessMap.set(name, fn);
 	};
 }

engine/Scene.ts

@@ -1,28 +1,29 @@
 import {
-	type Animate as AnimateEntity,
 	type Entity,
-	entityAnimateMap,
 	entityMap,
 	entityProcessMap,
-	type Indirect,
 	type Process as ProcessEntity,
-} from "./Entity.ts";
-import { type Graph, getNeighbours } from "./Graph.ts";
-import { useWithAsyncCache } from "./lib/cache.ts";
+} from "#/engine/Entity.ts";
+import { type Graph, getNeighbours } from "#/engine/Graph.ts";
+import { useWithAsyncCache } from "#/engine/lib/cache.ts";
+
+export type EntityData = {
+	name: string;
+	init: object;
+};
 
 export type SceneData = {
 	name: string;
 	width: number;
 	height: number;
-	entities: Array<Entity<unknown>>;
+	entities: Array<EntityData>;
 };
 
 export type EntityInstanceMap = Map<
 	string,
 	{
-		animate: AnimateEntity<Indirect>;
-		process: ProcessEntity<Indirect>;
-		instances: Array<Entity<unknown>>;
+		process: ProcessEntity<object>;
+		instances: Array<object>;
 	}
 >;
 
@@ -41,42 +42,43 @@ export type SceneChangeHandler = (to: SceneData, from: SceneData) => void;
 export const sceneProcessMap = new Map<string, Process>();
 export const scenePreProcessMap = new Map<string, PreProcess>();
 export const scenePostProcessMap = new Map<string, PostProcess>();
-export const sceneDataMap = new Map<string, SceneData>();
-export const sceneEntiyMap = new Map<string, EntityInstanceMap>();
+
 export const sceneChangedHandlers = new Set<SceneChangeHandler>();
+
+export const sceneDataMap = new Map<string, SceneData>();
+export const sceneEntiyInstanceMap = new Map<string, EntityInstanceMap>();
 export const sceneGraph: Graph<string> = new Map();
 
-const sceneInstancesMap = new Map<string, Array<Entity<unknown>>>();
+const sceneInstancesMap = new Map<string, Array<object>>();
 
 export const [loadScene, sceneCache] = useWithAsyncCache(
 	async (name: string) => {
 		await import(`#/game/scenes/${name}/scene.ts`);
 
 		const data = sceneDataMap.get(name)!;
-		const entityInstanceMap = sceneEntiyMap.get(name)!;
+		const entityInstanceMap = sceneEntiyInstanceMap.get(name)!;
 		entityInstanceMap.clear();
 
 		await Promise.all(
-			data.entities.map(async (entity: Entity<unknown>) => {
-				await import(`#/game/entities/${entity.name}/entity.ts`);
+			data.entities.map(async (entityData: EntityData) => {
+				await import(`#/game/entities/${entityData.name}/entity.ts`);
 
-				if (!entityInstanceMap.has(entity.name)) {
-					entityInstanceMap.set(entity.name, {
-						animate: entityAnimateMap.get(entity.name) ?? (() => {}),
-						process: entityProcessMap.get(entity.name) ?? (() => {}),
+				if (!entityInstanceMap.has(entityData.name)) {
+					entityInstanceMap.set(entityData.name, {
+						process: entityProcessMap.get(entityData.name) ?? (() => {}),
 						instances: [],
 					});
 				}
 
 				try {
-					entityInstanceMap.get(entity.name)!.instances.push(
+					entityInstanceMap.get(entityData.name)!.instances.push(
 						structuredClone({
-							...entityMap.get(entity.name)!,
-							...entity,
+							...entityMap.get(entityData.name)!,
+							...entityData,
 						}),
 					);
 				} catch (error) {
-					console.error(entity.name, error);
+					console.error(entityData.name, error);
 				}
 			}),
 		);
@@ -94,21 +96,21 @@ export const currentScene: Scene = {
 	entityInstanceMap: new Map(),
 };
 
-function animateEntities(ctx: CanvasRenderingContext2D, delta: number): void {
-	const instances = sceneInstancesMap.get(currentScene.data.name)!;
-	instances.sort((a, b) => a.position.y - b.position.y);
+// function animateEntities(ctx: CanvasRenderingContext2D, delta: number): void {
+// 	const instances = sceneInstancesMap.get(currentScene.data.name)!;
+// 	instances.sort((a, b) => a.position.y - b.position.y);
 
-	for (const instance of instances) {
-		currentScene.entityInstanceMap
-			.get(instance.name)!
-			.animate(instance as Entity<Indirect>, ctx, delta);
-	}
-}
+// 	for (const instance of instances) {
+// 		currentScene.entityInstanceMap
+// 			.get(instance.name)!
+// 			.animate(instance as Entity<Indirect>, ctx, delta);
+// 	}
+// }
 
 function processEntities(delta: number): void {
 	for (const entity of currentScene.entityInstanceMap.values()) {
 		for (const instance of entity.instances) {
-			entity.process(instance as Entity<Indirect>, delta);
+			entity.process(instance, delta);
 		}
 	}
 }
@@ -130,7 +132,7 @@ export function defineScene(data: SceneData): {
 	postProcess: (fn: PostProcess) => void;
 } {
 	sceneDataMap.set(data.name, data);
-	sceneEntiyMap.set(data.name, new Map());
+	sceneEntiyInstanceMap.set(data.name, new Map());
 
 	return {
 		linkScenes(ids) {
@@ -146,7 +148,7 @@ export function defineScene(data: SceneData): {
 			sceneProcessMap.set(data.name, (ctx, delta) => {
 				processEntities(delta);
 				fn(ctx, delta);
-				animateEntities(ctx, delta);
+				// animateEntities(ctx, delta);
 			});
 		},
 		preProcess(fn): void {
@@ -168,7 +170,7 @@ export async function setScene(name: string): Promise<void> {
 
 	const data = sceneDataMap.get(name)!;
 	const process = sceneProcessMap.get(name)!;
-	const entityInstanceMap = sceneEntiyMap.get(name)!;
+	const entityInstanceMap = sceneEntiyInstanceMap.get(name)!;
 	sceneInstancesMap.set(
 		data.name,
 		entityInstanceMap.values().reduce(
@@ -178,18 +180,18 @@ export async function setScene(name: string): Promise<void> {
 				}
 				return acc;
 			},
-			[] as Array<Entity<unknown>>,
+			[] as Array<object>,
 		),
 	);
 
 	const preProcess = scenePreProcessMap.get(name);
 	if (preProcess) {
-		preProcess(sceneEntiyMap.get(name)!);
+		preProcess(sceneEntiyInstanceMap.get(name)!);
 	}
 
 	const postProcess = scenePostProcessMap.get(currentScene.data.name);
 	if (postProcess) {
-		postProcess(sceneEntiyMap.get(name)!);
+		postProcess(sceneEntiyInstanceMap.get(name)!);
 	}
 
 	currentScene.data = data;

engine/Sprite.ts

@@ -1,54 +0,0 @@
-import { loadImage } from "./lib/loadImage.ts";
-
-export type Sprite = {
-	image: HTMLImageElement;
-	xFrames: number;
-	yFrames: number;
-	frameWidth: number;
-	frameHeight: number;
-};
-
-export function createSprite(
-	image: HTMLImageElement,
-	xFrames: number,
-	yFrames: number,
-): Sprite {
-	return {
-		image,
-		xFrames,
-		yFrames,
-		frameWidth: image.width / xFrames,
-		frameHeight: image.height / yFrames,
-	};
-}
-
-export async function fromSrc(
-	src: string,
-	xFrames: number,
-	yFrames: number,
-): Promise<Sprite> {
-	return createSprite(await loadImage(src), xFrames, yFrames);
-}
-
-export function drawSprite(
-	ctx: CanvasRenderingContext2D,
-	sprite: Sprite,
-	xIndex: number,
-	yIndex: number,
-	x: number,
-	y: number,
-	width?: number,
-	height?: number,
-): void {
-	ctx.drawImage(
-		sprite.image,
-		xIndex * sprite.frameWidth,
-		yIndex * sprite.frameHeight,
-		sprite.frameWidth,
-		sprite.frameHeight,
-		x,
-		y,
-		width || sprite.frameWidth,
-		height || sprite.frameHeight,
-	);
-}

engine/dev/main.tsx

@@ -7,18 +7,15 @@ import {
 	Show,
 } from "solid-js";
 import { render } from "solid-js/web";
-import { spriteMap } from "#/engine/Animation.ts";
 import type { Entity } from "#/engine/Entity.ts";
 import {
 	currentScene,
 	type SceneData,
 	sceneChangedHandlers,
 	sceneGraph,
-	sceneProcessMap,
 	setScene,
 } from "#/engine/Scene.ts";
 import { setScale, viewport } from "#/engine/Viewport.ts";
-import { strokeRect } from "../Rect.ts";
 import { InputField } from "./controls/InputField.tsx";
 import { RangeSlider } from "./controls/RangeSlider.tsx";
 import { GraphBrowser } from "./GraphBrowser.tsx";
@@ -76,7 +73,7 @@ const DevTools: Component<{ gameContainer: HTMLElement }> = ({
 	const [entities, setEntities] = createSignal(
 		mapSceneEntities(currentScene.data),
 	);
-	const [activeEntity, setActiveEntity] = createSignal<null | Entity<unknown>>(
+	const [activeEntity, setActiveEntity] = createSignal<null | Entity<object>>(
 		null,
 	);
 
@@ -96,47 +93,48 @@ const DevTools: Component<{ gameContainer: HTMLElement }> = ({
 	});
 
 	const selectEntity = (items: ItemsRef): void => {
-		const activeRef = items.find((ref) => ref.item.isActive)!;
-		const instances = currentScene.entityInstanceMap.get(
-			activeRef.item.label,
-		)!.instances;
+		console.log(items);
+		// const activeRef = items.find((ref) => ref.item.isActive)!;
+		// const instances = currentScene.entityInstanceMap.get(
+		// 	activeRef.item.label,
+		// )!.instances;
 
-		const entityRefs = items.filter(
-			(ref) => ref.item.label === activeRef.item.label,
-		);
-		const instance =
-			instances[entityRefs.findIndex((ref) => ref.item.isActive)];
+		// const entityRefs = items.filter(
+		// 	(ref) => ref.item.label === activeRef.item.label,
+		// );
+		// const instance =
+		// 	instances[entityRefs.findIndex((ref) => ref.item.isActive)];
 
-		setActiveEntity(instance);
-		const sprite = spriteMap.get(instance.animation.spriteSrc)!;
+		// setActiveEntity(instance);
+		// const sprite = spritesSheetsMap.get(instance.animation.spriteSrc)!;
 
-		const processProxy = sceneProcessMap.get(currentScene.data.name)!;
-		const ctx = viewport.ctx;
-		currentScene.process = (...args) => {
-			processProxy(...args);
+		// const processProxy = sceneProcessMap.get(currentScene.data.name)!;
+		// const ctx = viewport.ctx;
+		// currentScene.process = (...args) => {
+		// 	processProxy(...args);
 
-			ctx.save();
-			ctx.globalAlpha = 0.75;
-			ctx.lineWidth = 1;
-			ctx.strokeStyle = "#6572f5";
-			viewport.ctx.strokeRect(
-				instance.position.x - 0.5,
-				instance.position.y - 0.5,
-				sprite.image.width / sprite.xFrames + 1,
-				sprite.image.height / sprite.yFrames + 1,
-			);
+		// 	ctx.save();
+		// 	ctx.globalAlpha = 0.75;
+		// 	ctx.lineWidth = 1;
+		// 	ctx.strokeStyle = "#6572f5";
+		// 	viewport.ctx.strokeRect(
+		// 		instance.position.x - 0.5,
+		// 		instance.position.y - 0.5,
+		// 		sprite.sheet.width / sprite.xFrames + 1,
+		// 		sprite.sheet.height / sprite.yFrames + 1,
+		// 	);
 
-			ctx.fillStyle = "#ee459e";
-			viewport.ctx.fillRect(
-				instance.position.x - 1,
-				instance.position.y - 1,
-				2,
-				2,
-			);
-			ctx.beginPath();
-			ctx.fill();
-			ctx.restore();
-		};
+		// 	ctx.fillStyle = "#ee459e";
+		// 	viewport.ctx.fillRect(
+		// 		instance.position.x - 1,
+		// 		instance.position.y - 1,
+		// 		2,
+		// 		2,
+		// 	);
+		// 	ctx.beginPath();
+		// 	ctx.fill();
+		// 	ctx.restore();
+		// };
 	};
 
 	onMount(() => {
@@ -205,19 +203,19 @@ const DevTools: Component<{ gameContainer: HTMLElement }> = ({
 						<InputField
 							type="number"
 							name="x"
-							value={String(activeEntity()!.position.x)}
+							value={"FIXME"}
 							icon={LetterXIcon()}
 							onChange={(value) => {
-								activeEntity()!.position.x = parseInt(value);
+								// activeEntity()!.position.x = parseInt(value);
 							}}
 						></InputField>
 						<InputField
 							type="number"
 							name="y"
-							value={String(activeEntity()!.position.y)}
+							value={"FIXME"}
 							icon={LetterYIcon()}
 							onChange={(value) => {
-								activeEntity()!.position.y = parseInt(value);
+								// activeEntity()!.position.y = parseInt(value);
 							}}
 						></InputField>
 					</div>

engine/sprites.ts

@@ -0,0 +1,83 @@
+export type SpritesSheet = {
+	image: HTMLImageElement;
+	xFrames: number;
+	yFrames: number;
+	frameWidth: number;
+	frameHeight: number;
+};
+
+export type SpriteAnimation = {
+	sheet: SpritesSheet;
+	xIndex: number;
+	yIndex: number;
+	frameTime: number;
+	frameDelta: number;
+};
+
+export function createSpritesSheet(
+	image: HTMLImageElement,
+	xFrames: number,
+	yFrames: number,
+): SpritesSheet {
+	return {
+		image,
+		xFrames,
+		yFrames,
+		frameWidth: image.width / xFrames,
+		frameHeight: image.height / yFrames,
+	};
+}
+
+export function createSpriteAnimation(
+	sheet: SpritesSheet,
+	frameTime: number,
+	yIndex: number,
+): SpriteAnimation {
+	return {
+		sheet,
+		xIndex: 0,
+		yIndex,
+		frameTime,
+		frameDelta: 0,
+	};
+}
+
+export function drawSprite(
+	ctx: CanvasRenderingContext2D,
+	sheet: SpritesSheet,
+	xIndex: number,
+	yIndex: number,
+	x: number,
+	y: number,
+	width?: number,
+	height?: number,
+): void {
+	ctx.drawImage(
+		sheet.image,
+		xIndex * sheet.frameWidth,
+		yIndex * sheet.frameHeight,
+		sheet.frameWidth,
+		sheet.frameHeight,
+		x,
+		y,
+		width || sheet.frameWidth,
+		height || sheet.frameHeight,
+	);
+}
+
+export function playAnimation(
+	ctx: CanvasRenderingContext2D,
+	animation: SpriteAnimation,
+	x: number,
+	y: number,
+	delta: number,
+): void {
+	if ((animation.frameDelta += delta) > animation.frameTime) {
+		animation.frameDelta = 0;
+		if ((animation.xIndex += 1) >= animation.sheet.xFrames) {
+			animation.xIndex = 0;
+		}
+	}
+
+	drawSprite(ctx, animation.sheet, animation.xIndex, animation.yIndex, x, y);
+}