De-global Tiny -> tiny
Still depends on a single global World, however.
This commit is contained in:
parent
e2ffe2d552
commit
59e7095470
4
main.lua
4
main.lua
|
@ -1,9 +1,9 @@
|
||||||
require("tiny-debug")
|
require("tiny-debug")
|
||||||
Tiny = require("lib/tiny")
|
|
||||||
require("utils")
|
require("utils")
|
||||||
require("tiny-tools")
|
require("tiny-tools")
|
||||||
|
|
||||||
World = Tiny.world()
|
local tiny = require("lib/tiny")
|
||||||
|
World = tiny.world()
|
||||||
|
|
||||||
require("generated/filter-types")
|
require("generated/filter-types")
|
||||||
require("generated/assets")
|
require("generated/assets")
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
local tiny = require("lib/tiny")
|
||||||
|
|
||||||
---@generic T
|
---@generic T
|
||||||
---@param shape T | fun()
|
---@param shape T | fun()
|
||||||
---@param process fun(entity: T, dt: number, system: System) | nil
|
---@param process fun(entity: T, dt: number, system: System) | nil
|
||||||
|
@ -8,7 +10,7 @@ function filteredSystem(name, shape, process, compare)
|
||||||
assert(type(shape) == "table" or type(shape) == "function")
|
assert(type(shape) == "table" or type(shape) == "function")
|
||||||
assert(process == nil or type(process) == "function")
|
assert(process == nil or type(process) == "function")
|
||||||
|
|
||||||
local system = compare and Tiny.sortedProcessingSystem() or Tiny.processingSystem()
|
local system = compare and tiny.sortedProcessingSystem() or tiny.processingSystem()
|
||||||
system.compare = compare
|
system.compare = compare
|
||||||
system.name = name
|
system.name = name
|
||||||
if type(shape) == "table" then
|
if type(shape) == "table" then
|
||||||
|
@ -22,7 +24,7 @@ function filteredSystem(name, shape, process, compare)
|
||||||
keys[#keys + 1] = key
|
keys[#keys + 1] = key
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
system.filter = Tiny.requireAll(unpack(keys))
|
system.filter = tiny.requireAll(unpack(keys))
|
||||||
elseif type(shape) == "function" then
|
elseif type(shape) == "function" then
|
||||||
system.filter = shape
|
system.filter = shape
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue