mirror of
https://github.com/Insality/druid.git
synced 2025-06-27 10:27:47 +02:00
Move _fct_metatable to separate file druid_instance
This commit is contained in:
Insality
parent
9223862dc2
commit
513a4c141b
@ -55,5 +55,6 @@ M.SPECIFIC_UI_MESSAGES = {
|
||||
}
|
||||
|
||||
M.EMPTY_FUNCTION = function() end
|
||||
M.EMPTY_STRING = ""
|
||||
|
||||
return M
|
||||
171
druid/druid.lua
171
druid/druid.lua
@ -6,14 +6,13 @@
|
||||
|
||||
|
||||
local const = require("druid.const")
|
||||
local druid_input = require("druid.helper.druid_input")
|
||||
local druid_instance = require("druid.system.druid_instance")
|
||||
local settings = require("druid.settings")
|
||||
|
||||
local M = {}
|
||||
|
||||
|
||||
local log = settings.log
|
||||
local _fct_metatable = {}
|
||||
-- Temporary, what the place for it?
|
||||
local default_style = {}
|
||||
|
||||
@ -40,7 +39,7 @@ M.comps = {
|
||||
|
||||
local function register_basic_components()
|
||||
for k, v in pairs(M.comps) do
|
||||
if not _fct_metatable["new_" .. k] then
|
||||
if not druid_instance["new_" .. k] then
|
||||
M.register(k, v)
|
||||
else
|
||||
log("Basic component", k, "already registered")
|
||||
@ -56,8 +55,8 @@ function M.register(name, module)
|
||||
-- TODO: Find better solution to creating elements?
|
||||
-- Possibly: druid.new(druid.BUTTON, etc?)
|
||||
-- Current way is very implicit
|
||||
_fct_metatable["new_" .. name] = function(self, ...)
|
||||
return _fct_metatable.new(self, module, ...)
|
||||
druid_instance["new_" .. name] = function(self, ...)
|
||||
return druid_instance.new(self, module, ...)
|
||||
end
|
||||
log("Register component", name)
|
||||
end
|
||||
@ -70,7 +69,7 @@ function M.new(component_script, style)
|
||||
register_basic_components()
|
||||
register_basic_components = false
|
||||
end
|
||||
local self = setmetatable({}, { __index = _fct_metatable })
|
||||
local self = setmetatable({}, { __index = druid_instance })
|
||||
-- Druid context here (who created druid)
|
||||
-- Usually gui_script, but can be component from helper.get_druid(component)
|
||||
self._context = component_script
|
||||
@ -94,164 +93,4 @@ function M.set_sound_function(callback)
|
||||
end
|
||||
|
||||
|
||||
local function input_init(self)
|
||||
if not self.input_inited then
|
||||
self.input_inited = true
|
||||
druid_input.focus()
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
-- Create the component
|
||||
local function create(self, module)
|
||||
local instance = setmetatable({}, { __index = module })
|
||||
-- Component context, self from component creation
|
||||
instance.context = self._context
|
||||
instance.druid_style = self._style
|
||||
table.insert(self, instance)
|
||||
|
||||
local register_to = module.interest
|
||||
if register_to then
|
||||
local v
|
||||
for i = 1, #register_to do
|
||||
v = register_to[i]
|
||||
if not self[v] then
|
||||
self[v] = {}
|
||||
end
|
||||
table.insert(self[v], instance)
|
||||
|
||||
if const.UI_INPUT[v] then
|
||||
input_init(self)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return instance
|
||||
end
|
||||
|
||||
|
||||
function _fct_metatable.remove(self, instance)
|
||||
for i = #self, 1, -1 do
|
||||
if self[i] == instance then
|
||||
table.remove(self, i)
|
||||
end
|
||||
end
|
||||
local interest = instance.interest
|
||||
if interest then
|
||||
local v
|
||||
for i = 1, #interest do
|
||||
v = interest[i]
|
||||
local array = self[v]
|
||||
for j = #array, 1, -1 do
|
||||
if array[j] == instance then
|
||||
table.remove(array, j)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
function _fct_metatable.new(self, module, ...)
|
||||
local instance = create(self, module)
|
||||
|
||||
if instance.init then
|
||||
instance:init(...)
|
||||
end
|
||||
|
||||
return instance
|
||||
end
|
||||
|
||||
|
||||
--- Called on_message
|
||||
function _fct_metatable.on_message(self, message_id, message, sender)
|
||||
local specific_ui_message = const.SPECIFIC_UI_MESSAGES[message_id]
|
||||
if specific_ui_message then
|
||||
local array = self[message_id]
|
||||
if array then
|
||||
local item
|
||||
for i = 1, #array do
|
||||
item = array[i]
|
||||
item[specific_ui_message](item, message, sender)
|
||||
end
|
||||
end
|
||||
else
|
||||
local array = self[const.ON_MESSAGE]
|
||||
if array then
|
||||
for i = 1, #array do
|
||||
array[i]:on_message(message_id, message, sender)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
local function notify_input_on_swipe(self)
|
||||
if self[const.ON_INPUT] then
|
||||
local len = #self[const.ON_INPUT]
|
||||
for i = len, 1, -1 do
|
||||
local comp = self[const.ON_INPUT][i]
|
||||
if comp.on_swipe then
|
||||
comp:on_swipe()
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
local function match_event(action_id, events)
|
||||
if type(events) == "table" then
|
||||
for i = 1, #events do
|
||||
if action_id == events[i] then
|
||||
return true
|
||||
end
|
||||
end
|
||||
else
|
||||
return action_id == events
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
--- Called ON_INPUT
|
||||
function _fct_metatable.on_input(self, action_id, action)
|
||||
local array = self[const.ON_SWIPE]
|
||||
if array then
|
||||
local v, result
|
||||
local len = #array
|
||||
for i = len, 1, -1 do
|
||||
v = array[i]
|
||||
result = result or v:on_input(action_id, action)
|
||||
end
|
||||
if result then
|
||||
notify_input_on_swipe(self)
|
||||
return true
|
||||
end
|
||||
end
|
||||
array = self[const.ON_INPUT]
|
||||
if array then
|
||||
local v
|
||||
local len = #array
|
||||
for i = len, 1, -1 do
|
||||
v = array[i]
|
||||
if match_event(action_id, v.event) and v:on_input(action_id, action) then
|
||||
return true
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
|
||||
--- Called on_update
|
||||
function _fct_metatable.update(self, dt)
|
||||
local array = self[const.ON_UPDATE]
|
||||
if array then
|
||||
for i = 1, #array do
|
||||
array[i]:update(dt)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
return M
|
||||
|
||||
169
druid/system/druid_instance.lua
Normal file
169
druid/system/druid_instance.lua
Normal file
@ -0,0 +1,169 @@
|
||||
local const = require("druid.const")
|
||||
local druid_input = require("druid.helper.druid_input")
|
||||
|
||||
local M = {}
|
||||
|
||||
|
||||
local function input_init(self)
|
||||
if not self.input_inited then
|
||||
self.input_inited = true
|
||||
druid_input.focus()
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
-- Create the component
|
||||
local function create(self, module)
|
||||
local instance = setmetatable({}, { __index = module })
|
||||
-- Component context, self from component creation
|
||||
instance.context = self._context
|
||||
instance.druid_style = self._style
|
||||
table.insert(self, instance)
|
||||
|
||||
local register_to = module.interest
|
||||
if register_to then
|
||||
local v
|
||||
for i = 1, #register_to do
|
||||
v = register_to[i]
|
||||
if not self[v] then
|
||||
self[v] = {}
|
||||
end
|
||||
table.insert(self[v], instance)
|
||||
|
||||
if const.UI_INPUT[v] then
|
||||
input_init(self)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return instance
|
||||
end
|
||||
|
||||
|
||||
function M.new(self, module, ...)
|
||||
local instance = create(self, module)
|
||||
|
||||
if instance.init then
|
||||
instance:init(...)
|
||||
end
|
||||
|
||||
return instance
|
||||
end
|
||||
|
||||
|
||||
function M.remove(self, instance)
|
||||
for i = #self, 1, -1 do
|
||||
if self[i] == instance then
|
||||
table.remove(self, i)
|
||||
end
|
||||
end
|
||||
|
||||
local interest = instance.interest
|
||||
if interest then
|
||||
local v
|
||||
for i = 1, #interest do
|
||||
v = interest[i]
|
||||
local array = self[v]
|
||||
for j = #array, 1, -1 do
|
||||
if array[j] == instance then
|
||||
table.remove(array, j)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
--- Called on_message
|
||||
function M.on_message(self, message_id, message, sender)
|
||||
local specific_ui_message = const.SPECIFIC_UI_MESSAGES[message_id]
|
||||
if specific_ui_message then
|
||||
local array = self[message_id]
|
||||
if array then
|
||||
local item
|
||||
for i = 1, #array do
|
||||
item = array[i]
|
||||
item[specific_ui_message](item, message, sender)
|
||||
end
|
||||
end
|
||||
else
|
||||
local array = self[const.ON_MESSAGE]
|
||||
if array then
|
||||
for i = 1, #array do
|
||||
array[i]:on_message(message_id, message, sender)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
local function notify_input_on_swipe(self)
|
||||
if self[const.ON_INPUT] then
|
||||
local len = #self[const.ON_INPUT]
|
||||
for i = len, 1, -1 do
|
||||
local comp = self[const.ON_INPUT][i]
|
||||
if comp.on_swipe then
|
||||
comp:on_swipe()
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
local function match_event(action_id, events)
|
||||
if type(events) == "table" then
|
||||
for i = 1, #events do
|
||||
if action_id == events[i] then
|
||||
return true
|
||||
end
|
||||
end
|
||||
else
|
||||
return action_id == events
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
--- Called ON_INPUT
|
||||
function M.on_input(self, action_id, action)
|
||||
local array = self[const.ON_SWIPE]
|
||||
if array then
|
||||
local v, result
|
||||
local len = #array
|
||||
for i = len, 1, -1 do
|
||||
v = array[i]
|
||||
result = result or v:on_input(action_id, action)
|
||||
end
|
||||
if result then
|
||||
notify_input_on_swipe(self)
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
||||
array = self[const.ON_INPUT]
|
||||
if array then
|
||||
local v
|
||||
local len = #array
|
||||
for i = len, 1, -1 do
|
||||
v = array[i]
|
||||
if match_event(action_id, v.event) and v:on_input(action_id, action) then
|
||||
return true
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
|
||||
--- Called on_update
|
||||
function M.update(self, dt)
|
||||
local array = self[const.ON_UPDATE]
|
||||
if array then
|
||||
for i = 1, #array do
|
||||
array[i]:update(dt)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
return M
|
||||
Loading…
x
Reference in New Issue
Block a user