From 9af08c055325114d31762a647d0f42a00c71da76 Mon Sep 17 00:00:00 2001 From: Ukendio Date: Fri, 6 Sep 2024 15:17:59 +0200 Subject: [PATCH] Add components parameters --- demo/src/ReplicatedStorage/std/scheduler.luau | 6 ++---- demo/src/ReplicatedStorage/std/start.luau | 9 +++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/demo/src/ReplicatedStorage/std/scheduler.luau b/demo/src/ReplicatedStorage/std/scheduler.luau index 2c9b4e9..0406186 100644 --- a/demo/src/ReplicatedStorage/std/scheduler.luau +++ b/demo/src/ReplicatedStorage/std/scheduler.luau @@ -3,7 +3,6 @@ local ReplicatedStorage = game:GetService("ReplicatedStorage") local jabby = require(ReplicatedStorage.Packages.jabby) local jecs = require(ReplicatedStorage.ecs) -local components = require(ReplicatedStorage.std.components) local pair = jecs.pair type World = jecs.World type Entity = jecs.Entity @@ -47,7 +46,7 @@ export type Scheduler = { phase: (after: Entity) -> Entity } -local scheduler_new: (w: World) -> Scheduler +local scheduler_new: (w: World, components: { [string]: Entity }) -> Scheduler do @@ -166,7 +165,7 @@ do return system end - function scheduler_new(w) + function scheduler_new(w: World, components: { [string]: Entity }) world = w Disabled = world:component() System = world:component() @@ -243,7 +242,6 @@ do end end - return { new = scheduler_new } diff --git a/demo/src/ReplicatedStorage/std/start.luau b/demo/src/ReplicatedStorage/std/start.luau index d6b7895..7c6281a 100644 --- a/demo/src/ReplicatedStorage/std/start.luau +++ b/demo/src/ReplicatedStorage/std/start.luau @@ -2,11 +2,12 @@ local RunService = game:GetService("RunService") local UserInputService = game:GetService("UserInputService") local ReplicatedStorage = game:GetService("ReplicatedStorage") local jabby = require(ReplicatedStorage.Packages.jabby) -local Scheduler = require(ReplicatedStorage.std.scheduler) -local world = require(ReplicatedStorage.std.world) +local std = require(ReplicatedStorage.std) +local Scheduler = std.Scheduler +local world = std.world local function start(modules) - local scheduler = Scheduler.new(world) + local scheduler = Scheduler.new(world, ReplicatedStorage.std.components) for _, module in modules do require(module)(scheduler) end @@ -26,7 +27,7 @@ local function start(modules) end dtor = client.spawn_app(client.apps.home) end - end ) + end) end end