Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 16 additions & 6 deletions Basalt/main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,18 @@ local getVariable = function(name)
return variables[name]
end

local getObjects = function()
return moddedObjects
end

local getObject = function(id)
return getObjects()[id]
end

local createObject = function(objectName, id, basalt)
return getObject(objectName)(id, basalt)
end

local bInstance = {
getDynamicValueEventSetting = function()
return basalt.dynamicValueEvents
Expand Down Expand Up @@ -127,14 +139,12 @@ local bInstance = {
stop = stop,
debug = basalt.debug,
log = basalt.log,

getObjects = getObjects,

getObjects = function()
return moddedObjects
end,
getObject = getObject,

getObject = function(id)
return moddedObjects[id]
end,
createObject = createObject,

getDirectory = function()
return projectDirectory
Expand Down
6 changes: 3 additions & 3 deletions Basalt/objects/Container.lua
Original file line number Diff line number Diff line change
Expand Up @@ -384,9 +384,9 @@ return function(name, basalt)
end
end

for k,v in pairs(basalt.getObjects())do
container["add"..k] = function(self, name)
return addObject(self, v(name, basalt))
for objectName, _ in pairs(basalt.getObjects()) do
container["add" .. objectName] = function(self, id)
return addObject(self, basalt.createObject(objectName, id, basalt))
end
end

Expand Down
6 changes: 3 additions & 3 deletions Basalt/objects/Flexbox.lua
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ return function(name, basalt)
end,
}

for k,v in pairs(basalt.getObjects())do
object["add"..k] = function(self, name)
local obj = base["add"..k](self, name)
for objectName, _ in pairs(basalt.getObjects()) do
object["add" .. objectName] = function(self, id)
local obj = base["add" .. objectName](self, id)
applyLayout(base)
return obj
end
Expand Down