Partydeck/Druid-Extension
3
0
Fork 0
mirror of https://github.com/Insality/druid synced 2025-09-27 18:12:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/77-grid-update

Browse Source 
# Conflicts:
#	docs_md/changelog.md
#	druid/component.lua
This commit is contained in:
Insality
2020-09-23 23:15:37 +03:00
parent 28087da814 b5779f5984
commit 4e476d7e67
3 changed files with 130 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
druid/system/druid_instance.lua
View File

@@ -80,7 +80,7 @@ local function create(self, instance_class)
table.insert(self.components[const.ALL], instance)
local register_to = instance:get_interests()
local register_to = instance:__get_interests()
for i = 1, #register_to do
local interest = register_to[i]
table.insert(self.components[interest], instance)
@@ -102,7 +102,8 @@ local function process_input(action_id, action, components, is_input_consumed)
for i = #components, 1, -1 do
local component = components[i]
-- Process increased input priority first
if component._meta.increased_input_priority then
local meta = component._meta
if meta.input_enabled and meta.increased_input_priority then
if not is_input_consumed then
is_input_consumed = component:on_input(action_id, action)
else
@@ -115,7 +116,9 @@ local function process_input(action_id, action, components, is_input_consumed)
for i = #components, 1, -1 do
local component = components[i]
if not component._meta.increased_input_priority then
-- Process usual input priority next
local meta = component._meta
if meta.input_enabled and not meta.increased_input_priority then
if not is_input_consumed then
is_input_consumed = component:on_input(action_id, action)
else
@@ -192,16 +195,18 @@ function Druid.remove(self, component)
return
end
local all_components = self.components[const.ALL]
-- Recursive remove all children of component
for i = #all_components, 1, -1 do
local inst = all_components[i]
if inst:is_child_of(component) then
self:remove(inst)
local children = component._meta.children
for i = 1, #children do
self:remove(children[i])
local parent = children[i]:get_parent_component()
if parent then
parent:__remove_children(children[i])
end
end
component._meta.children = {}
local all_components = self.components[const.ALL]
for i = #all_components, 1, -1 do
if all_components[i] == component then
if component.on_remove then
@@ -211,7 +216,7 @@ function Druid.remove(self, component)
end
end
local interests = component:get_interests()
local interests = component:__get_interests()
for i = 1, #interests do
local interest = interests[i]
local components = self.components[interest]