Skip to content

Fixes QueryChanged for Multiple Worlds #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheyCallMeRyan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixes QueryChanged for Multiple Worlds #156

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion lib/World.luau
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,9 @@ function World.new()

-- Storage for `queryChanged`
_changedStorage = {},

-- Proxies so `queryChanged` can receive pristine storage in each world in multi-world environments
_componentMappings = {},
}, World)

self.rootArchetype = ensureArchetype(self, {})
Expand Down Expand Up @@ -520,6 +523,7 @@ function World:clear()
self._entityMetatablesCache = {}
self._size = 0
self._changedStorage = {}
self._componentMappings = {}
end

--[=[
Expand Down Expand Up @@ -1195,7 +1199,13 @@ function World:queryChanged(componentToTrack, ...: nil)
error("World:queryChanged does not take any additional parameters", 2)
end

local hookState = topoRuntime.useHookState(componentToTrack, cleanupQueryChanged)
local componentReference = self._componentMappings[componentToTrack]
if not componentReference then
componentReference = {}
self._componentMappings[componentToTrack] = componentReference
end

local hookState = topoRuntime.useHookState(componentReference, cleanupQueryChanged)

if hookState.storage then
return function(): any
Expand Down