qwreey-bot/quad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/qwreey75/Quad

Browse source
This commit is contained in:
세젤귀 고양이들 2021-12-24 17:32:28 +09:00
commit f8bde6f4e8
1 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/class.lua
View file

@ -16,11 +16,8 @@ function module.init(shared)
local bind = shared.event.bind; local bind = shared.event.bind;
local addObject = shared.store.addObject; local addObject = shared.store.addObject;
local storeNew = shared.store.new; local storeNew = shared.store.new;
local mount = shared.mount;
function new.getHolder(item) local getHolder = shared.mount.getHolder;
return (type(item) == "table") and (item._holder or item.holder or item.__holder) or item;
end
local getHolder = new.getHolder;
-- make object that from instance, class and more -- make object that from instance, class and more
function new.make(ClassName,...) -- render object function new.make(ClassName,...) -- render object
@ -55,7 +52,7 @@ function module.init(shared)
item = func(parsed); item = func(parsed);
local holder = getHolder(item); local holder = getHolder(item);
for _,v in ipairs(childs) do for _,v in ipairs(childs) do
v.Parent = holder; mount(item,v,holder);
end end
return item; return item;
end end
@ -113,7 +110,7 @@ function module.init(shared)
item[index] = value; -- set property item[index] = value; -- set property
elseif indexType == "number" then -- object elseif indexType == "number" then -- object
-- child object -- child object
((iprop == 1) and value or value:Clone()).Parent = holder; mount(item,((iprop == 1) and value or value:Clone()),holder);
end end
end end
end end
@ -182,15 +179,22 @@ function module.init(shared)
rawset(self,"__holder",object); rawset(self,"__holder",object);
if parent then if parent then
rawset(self,"__parent",parent); rawset(self,"__parent",parent);
object.Parent = getHolder(parent); mount(item,parent)
end end
-- prevent gc
((type(object) == "table" and object.__object) or object):GetPropertyChamgedSignal "ClassName":Connect(function()
return item;
end);
return self; return self;
end end
--- re-render object (if some props chaged, call this to render again) --- re-render object (if some props chaged, call this to render again)
function this:update() -- swap object function this:update() -- swap object
local object = rawget(self,"__object"); -- get last instance local object = rawget(self,"__object"); -- get last instance
local parent = rawget(self,"__parent") or (object and object.Parent); -- date parent local parent = object and object.Parent; -- date parent
if not object then
parent = rawget(self,"__parent");
end
local lastObject = object; local lastObject = object;
if lastObject then if lastObject then
lastObject.Parent = nil; lastObject.Parent = nil;
@ -199,6 +203,19 @@ function module.init(shared)
rawset(self,"__holder",object); rawset(self,"__holder",object);
rawset(self,"__object",object); rawset(self,"__object",object);
object.Parent = getHolder(parent); -- update parent object.Parent = getHolder(parent); -- update parent
-- restore childs
local child = rawget(self,"__child");
if child then
for _,v in pairs(child) do
if v then
((type(v) == table and rawget(v,"__object") or v).Parent = object;
end
end
end
-- prevnet gc
((type(object) == "table" and object.__object) or object):GetPropertyChamgedSignal "ClassName":Connect(function()
return item;
end);
if lastObject then -- remove old instance if lastObject then -- remove old instance
self:Destroy(lastObject); self:Destroy(lastObject);
end end
@ -218,6 +235,7 @@ function module.init(shared)
end end
end end
end end
self = nil;
end end
--- link to new --- link to new