Skip to content

Solves issues related to transitionArchetype #159

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 2 commits into
base: main
Choose a base branch
from
Open

Solves issues related to transitionArchetype #159

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65d4676
Prevents transitions from an archetype to itself
TheyCallMeRyan Jan 21, 2025
238d30e
Add function removeFromArchetype
TheyCallMeRyan Aug 15, 2025
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
61 changes: 37 additions & 24 deletions lib/World.luau
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,36 +189,21 @@ local function ensureRecord(world: World, entityId: number): EntityRecord
return entityRecord :: EntityRecord
end

local function transitionArchetype(
world: World,
entityId: number,
entityRecord: EntityRecord,
archetype: Archetype
): number
local function removeFromArchetype(world: World, entityRecord: EntityRecord)
local oldArchetype = entityRecord.archetype
local oldEntityIndex = entityRecord.indexInArchetype

-- Add entity to archetype's entities
local entities = archetype.entities
local entityIndex = #entities + 1
entities[entityIndex] = entityId


-- Move old storage to new storage if needed
local oldNumEntities = #oldArchetype.entities
local wasLastEntity = oldNumEntities == oldEntityIndex
for index, oldComponentStorage in oldArchetype.fields do
local componentStorage = archetype.fields[archetype.idToIndex[oldArchetype.componentIds[index]]]

-- Does the new storage contain this component?
if componentStorage then
componentStorage[entityIndex] = oldComponentStorage[oldEntityIndex]
end

for index, oldComponentStorage in oldArchetype.fields do
-- Swap entity component storage
if not wasLastEntity then
oldComponentStorage[oldEntityIndex] = oldComponentStorage[oldNumEntities]
end


-- Remove componentInstance from old storage
oldComponentStorage[oldNumEntities] = nil
end

Expand All @@ -230,6 +215,37 @@ local function transitionArchetype(

-- Remove from old archetype
oldArchetype.entities[oldNumEntities] = nil
end

local function transitionArchetype(
world: World,
entityId: number,
entityRecord: EntityRecord,
archetype: Archetype
): number
local oldArchetype = entityRecord.archetype
local oldEntityIndex = entityRecord.indexInArchetype
if oldArchetype == archetype then
return
end

-- Add entity to archetype's entities
local entities = archetype.entities
local entityIndex = #entities + 1
entities[entityIndex] = entityId

-- Copy over old componentInstances before removeFromArchetype deletes them
for index, oldComponentStorage in oldArchetype.fields do
local componentStorage = archetype.fields[archetype.idToIndex[oldArchetype.componentIds[index]]]

-- Does the new storage contain this component?
if componentStorage then
componentStorage[entityIndex] = oldComponentStorage[oldEntityIndex]
end
end

-- Removed here so entityRecord still has the defined archetype
removeFromArchetype(world, entityRecord)

-- Mark entity as being in new archetype
entityRecord.indexInArchetype = entityIndex
Expand All @@ -250,10 +266,7 @@ local function executeDespawn(world: World, despawnCommand: DespawnCommand)
world:_trackChanged(component, entityId, componentInstance, nil)
end

-- TODO:
-- Optimize remove so no cascades
transitionArchetype(world, entityId, entityRecord, world.rootArchetype)
table.remove(world.rootArchetype.entities, entityRecord.indexInArchetype)
removeFromArchetype(world, entityRecord)
world.allEntities[entityId] = nil

world._size -= 1
Expand Down
Loading