From 55a5adcd92e0ece2ce07524ed160c1a3a78ec525 Mon Sep 17 00:00:00 2001 From: Matthieu Jolimaitre Date: Wed, 10 Apr 2024 03:15:01 +0200 Subject: [PATCH] refactor, simplify common access names --- server/components/display.ts | 4 ++-- server/components/world.ts | 18 +++++++++--------- server/engine.ts | 21 ++++++++++++++------- server/entities/player.ts | 4 ++-- server/main.ts | 3 +++ 5 files changed, 30 insertions(+), 20 deletions(-) diff --git a/server/components/display.ts b/server/components/display.ts index 8f6f350..4eebf70 100644 --- a/server/components/display.ts +++ b/server/components/display.ts @@ -16,8 +16,8 @@ export function sys_render_world(center: Vec2, size: Vec2) { const result = Array.from(range(0, size.y())).map(() => Array.from(range(0, size.x())).map(() => " ")); const min = center.sub(radius); const max = center.add(radius).sub(v2(1, 1)); - for (const [pos, display] of engine.query_all(query_in_rect(min, max).with(CompDisplay))) { - const local_pos = pos.position.sub(min); + for (const [pos, display] of engine.all(query_in_rect(min, max).with(CompDisplay))) { + const local_pos = pos.pos.sub(min); result[local_pos.y()][local_pos.x()] = display.display; } return result.map((line) => line.join("")).toReversed().join("\n"); diff --git a/server/components/world.ts b/server/components/world.ts index fb0857f..013c118 100644 --- a/server/components/world.ts +++ b/server/components/world.ts @@ -5,24 +5,24 @@ import { CompDisplay } from "./display.ts"; const log = log_from(import.meta); export class CompPos { - position; + pos; entity; constructor(entity: Entity, position: Vec2) { - this.position = position; + this.pos = position; this.entity = entity; } move(displacement: Vec2) { - this.position = this.position.add(displacement); + this.pos = this.pos.add(displacement); } move_collide(engine: Engine, displacement: Vec2) { let result = false; - for (const step of displacement_steps(this.position, displacement)) { - const collider_exists = engine.query_one(query_at(step)) !== null; + for (const step of displacement_steps(this.pos, displacement)) { + const collider_exists = engine.one(query_at(step)) !== null; if (collider_exists) return result; - this.position = step; + this.pos = step; result = true; } return result; @@ -61,11 +61,11 @@ Deno.test("test_displacement", () => { }); export function query_at(pos: Vec2) { - return Query.with(CompPos).filter(([c]) => c.position.overlaps(pos)); + return Query.with(CompPos).filter(([c]) => c.pos.overlaps(pos)); } export function query_in_rect(min: Vec2, max: Vec2) { - return Query.with(CompPos).filter(([c]) => c.position.inside(min, max)); + return Query.with(CompPos).filter(([c]) => c.pos.inside(min, max)); } class CompStructure {} @@ -100,7 +100,7 @@ export async function sys_spawn_structure(file_path: string, origin: Vec2) { export function sys_find_free_pos(target: Vec2) { return (engine: Engine) => { for (const pos of spiral(target)) { - const found = engine.query_one(query_at(pos)); + const found = engine.one(query_at(pos)); if (found === null) return pos; } throw new Error("Unreachable."); diff --git a/server/engine.ts b/server/engine.ts index e3e9758..0768bc7 100644 --- a/server/engine.ts +++ b/server/engine.ts @@ -2,12 +2,10 @@ import { Awaitable, ClassMap, Constructible, first, log_from, Prototyped, wait } const log = log_from(import.meta); export class Entity { - identifier; components; engine; - constructor(identifier: number, engine: Engine) { - this.identifier = identifier; + constructor(engine: Engine) { this.engine = engine; this.components = new ClassMap(); } @@ -28,6 +26,13 @@ export class Entity { } } +export class CompId { + public readonly id; + constructor(id: number) { + this.id = id; + } +} + export class Engine { next_identifier; entities; @@ -43,7 +48,8 @@ export class Engine { spawn(op: (entity: Entity) => unknown) { const identifier = this.next_identifier++; - const entity = new Entity(identifier, this); + const entity = new Entity(this); + entity.insert(new CompId(identifier)); op(entity); this.entities.set(identifier, entity); return entity; @@ -54,18 +60,19 @@ export class Engine { } async global_system_loop(sys: (engine: Engine) => Awaitable, interval: number) { + // TODO : Wait for start. while (true) { await sys(this); await wait(interval); } } - *query_all(query: Query) { + *all(query: Query) { yield* query.run(this.entities.values()); } - query_one(query: Query) { - return first(this.query_all(query)); + one(query: Query) { + return first(this.all(query)); } get(identifier: number) { diff --git a/server/entities/player.ts b/server/entities/player.ts index d08879d..2ae9362 100644 --- a/server/entities/player.ts +++ b/server/entities/player.ts @@ -48,7 +48,7 @@ export class Session { } send_display(width: number, height: number) { - const raw = this.engine.run(sys_render_world(this.entity.get_force(CompPos).position, v2(width, height))); + const raw = this.engine.run(sys_render_world(this.entity.get_force(CompPos).pos, v2(width, height))); this.client.outputs.send({ kind: "display", content: { raw } }); } @@ -70,7 +70,7 @@ export function sys_spawn_player(position: Vec2) { }; } -class CompPlayer { +export class CompPlayer { life; constructor() { this.life = 10; diff --git a/server/main.ts b/server/main.ts index b848ce7..1a67098 100755 --- a/server/main.ts +++ b/server/main.ts @@ -6,12 +6,15 @@ import { Session } from "./entities/player.ts"; import { sys_spawn_structure } from "./components/world.ts"; import { Gateway } from "./network.ts"; import { sys_spawn_enemy } from "./entities/enemy.ts"; +import { enemy_plugin } from "./entities/enemy.ts"; const log = log_from(import.meta); async function main() { log("Starting."); const engine = new Engine(); + enemy_plugin(engine); engine.start(); + engine.run(await sys_spawn_structure("../data/structures/houses.txt", v2(2, 2))); engine.run(sys_spawn_enemy(v2(1, 1)));