Partydeck/Druid-Extension
3
0
Fork 0
mirror of https://github.com/Insality/druid synced 2025-09-28 10:32:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove const.grid_type

Browse Source
This commit is contained in:
Insality
2020-09-20 23:11:09 +03:00
parent d410192669
commit cded2b153c
2 changed files with 7 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
druid/base/static_grid.lua
View File

@@ -37,7 +37,6 @@ function M.init(self, parent, element, in_row)
self.nodes = {} self.nodes = {}
self.offset = vmath.vector3(0) self.offset = vmath.vector3(0)
self.grid_mode = const.GRID_MODE.DYNAMIC
local pivot = helper.get_pivot_offset(gui.get_pivot(self.parent)) local pivot = helper.get_pivot_offset(gui.get_pivot(self.parent))
self.anchor = vmath.vector3(0.5 + pivot.x, 0.5 - pivot.y, 0) self.anchor = vmath.vector3(0.5 + pivot.x, 0.5 - pivot.y, 0)
@@ -100,7 +99,7 @@ local function update_pos(self, is_instant)
end end
local temp_pos = vmath.vector3(0) local _temp_pos = vmath.vector3(0)
--- Return pos for grid node index --- Return pos for grid node index
-- @function grid:get_pos -- @function grid:get_pos
-- @tparam number index The grid element index -- @tparam number index The grid element index
@@ -109,11 +108,11 @@ function M.get_pos(self, index)
local row = math.ceil(index / self.in_row) - 1 local row = math.ceil(index / self.in_row) - 1
local col = (index - row * self.in_row) - 1 local col = (index - row * self.in_row) - 1
temp_pos.x = col * (self.node_size.x + self.offset.x) - self.border_offset.x _temp_pos.x = col * (self.node_size.x + self.offset.x) - self.border_offset.x
temp_pos.y = -row * (self.node_size.y + self.offset.y) - self.border_offset.y _temp_pos.y = -row * (self.node_size.y + self.offset.y) - self.border_offset.y
temp_pos.z = 0 _temp_pos.z = 0
return temp_pos return _temp_pos
end end
@@ -162,11 +161,7 @@ end
function M.add(self, item, index) function M.add(self, item, index)
index = index or (#self.nodes + 1) index = index or (#self.nodes + 1)
if self.grid_mode == const.GRID_MODE.DYNAMIC then self.nodes[index] = item
table.insert(self.nodes, index, item)
else
self.nodes[index] = item
end
gui.set_parent(item, self.parent) gui.set_parent(item, self.parent)
@@ -191,11 +186,7 @@ function M:remove(index, delete_node)
gui.delete_node(parent_node) gui.delete_node(parent_node)
end end
if self.grid_mode == const.GRID_MODE.DYNAMIC then self.nodes[index] = nil
table.remove(self.nodes, index)
else
self.nodes[index] = nil
end
-- Recalculate borders -- Recalculate borders
self.border = vmath.vector4(0) self.border = vmath.vector4(0)
@@ -267,11 +258,4 @@ function M.clear(self)
end end
function M:set_grid_mode(grid_mode)
assert(grid_mode == const.GRID_MODE.STATIC or grid_mode == const.GRID_MODE.DYNAMIC)
self.grid_mode = grid_mode
end
return M return M

6
druid/const.lua
View File

@@ -102,12 +102,6 @@ M.SWIPE = {
} }
M.GRID_MODE = {
STATIC = "static",
DYNAMIC = "dynamic",
}
M.EMPTY_FUNCTION = function() end M.EMPTY_FUNCTION = function() end
M.EMPTY_STRING = "" M.EMPTY_STRING = ""
M.SPACE_STRING = " " M.SPACE_STRING = " "