diff --git a/example/game.appmanifest b/example/game.appmanifest index 93bc543..c16be5a 100644 --- a/example/game.appmanifest +++ b/example/game.appmanifest @@ -3,9 +3,8 @@ platforms: x86_64-osx: context: - excludeLibs: ["physics","LinearMath","BulletDynamics","BulletCollision","Box2D","record","vpx","profilerext"] - excludeSymbols: ["ProfilerExt"] - libs: ["physics_null","record_null","profilerext_null"] + excludeLibs: ["physics","LinearMath","BulletDynamics","BulletCollision","Box2D","record","vpx"] + libs: ["physics_null","record_null"] linkFlags: [] x86_64-linux: diff --git a/example/gui/main/main.gui b/example/gui/main/main.gui index 04e4f78..748cfc9 100644 --- a/example/gui/main/main.gui +++ b/example/gui/main/main.gui @@ -3149,7 +3149,7 @@ nodes { type: TYPE_BOX blend_mode: BLEND_MODE_ALPHA texture: "kenney/empty" - id: "text_page" + id: "texts_page" xanchor: XANCHOR_NONE yanchor: YANCHOR_NONE pivot: PIVOT_CENTER @@ -3223,7 +3223,7 @@ nodes { } adjust_mode: ADJUST_MODE_FIT line_break: false - parent: "text_page" + parent: "texts_page" layer: "text" inherit_alpha: true alpha: 1.0 @@ -3286,7 +3286,7 @@ nodes { } adjust_mode: ADJUST_MODE_FIT line_break: false - parent: "text_page" + parent: "texts_page" layer: "text" inherit_alpha: true alpha: 1.0 @@ -3349,7 +3349,7 @@ nodes { } adjust_mode: ADJUST_MODE_FIT line_break: false - parent: "text_page" + parent: "texts_page" layer: "text" inherit_alpha: true alpha: 1.0 @@ -3412,7 +3412,7 @@ nodes { } adjust_mode: ADJUST_MODE_FIT line_break: false - parent: "text_page" + parent: "texts_page" layer: "text" inherit_alpha: true alpha: 1.0 @@ -3475,7 +3475,7 @@ nodes { } adjust_mode: ADJUST_MODE_FIT line_break: false - parent: "text_page" + parent: "texts_page" layer: "text" inherit_alpha: true alpha: 1.0 @@ -3538,7 +3538,7 @@ nodes { } adjust_mode: ADJUST_MODE_FIT line_break: false - parent: "text_page" + parent: "texts_page" layer: "text" inherit_alpha: true alpha: 1.0 @@ -3601,7 +3601,7 @@ nodes { } adjust_mode: ADJUST_MODE_FIT line_break: false - parent: "text_page" + parent: "texts_page" layer: "text" inherit_alpha: true alpha: 1.0 @@ -3664,7 +3664,7 @@ nodes { } adjust_mode: ADJUST_MODE_FIT line_break: false - parent: "text_page" + parent: "texts_page" layer: "text" inherit_alpha: true alpha: 1.0 @@ -3727,7 +3727,7 @@ nodes { } adjust_mode: ADJUST_MODE_FIT line_break: true - parent: "text_page" + parent: "texts_page" layer: "text" inherit_alpha: true alpha: 1.0 @@ -3776,7 +3776,7 @@ nodes { yanchor: YANCHOR_NONE pivot: PIVOT_CENTER adjust_mode: ADJUST_MODE_FIT - parent: "text_page" + parent: "texts_page" layer: "image" inherit_alpha: true slice9 { @@ -3845,7 +3845,7 @@ nodes { } adjust_mode: ADJUST_MODE_FIT line_break: false - parent: "text_page" + parent: "texts_page" layer: "text" inherit_alpha: true alpha: 1.0 @@ -3908,7 +3908,7 @@ nodes { } adjust_mode: ADJUST_MODE_FIT line_break: false - parent: "text_page" + parent: "texts_page" layer: "text" inherit_alpha: true alpha: 1.0 @@ -3971,7 +3971,7 @@ nodes { } adjust_mode: ADJUST_MODE_FIT line_break: false - parent: "text_page" + parent: "texts_page" layer: "text" inherit_alpha: true alpha: 1.0 @@ -4034,7 +4034,7 @@ nodes { } adjust_mode: ADJUST_MODE_FIT line_break: false - parent: "text_page" + parent: "texts_page" layer: "text" inherit_alpha: true alpha: 1.0 @@ -4083,7 +4083,7 @@ nodes { yanchor: YANCHOR_NONE pivot: PIVOT_CENTER adjust_mode: ADJUST_MODE_FIT - parent: "text_page" + parent: "texts_page" layer: "image" inherit_alpha: true slice9 { @@ -4152,7 +4152,7 @@ nodes { } adjust_mode: ADJUST_MODE_FIT line_break: true - parent: "text_page" + parent: "texts_page" layer: "text" inherit_alpha: true alpha: 1.0 @@ -10280,7 +10280,7 @@ nodes { pivot: PIVOT_CENTER adjust_mode: ADJUST_MODE_FIT parent: "info_grid_static" - layer: "" + layer: "image" inherit_alpha: true slice9 { x: 0.0 @@ -10335,7 +10335,7 @@ nodes { pivot: PIVOT_CENTER adjust_mode: ADJUST_MODE_FIT parent: "grid_nodes_prefab" - layer: "" + layer: "image" inherit_alpha: true slice9 { x: 0.0 @@ -10404,7 +10404,7 @@ nodes { adjust_mode: ADJUST_MODE_FIT line_break: false parent: "grid_nodes_dot" - layer: "" + layer: "text" inherit_alpha: true alpha: 1.0 outline_alpha: 0.0 @@ -10683,7 +10683,7 @@ nodes { pivot: PIVOT_CENTER adjust_mode: ADJUST_MODE_FIT parent: "info_grid_dynamic" - layer: "" + layer: "image" inherit_alpha: true slice9 { x: 20.0 @@ -12161,7 +12161,7 @@ nodes { pivot: PIVOT_CENTER adjust_mode: ADJUST_MODE_FIT parent: "infinity_page_content" - layer: "" + layer: "image" inherit_alpha: true slice9 { x: 20.0 @@ -12230,7 +12230,7 @@ nodes { adjust_mode: ADJUST_MODE_FIT line_break: false parent: "infinity_prefab_small" - layer: "" + layer: "text" inherit_alpha: true alpha: 1.0 outline_alpha: 1.0 @@ -12499,7 +12499,7 @@ nodes { pivot: PIVOT_CENTER adjust_mode: ADJUST_MODE_FIT parent: "infinity_page_content" - layer: "" + layer: "image" inherit_alpha: true slice9 { x: 20.0 @@ -12568,7 +12568,7 @@ nodes { adjust_mode: ADJUST_MODE_FIT line_break: false parent: "infinity_prefab" - layer: "" + layer: "text" inherit_alpha: true alpha: 1.0 outline_alpha: 1.0 @@ -12617,7 +12617,7 @@ nodes { pivot: PIVOT_CENTER adjust_mode: ADJUST_MODE_FIT parent: "infinity_page_content" - layer: "" + layer: "image" inherit_alpha: true slice9 { x: 20.0 @@ -12686,7 +12686,7 @@ nodes { adjust_mode: ADJUST_MODE_FIT line_break: false parent: "infinity_prefab_dynamic" - layer: "" + layer: "text" inherit_alpha: true alpha: 1.0 outline_alpha: 1.0 diff --git a/example/gui/main/main.gui_script b/example/gui/main/main.gui_script index 4f07c8d..7a4d589 100644 --- a/example/gui/main/main.gui_script +++ b/example/gui/main/main.gui_script @@ -31,6 +31,10 @@ local function on_control_button(self, delta) self.header:translate(pages[self.page]) local node = gui.get_node("C_Anchor") + + for i = 1, #pages do + gui.set_enabled(gui.get_node(pages[i]), i == self.page) + end gui.animate(node, "position.x", (self.page-1) * -600, gui.EASING_OUTSINE, 0.2) end diff --git a/example/page/infinity_page.lua b/example/page/infinity_page.lua index bae7279..085d2f9 100644 --- a/example/page/infinity_page.lua +++ b/example/page/infinity_page.lua @@ -22,6 +22,7 @@ local function create_infinity_instance_small(self, record, index) local button = self.druid:new_button(instance["infinity_prefab_small"], function() print("Infinity click on", index) end) + button:set_click_zone(self.infinity_scroll_3.view_node) return instance["infinity_prefab_small"], button end @@ -36,6 +37,7 @@ local function create_infinity_instance_dynamic(self, record, index) local button = self.druid:new_button(instance["infinity_prefab_dynamic"], function() print("Dynamic click on", index) end) + button:set_click_zone(self.infinity_scroll_dynamic.view_node) return instance["infinity_prefab_dynamic"], button end @@ -50,6 +52,7 @@ local function create_infinity_instance_dynamic_hor(self, record, index) local button = self.druid:new_button(instance["infinity_prefab_dynamic"], function() print("Dynamic click on", index) end) + button:set_click_zone(self.infinity_scroll_dynamic_hor.view_node) return instance["infinity_prefab_dynamic"], button end @@ -63,12 +66,16 @@ local function setup_infinity_list(self) self.infinity_list = self.druid:new_infinity_list(data, self.infinity_scroll, self.infinity_grid, function(record, index) -- function should return gui_node, [druid_component] - return create_infinity_instance(self, record, index) + local root, button = create_infinity_instance(self, record, index) + button:set_click_zone(self.infinity_scroll.view_node) + return root, button end) self.infinity_list_hor = self.druid:new_infinity_list(data, self.infinity_scroll_hor, self.infinity_grid_hor, function(record, index) -- function should return gui_node, [druid_component] - return create_infinity_instance(self, record, index) + local root, button = create_infinity_instance(self, record, index) + button:set_click_zone(self.infinity_scroll_hor.view_node) + return root, button end) -- scroll to some index @@ -126,7 +133,6 @@ function M.setup_page(self) :set_vertical_scroll(false) self.infinity_grid_dynamic_hor = self.druid:new_dynamic_grid("infinity_scroll_content_dynamic_hor") - setup_infinity_list(self) end