Change variable names

This commit is contained in:
Ukendio 2024-07-28 21:02:05 +02:00
parent 7f2d6a9e79
commit b79bbb5bfa

View file

@ -579,9 +579,8 @@ do
local world local world
local T local T
local PreviousT local PreviousT
local addedComponents local add
local removedComponents local is_trivial
local isTrivial
local added local added
local removed local removed
@ -594,7 +593,7 @@ do
return nil return nil
end end
if isTrivial == nil then if is_trivial == nil then
isTrivial = typeof(data) ~= "table" isTrivial = typeof(data) ~= "table"
end end
@ -602,19 +601,29 @@ do
data = table.clone(data) data = table.clone(data)
end end
addedComponents[id] = data add[id] = data
return id, data return id, data
end end
end end
local function shallowEq(a, b) local function diff(a, b)
local size = 0
for k, v in a do for k, v in a do
if b[k] ~= v then if b[k] ~= v then
return false
end
end
return true return true
end end
size += 1
end
for k, v in b do
size -= 1
end
if size ~= 0 then
return true
end
return false
end
local function changes_changed() local function changes_changed()
local q = world:query(T, PreviousT) local q = world:query(T, PreviousT)
@ -626,18 +635,15 @@ do
return nil return nil
end end
if not isTrivial then if isTrivial and new ~= old then
if not shallowEq(new, old) then elseif diff(new, old) then
break
end
elseif new ~= old then
break break
end end
id, new, old = q:next() id, new, old = q:next()
end end
addedComponents[id] = new add[id] = new
return id, old, new return id, old, new
end end
@ -650,7 +656,7 @@ do
return function() return function()
local id = q:next() local id = q:next()
if id then if id then
table.insert(removedComponents, id) world:remove(id, PreviousT)
end end
return id return id
end end
@ -678,13 +684,9 @@ do
end end
end end
for e, data in addedComponents do for e, data in add do
world:set(e, PreviousT, if isTrivial then data else table.clone(data)) world:set(e, PreviousT, if isTrivial then data else table.clone(data))
end end
for _, e in removedComponents do
world:remove(e, PreviousT)
end
end end
local tracker = { track = track } local tracker = { track = track }
@ -694,8 +696,7 @@ do
T = component T = component
-- We just use jecs.Rest because people will probably not use it anyways -- We just use jecs.Rest because people will probably not use it anyways
PreviousT = jecs.pair(jecs.Rest, T) PreviousT = jecs.pair(jecs.Rest, T)
addedComponents = {} add = {}
removedComponents = {}
return tracker return tracker
end end