diff --git a/example/components/druid_logo/druid_logo.gui b/example/components/druid_logo/druid_logo.gui index 2347db1..7680ab4 100644 --- a/example/components/druid_logo/druid_logo.gui +++ b/example/components/druid_logo/druid_logo.gui @@ -21,7 +21,7 @@ nodes { z: 0.157 } type: TYPE_BOX - texture: "druid/pixel" + texture: "druid_example/pixel" id: "root" layer: "druid" inherit_alpha: true diff --git a/example/components/examples_list_view/examples_list_view.gui b/example/components/examples_list_view/examples_list_view.gui index 21f5dc5..cadc473 100644 --- a/example/components/examples_list_view/examples_list_view.gui +++ b/example/components/examples_list_view/examples_list_view.gui @@ -17,7 +17,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/pixel" + texture: "druid_example/pixel" id: "root" adjust_mode: ADJUST_MODE_STRETCH layer: "druid" @@ -72,7 +72,7 @@ nodes { y: 850.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "scroll_view" pivot: PIVOT_NW adjust_mode: ADJUST_MODE_STRETCH @@ -87,7 +87,7 @@ nodes { y: 850.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "scroll_content" pivot: PIVOT_NW adjust_mode: ADJUST_MODE_STRETCH @@ -106,36 +106,6 @@ nodes { inherit_alpha: true template: "/example/components/examples_list_view/examples_list_view_item.gui" } -nodes { - type: TYPE_BOX - id: "examples_list_view_item/root" - parent: "examples_list_view_item" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "examples_list_view_item/panel_highlight" - parent: "examples_list_view_item/root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "examples_list_view_item/panel_selected" - parent: "examples_list_view_item/root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "examples_list_view_item/icon" - parent: "examples_list_view_item/root" - template_node_child: true -} -nodes { - type: TYPE_TEXT - id: "examples_list_view_item/text" - parent: "examples_list_view_item/root" - template_node_child: true -} layers { name: "druid" } diff --git a/example/components/examples_list_view/examples_list_view.lua b/example/components/examples_list_view/examples_list_view.lua index 9d06af6..7ceacb0 100644 --- a/example/components/examples_list_view/examples_list_view.lua +++ b/example/components/examples_list_view/examples_list_view.lua @@ -90,7 +90,13 @@ function M:add_example(examples, druid_example) local root = gui.get_node(example_data.root) gui.set_enabled(root, true) - local instance = druid_example.druid:new(example_data.component_class, example_data.template) + + local instance + if example_data.widget_class then + instance = druid_example.druid:new_widget(example_data.widget_class, example_data.template) + else + instance = druid_example.druid:new(example_data.component_class, example_data.template) + end self.selected_example = { data = example_data, diff --git a/example/components/examples_list_view/examples_list_view_item.gui b/example/components/examples_list_view/examples_list_view_item.gui index f9ad962..b562ad0 100644 --- a/example/components/examples_list_view/examples_list_view_item.gui +++ b/example/components/examples_list_view/examples_list_view_item.gui @@ -17,7 +17,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "root" pivot: PIVOT_W adjust_mode: ADJUST_MODE_STRETCH @@ -36,7 +36,7 @@ nodes { z: 0.322 } type: TYPE_BOX - texture: "druid/pixel" + texture: "druid_example/pixel" id: "panel_highlight" pivot: PIVOT_W parent: "root" @@ -55,7 +55,7 @@ nodes { z: 0.333 } type: TYPE_BOX - texture: "druid/pixel" + texture: "druid_example/pixel" id: "panel_selected" pivot: PIVOT_W parent: "root" @@ -77,7 +77,7 @@ nodes { z: 0.851 } type: TYPE_BOX - texture: "druid/icon_arrow" + texture: "druid_example/icon_arrow" id: "icon" parent: "root" layer: "druid" diff --git a/example/components/output_list/output_list.gui b/example/components/output_list/output_list.gui index 45b6a06..19456e3 100644 --- a/example/components/output_list/output_list.gui +++ b/example/components/output_list/output_list.gui @@ -21,7 +21,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/pixel" + texture: "druid_example/pixel" id: "root" adjust_mode: ADJUST_MODE_STRETCH layer: "druid" @@ -76,7 +76,7 @@ nodes { y: 190.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "scroll_view" pivot: PIVOT_NW adjust_mode: ADJUST_MODE_STRETCH @@ -91,7 +91,7 @@ nodes { y: 190.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "scroll_content" pivot: PIVOT_NW adjust_mode: ADJUST_MODE_STRETCH @@ -150,7 +150,7 @@ nodes { z: 0.157 } type: TYPE_BOX - texture: "druid/pixel" + texture: "druid_example/pixel" id: "separator" pivot: PIVOT_N parent: "root" diff --git a/example/components/panel_druid_profiler/panel_druid_profiler.gui b/example/components/panel_druid_profiler/panel_druid_profiler.gui index 2470901..80e85df 100644 --- a/example/components/panel_druid_profiler/panel_druid_profiler.gui +++ b/example/components/panel_druid_profiler/panel_druid_profiler.gui @@ -156,7 +156,7 @@ nodes { y: 50.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "group_fps" parent: "root" inherit_alpha: true @@ -286,7 +286,7 @@ nodes { y: 50.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "group_components" parent: "root" inherit_alpha: true diff --git a/example/components/panel_information/panel_information.gui b/example/components/panel_information/panel_information.gui index 6e9a8e1..0c01d7f 100644 --- a/example/components/panel_information/panel_information.gui +++ b/example/components/panel_information/panel_information.gui @@ -21,7 +21,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/pixel" + texture: "druid_example/pixel" id: "root" adjust_mode: ADJUST_MODE_STRETCH layer: "druid" @@ -91,30 +91,6 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_blue.gui" } -nodes { - size { - x: 240.0 - y: 80.0 - } - type: TYPE_BOX - id: "button_view_code/root" - parent: "button_view_code" - overridden_fields: 4 - template_node_child: true -} -nodes { - scale { - x: 0.75 - y: 0.75 - } - type: TYPE_TEXT - text: "View code" - id: "button_view_code/text" - parent: "button_view_code/root" - overridden_fields: 3 - overridden_fields: 8 - template_node_child: true -} nodes { position { x: 220.0 @@ -142,44 +118,6 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_yellow.gui" } -nodes { - size { - x: 130.0 - y: 35.0 - } - type: TYPE_BOX - texture: "druid/ui_circle_8" - id: "button_profiler/root" - parent: "button_profiler" - slice9 { - x: 4.0 - y: 4.0 - z: 4.0 - w: 4.0 - } - overridden_fields: 4 - overridden_fields: 9 - overridden_fields: 22 - template_node_child: true -} -nodes { - scale { - x: 0.6 - y: 0.6 - } - size { - x: 190.0 - y: 50.0 - } - type: TYPE_TEXT - text: "Profiler" - id: "button_profiler/text" - parent: "button_profiler/root" - overridden_fields: 3 - overridden_fields: 4 - overridden_fields: 8 - template_node_child: true -} nodes { position { x: -200.0 @@ -190,7 +128,7 @@ nodes { y: 250.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "scroll_view" pivot: PIVOT_NW parent: "root" @@ -203,7 +141,7 @@ nodes { y: 250.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "scroll_content" pivot: PIVOT_NW parent: "scroll_view" diff --git a/example/components/properties_panel/properties/property_button.gui b/example/components/properties_panel/properties/property_button.gui index 09831f0..061bd7a 100644 --- a/example/components/properties_panel/properties/property_button.gui +++ b/example/components/properties_panel/properties/property_button.gui @@ -12,7 +12,7 @@ nodes { y: 40.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "root" pivot: PIVOT_NW adjust_mode: ADJUST_MODE_STRETCH @@ -71,7 +71,7 @@ nodes { z: 0.49 } type: TYPE_BOX - texture: "druid/rect_round2_width1" + texture: "druid_example/rect_round2_width1" id: "button" parent: "root" inherit_alpha: true @@ -96,7 +96,7 @@ nodes { z: 0.333 } type: TYPE_BOX - texture: "druid/pixel" + texture: "druid_example/pixel" id: "selected" pivot: PIVOT_S adjust_mode: ADJUST_MODE_STRETCH diff --git a/example/components/properties_panel/properties/property_checkbox.gui b/example/components/properties_panel/properties/property_checkbox.gui index 0a4f7ef..bcab99a 100644 --- a/example/components/properties_panel/properties/property_checkbox.gui +++ b/example/components/properties_panel/properties/property_checkbox.gui @@ -12,7 +12,7 @@ nodes { y: 40.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "root" pivot: PIVOT_NW adjust_mode: ADJUST_MODE_STRETCH @@ -71,7 +71,7 @@ nodes { z: 0.49 } type: TYPE_BOX - texture: "druid/rect_round2_width1" + texture: "druid_example/rect_round2_width1" id: "button" parent: "root" inherit_alpha: true @@ -89,7 +89,7 @@ nodes { z: 0.761 } type: TYPE_BOX - texture: "druid/icon_check" + texture: "druid_example/icon_check" id: "icon" parent: "button" inherit_alpha: true @@ -109,7 +109,7 @@ nodes { z: 0.333 } type: TYPE_BOX - texture: "druid/pixel" + texture: "druid_example/pixel" id: "selected" pivot: PIVOT_S adjust_mode: ADJUST_MODE_STRETCH diff --git a/example/components/properties_panel/properties/property_slider.gui b/example/components/properties_panel/properties/property_slider.gui index ee3b114..f4579ae 100644 --- a/example/components/properties_panel/properties/property_slider.gui +++ b/example/components/properties_panel/properties/property_slider.gui @@ -12,7 +12,7 @@ nodes { y: 40.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "root" pivot: PIVOT_NW adjust_mode: ADJUST_MODE_STRETCH @@ -62,7 +62,7 @@ nodes { y: -20.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "E_Anchor" pivot: PIVOT_E adjust_mode: ADJUST_MODE_STRETCH @@ -85,7 +85,7 @@ nodes { z: 0.49 } type: TYPE_BOX - texture: "druid/rect_round2_width1" + texture: "druid_example/rect_round2_width1" id: "button" pivot: PIVOT_E parent: "E_Anchor" @@ -111,7 +111,7 @@ nodes { z: 0.333 } type: TYPE_BOX - texture: "druid/pixel" + texture: "druid_example/pixel" id: "selected" pivot: PIVOT_SE adjust_mode: ADJUST_MODE_STRETCH @@ -169,7 +169,7 @@ nodes { z: 0.157 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "slider" parent: "root" inherit_alpha: true @@ -185,7 +185,7 @@ nodes { z: 0.157 } type: TYPE_BOX - texture: "druid/ui_circle_8" + texture: "druid_example/ui_circle_8" id: "slider_back" parent: "slider" inherit_alpha: true @@ -210,7 +210,7 @@ nodes { z: 0.761 } type: TYPE_BOX - texture: "druid/ui_circle_8" + texture: "druid_example/ui_circle_8" id: "slider_pin" parent: "slider" inherit_alpha: true diff --git a/example/components/properties_panel/properties_panel.gui b/example/components/properties_panel/properties_panel.gui index b7833d5..5e59d95 100644 --- a/example/components/properties_panel/properties_panel.gui +++ b/example/components/properties_panel/properties_panel.gui @@ -17,7 +17,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/pixel" + texture: "druid_example/pixel" id: "root" adjust_mode: ADJUST_MODE_STRETCH layer: "druid" @@ -72,7 +72,7 @@ nodes { y: 290.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "scroll_view" xanchor: XANCHOR_LEFT pivot: PIVOT_NW @@ -88,7 +88,7 @@ nodes { y: 290.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "scroll_content" pivot: PIVOT_NW adjust_mode: ADJUST_MODE_STRETCH @@ -126,7 +126,7 @@ nodes { z: 0.157 } type: TYPE_BOX - texture: "druid/pixel" + texture: "druid_example/pixel" id: "separator" pivot: PIVOT_N parent: "root" @@ -139,7 +139,7 @@ nodes { y: 100.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "propeties" parent: "root" inherit_alpha: true @@ -153,60 +153,6 @@ nodes { inherit_alpha: true template: "/example/components/properties_panel/properties/property_slider.gui" } -nodes { - type: TYPE_BOX - id: "property_slider/root" - parent: "property_slider" - template_node_child: true -} -nodes { - type: TYPE_TEXT - id: "property_slider/text_name" - parent: "property_slider/root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "property_slider/E_Anchor" - parent: "property_slider/root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "property_slider/button" - parent: "property_slider/E_Anchor" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "property_slider/selected" - parent: "property_slider/button" - template_node_child: true -} -nodes { - type: TYPE_TEXT - id: "property_slider/text_value" - parent: "property_slider/button" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "property_slider/slider" - parent: "property_slider/root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "property_slider/slider_back" - parent: "property_slider/slider" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "property_slider/slider_pin" - parent: "property_slider/slider" - template_node_child: true -} nodes { position { y: -50.0 @@ -217,36 +163,6 @@ nodes { inherit_alpha: true template: "/example/components/properties_panel/properties/property_checkbox.gui" } -nodes { - type: TYPE_BOX - id: "property_checkbox/root" - parent: "property_checkbox" - template_node_child: true -} -nodes { - type: TYPE_TEXT - id: "property_checkbox/text_name" - parent: "property_checkbox/root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "property_checkbox/button" - parent: "property_checkbox/root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "property_checkbox/icon" - parent: "property_checkbox/button" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "property_checkbox/selected" - parent: "property_checkbox/button" - template_node_child: true -} nodes { position { y: -100.0 @@ -257,36 +173,6 @@ nodes { inherit_alpha: true template: "/example/components/properties_panel/properties/property_button.gui" } -nodes { - type: TYPE_BOX - id: "property_button/root" - parent: "property_button" - template_node_child: true -} -nodes { - type: TYPE_TEXT - id: "property_button/text_name" - parent: "property_button/root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "property_button/button" - parent: "property_button/root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "property_button/selected" - parent: "property_button/button" - template_node_child: true -} -nodes { - type: TYPE_TEXT - id: "property_button/text_button" - parent: "property_button/button" - template_node_child: true -} nodes { position { x: -200.0 diff --git a/example/druid.gui b/example/druid.gui index 804ad47..0133cfd 100644 --- a/example/druid.gui +++ b/example/druid.gui @@ -39,7 +39,7 @@ nodes { y: 1080.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "container_left" pivot: PIVOT_W adjust_mode: ADJUST_MODE_STRETCH @@ -56,7 +56,7 @@ nodes { y: 170.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "container_logo" pivot: PIVOT_NW parent: "container_left" @@ -125,7 +125,7 @@ nodes { y: 910.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "container_examples" pivot: PIVOT_NW adjust_mode: ADJUST_MODE_STRETCH @@ -213,7 +213,7 @@ nodes { y: 1080.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "container_right" pivot: PIVOT_E adjust_mode: ADJUST_MODE_STRETCH @@ -230,7 +230,7 @@ nodes { y: 450.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "container_info" pivot: PIVOT_NE adjust_mode: ADJUST_MODE_STRETCH @@ -336,7 +336,7 @@ nodes { y: 630.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "container_group_settings_output" pivot: PIVOT_SE adjust_mode: ADJUST_MODE_STRETCH @@ -353,7 +353,7 @@ nodes { y: 350.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "container_settings" pivot: PIVOT_NE adjust_mode: ADJUST_MODE_STRETCH @@ -558,7 +558,7 @@ nodes { y: 280.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "container_output" pivot: PIVOT_SE adjust_mode: ADJUST_MODE_STRETCH @@ -635,7 +635,7 @@ nodes { y: 1030.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "container_center" xanchor: XANCHOR_LEFT yanchor: YANCHOR_BOTTOM @@ -683,7 +683,7 @@ nodes { } nodes { type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "intro_examples" parent: "examples" inherit_alpha: true @@ -2447,7 +2447,6 @@ nodes { type: TYPE_BOX id: "window_language/root" parent: "window_language" - overridden_fields: 1 template_node_child: true } nodes { @@ -2521,7 +2520,6 @@ nodes { type: TYPE_BOX id: "window_confirmation/root" parent: "window_confirmation" - overridden_fields: 1 template_node_child: true } nodes { @@ -2613,7 +2611,6 @@ nodes { type: TYPE_BOX id: "window_info/root" parent: "window_info" - overridden_fields: 1 template_node_child: true } nodes { @@ -2868,7 +2865,7 @@ nodes { } nodes { type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "gamepad" parent: "examples" inherit_alpha: true @@ -3673,7 +3670,7 @@ nodes { } nodes { type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "layout" parent: "examples" inherit_alpha: true @@ -3707,7 +3704,7 @@ nodes { } nodes { type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "widgets" parent: "examples" inherit_alpha: true @@ -3926,10 +3923,16 @@ nodes { inherit_alpha: true template: "/example/examples/widgets/memory_panel/example_memory_panel.gui" } +nodes { + type: TYPE_BOX + id: "example_memory_panel/root" + parent: "example_memory_panel" + template_node_child: true +} nodes { type: TYPE_TEMPLATE id: "example_memory_panel/memory_panel" - parent: "example_memory_panel" + parent: "example_memory_panel/root" template_node_child: true } nodes { @@ -4032,7 +4035,7 @@ nodes { y: 50.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "container_status" xanchor: XANCHOR_LEFT pivot: PIVOT_S diff --git a/example/examples/basic/back_handler/basic_back_handler.gui b/example/examples/basic/back_handler/basic_back_handler.gui index c2a132b..0ba266c 100644 --- a/example/examples/basic/back_handler/basic_back_handler.gui +++ b/example/examples/basic/back_handler/basic_back_handler.gui @@ -17,7 +17,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/ui_circle_64" + texture: "druid_example/ui_circle_64" id: "root" inherit_alpha: true slice9 { diff --git a/example/examples/basic/blocker/basic_blocker.gui b/example/examples/basic/blocker/basic_blocker.gui index d51775b..8736e65 100644 --- a/example/examples/basic/blocker/basic_blocker.gui +++ b/example/examples/basic/blocker/basic_blocker.gui @@ -17,7 +17,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/ui_circle_64" + texture: "druid_example/ui_circle_64" id: "root" inherit_alpha: true slice9 { @@ -38,7 +38,7 @@ nodes { z: 0.322 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "blocker" parent: "root" inherit_alpha: true @@ -56,18 +56,6 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_green.gui" } -nodes { - type: TYPE_BOX - id: "button/root" - parent: "button" - template_node_child: true -} -nodes { - type: TYPE_TEXT - id: "button/text" - parent: "button/root" - template_node_child: true -} nodes { position { x: -246.0 diff --git a/example/examples/basic/button/basic_button.gui b/example/examples/basic/button/basic_button.gui index d96efe6..b6e5721 100644 --- a/example/examples/basic/button/basic_button.gui +++ b/example/examples/basic/button/basic_button.gui @@ -1,236 +1,20 @@ -script: "" -background_color { - x: 0.0 - y: 0.0 - z: 0.0 - w: 0.0 -} nodes { - position { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - rotation { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - scale { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } size { x: 200.0 y: 100.0 - z: 0.0 - w: 1.0 - } - color { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 } type: TYPE_BOX - blend_mode: BLEND_MODE_ALPHA - texture: "" id: "root" - xanchor: XANCHOR_NONE - yanchor: YANCHOR_NONE - pivot: PIVOT_CENTER - adjust_mode: ADJUST_MODE_FIT - layer: "" inherit_alpha: true - slice9 { - x: 0.0 - y: 0.0 - z: 0.0 - w: 0.0 - } - clipping_mode: CLIPPING_MODE_NONE - clipping_visible: true - clipping_inverted: false - alpha: 1.0 - template_node_child: false size_mode: SIZE_MODE_AUTO - custom_type: 0 - enabled: true visible: false - material: "" } nodes { - position { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - rotation { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - scale { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } - size { - x: 200.0 - y: 100.0 - z: 0.0 - w: 1.0 - } - color { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } type: TYPE_TEMPLATE id: "button" parent: "root" - layer: "" inherit_alpha: true - alpha: 1.0 template: "/example/templates/button_text_green.gui" - template_node_child: false - custom_type: 0 - enabled: true -} -nodes { - position { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - rotation { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - scale { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } - size { - x: 280.0 - y: 90.0 - z: 0.0 - w: 1.0 - } - color { - x: 0.557 - y: 0.835 - z: 0.62 - w: 1.0 - } - type: TYPE_BOX - blend_mode: BLEND_MODE_ALPHA - texture: "druid/ui_circle_32" - id: "button/root" - xanchor: XANCHOR_NONE - yanchor: YANCHOR_NONE - pivot: PIVOT_CENTER - adjust_mode: ADJUST_MODE_FIT - parent: "button" - layer: "druid" - inherit_alpha: true - slice9 { - x: 16.0 - y: 16.0 - z: 16.0 - w: 16.0 - } - clipping_mode: CLIPPING_MODE_NONE - clipping_visible: true - clipping_inverted: false - alpha: 1.0 - template_node_child: true - size_mode: SIZE_MODE_MANUAL - custom_type: 0 - enabled: true - visible: true - material: "" -} -nodes { - position { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - rotation { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - scale { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } - size { - x: 245.0 - y: 50.0 - z: 0.0 - w: 1.0 - } - color { - x: 0.31 - y: 0.318 - z: 0.322 - w: 1.0 - } - type: TYPE_TEXT - blend_mode: BLEND_MODE_ALPHA - text: "Confirm" - font: "text_bold" - id: "button/text" - xanchor: XANCHOR_NONE - yanchor: YANCHOR_NONE - pivot: PIVOT_CENTER - outline { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } - shadow { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } - adjust_mode: ADJUST_MODE_FIT - line_break: false - parent: "button/root" - layer: "text_bold" - inherit_alpha: true - alpha: 1.0 - outline_alpha: 0.0 - shadow_alpha: 0.0 - template_node_child: true - text_leading: 1.0 - text_tracking: 0.0 - custom_type: 0 - enabled: true - visible: true - material: "" } material: "/builtins/materials/gui.material" adjust_reference: ADJUST_REFERENCE_PARENT -max_nodes: 512 diff --git a/example/examples/basic/button/basic_button_double_click.gui b/example/examples/basic/button/basic_button_double_click.gui index d96efe6..b6e5721 100644 --- a/example/examples/basic/button/basic_button_double_click.gui +++ b/example/examples/basic/button/basic_button_double_click.gui @@ -1,236 +1,20 @@ -script: "" -background_color { - x: 0.0 - y: 0.0 - z: 0.0 - w: 0.0 -} nodes { - position { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - rotation { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - scale { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } size { x: 200.0 y: 100.0 - z: 0.0 - w: 1.0 - } - color { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 } type: TYPE_BOX - blend_mode: BLEND_MODE_ALPHA - texture: "" id: "root" - xanchor: XANCHOR_NONE - yanchor: YANCHOR_NONE - pivot: PIVOT_CENTER - adjust_mode: ADJUST_MODE_FIT - layer: "" inherit_alpha: true - slice9 { - x: 0.0 - y: 0.0 - z: 0.0 - w: 0.0 - } - clipping_mode: CLIPPING_MODE_NONE - clipping_visible: true - clipping_inverted: false - alpha: 1.0 - template_node_child: false size_mode: SIZE_MODE_AUTO - custom_type: 0 - enabled: true visible: false - material: "" } nodes { - position { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - rotation { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - scale { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } - size { - x: 200.0 - y: 100.0 - z: 0.0 - w: 1.0 - } - color { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } type: TYPE_TEMPLATE id: "button" parent: "root" - layer: "" inherit_alpha: true - alpha: 1.0 template: "/example/templates/button_text_green.gui" - template_node_child: false - custom_type: 0 - enabled: true -} -nodes { - position { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - rotation { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - scale { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } - size { - x: 280.0 - y: 90.0 - z: 0.0 - w: 1.0 - } - color { - x: 0.557 - y: 0.835 - z: 0.62 - w: 1.0 - } - type: TYPE_BOX - blend_mode: BLEND_MODE_ALPHA - texture: "druid/ui_circle_32" - id: "button/root" - xanchor: XANCHOR_NONE - yanchor: YANCHOR_NONE - pivot: PIVOT_CENTER - adjust_mode: ADJUST_MODE_FIT - parent: "button" - layer: "druid" - inherit_alpha: true - slice9 { - x: 16.0 - y: 16.0 - z: 16.0 - w: 16.0 - } - clipping_mode: CLIPPING_MODE_NONE - clipping_visible: true - clipping_inverted: false - alpha: 1.0 - template_node_child: true - size_mode: SIZE_MODE_MANUAL - custom_type: 0 - enabled: true - visible: true - material: "" -} -nodes { - position { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - rotation { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - scale { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } - size { - x: 245.0 - y: 50.0 - z: 0.0 - w: 1.0 - } - color { - x: 0.31 - y: 0.318 - z: 0.322 - w: 1.0 - } - type: TYPE_TEXT - blend_mode: BLEND_MODE_ALPHA - text: "Confirm" - font: "text_bold" - id: "button/text" - xanchor: XANCHOR_NONE - yanchor: YANCHOR_NONE - pivot: PIVOT_CENTER - outline { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } - shadow { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } - adjust_mode: ADJUST_MODE_FIT - line_break: false - parent: "button/root" - layer: "text_bold" - inherit_alpha: true - alpha: 1.0 - outline_alpha: 0.0 - shadow_alpha: 0.0 - template_node_child: true - text_leading: 1.0 - text_tracking: 0.0 - custom_type: 0 - enabled: true - visible: true - material: "" } material: "/builtins/materials/gui.material" adjust_reference: ADJUST_REFERENCE_PARENT -max_nodes: 512 diff --git a/example/examples/basic/button/basic_button_hold.gui b/example/examples/basic/button/basic_button_hold.gui index 698b082..2234bea 100644 --- a/example/examples/basic/button/basic_button_hold.gui +++ b/example/examples/basic/button/basic_button_hold.gui @@ -28,7 +28,7 @@ nodes { z: 0.624 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "button" parent: "root" inherit_alpha: true @@ -63,7 +63,7 @@ nodes { z: 0.62 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "button_image" parent: "mask" inherit_alpha: true diff --git a/example/examples/basic/checkbox/checkbox.gui b/example/examples/basic/checkbox/checkbox.gui index 3424105..445fc15 100644 --- a/example/examples/basic/checkbox/checkbox.gui +++ b/example/examples/basic/checkbox/checkbox.gui @@ -28,7 +28,7 @@ nodes { z: 0.49 } type: TYPE_BOX - texture: "druid/rect_round2_width1" + texture: "druid_example/rect_round2_width1" id: "button" parent: "root" inherit_alpha: true @@ -46,7 +46,7 @@ nodes { z: 0.761 } type: TYPE_BOX - texture: "druid/icon_check" + texture: "druid_example/icon_check" id: "icon" parent: "button" inherit_alpha: true @@ -66,7 +66,7 @@ nodes { z: 0.333 } type: TYPE_BOX - texture: "druid/pixel" + texture: "druid_example/pixel" id: "selected" pivot: PIVOT_S adjust_mode: ADJUST_MODE_STRETCH diff --git a/example/examples/basic/checkbox_group/checkbox_group.gui b/example/examples/basic/checkbox_group/checkbox_group.gui index 2eeaef4..a51e797 100644 --- a/example/examples/basic/checkbox_group/checkbox_group.gui +++ b/example/examples/basic/checkbox_group/checkbox_group.gui @@ -27,30 +27,6 @@ nodes { inherit_alpha: true template: "/example/examples/basic/checkbox/checkbox.gui" } -nodes { - type: TYPE_BOX - id: "checkbox_1/root" - parent: "checkbox_1" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "checkbox_1/button" - parent: "checkbox_1/root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "checkbox_1/icon" - parent: "checkbox_1/button" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "checkbox_1/selected" - parent: "checkbox_1/button" - template_node_child: true -} nodes { type: TYPE_TEMPLATE id: "checkbox_2" @@ -58,30 +34,6 @@ nodes { inherit_alpha: true template: "/example/examples/basic/checkbox/checkbox.gui" } -nodes { - type: TYPE_BOX - id: "checkbox_2/root" - parent: "checkbox_2" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "checkbox_2/button" - parent: "checkbox_2/root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "checkbox_2/icon" - parent: "checkbox_2/button" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "checkbox_2/selected" - parent: "checkbox_2/button" - template_node_child: true -} nodes { position { x: 100.0 @@ -92,29 +44,5 @@ nodes { inherit_alpha: true template: "/example/examples/basic/checkbox/checkbox.gui" } -nodes { - type: TYPE_BOX - id: "checkbox_3/root" - parent: "checkbox_3" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "checkbox_3/button" - parent: "checkbox_3/root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "checkbox_3/icon" - parent: "checkbox_3/button" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "checkbox_3/selected" - parent: "checkbox_3/button" - template_node_child: true -} material: "/builtins/materials/gui.material" adjust_reference: ADJUST_REFERENCE_PARENT diff --git a/example/examples/basic/drag/drag.gui b/example/examples/basic/drag/drag.gui index 563e9bd..c4ea468 100644 --- a/example/examples/basic/drag/drag.gui +++ b/example/examples/basic/drag/drag.gui @@ -19,19 +19,5 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_blue.gui" } -nodes { - type: TYPE_BOX - id: "drag/root" - parent: "drag" - template_node_child: true -} -nodes { - type: TYPE_TEXT - text: "Drag Me" - id: "drag/text" - parent: "drag/root" - overridden_fields: 8 - template_node_child: true -} material: "/builtins/materials/gui.material" adjust_reference: ADJUST_REFERENCE_PARENT diff --git a/example/examples/basic/drag/drag_to_node.gui b/example/examples/basic/drag/drag_to_node.gui index 156bff0..1bc8e22 100644 --- a/example/examples/basic/drag/drag_to_node.gui +++ b/example/examples/basic/drag/drag_to_node.gui @@ -23,20 +23,6 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_blue.gui" } -nodes { - type: TYPE_BOX - id: "drag/root" - parent: "drag" - template_node_child: true -} -nodes { - type: TYPE_TEXT - text: "Drag Me" - id: "drag/text" - parent: "drag/root" - overridden_fields: 8 - template_node_child: true -} nodes { position { y: 300.0 @@ -51,7 +37,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/ui_circle_64" + texture: "druid_example/ui_circle_64" id: "zone" parent: "root" inherit_alpha: true diff --git a/example/examples/basic/grid/grid.gui b/example/examples/basic/grid/grid.gui index 99b7011..93a555a 100644 --- a/example/examples/basic/grid/grid.gui +++ b/example/examples/basic/grid/grid.gui @@ -12,7 +12,7 @@ nodes { y: 1000.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "root" inherit_alpha: true visible: false @@ -31,7 +31,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "grid" pivot: PIVOT_N parent: "root" @@ -65,7 +65,7 @@ nodes { z: 0.961 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "panel" parent: "prefab" inherit_alpha: true diff --git a/example/examples/basic/hover/hover.gui b/example/examples/basic/hover/hover.gui index 1d6b74e..30312c1 100644 --- a/example/examples/basic/hover/hover.gui +++ b/example/examples/basic/hover/hover.gui @@ -22,20 +22,6 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_green.gui" } -nodes { - type: TYPE_BOX - id: "button_mouse_hover/root" - parent: "button_mouse_hover" - template_node_child: true -} -nodes { - type: TYPE_TEXT - text: "Mouse Hover" - id: "button_mouse_hover/text" - parent: "button_mouse_hover/root" - overridden_fields: 8 - template_node_child: true -} nodes { position { y: -100.0 @@ -46,19 +32,5 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_green.gui" } -nodes { - type: TYPE_BOX - id: "button_mobile_hover/root" - parent: "button_mobile_hover" - template_node_child: true -} -nodes { - type: TYPE_TEXT - text: "Mobile Hover" - id: "button_mobile_hover/text" - parent: "button_mobile_hover/root" - overridden_fields: 8 - template_node_child: true -} material: "/builtins/materials/gui.material" adjust_reference: ADJUST_REFERENCE_PARENT diff --git a/example/examples/basic/input/basic_input.gui b/example/examples/basic/input/basic_input.gui index c4405a8..c13ede9 100644 --- a/example/examples/basic/input/basic_input.gui +++ b/example/examples/basic/input/basic_input.gui @@ -1,406 +1,29 @@ -script: "" -background_color { - x: 0.0 - y: 0.0 - z: 0.0 - w: 0.0 -} nodes { - position { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - rotation { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - scale { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } size { x: 1000.0 y: 1000.0 - z: 0.0 - w: 1.0 - } - color { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 } type: TYPE_BOX - blend_mode: BLEND_MODE_ALPHA - texture: "" id: "root" - xanchor: XANCHOR_NONE - yanchor: YANCHOR_NONE - pivot: PIVOT_CENTER - adjust_mode: ADJUST_MODE_FIT - layer: "" inherit_alpha: true - slice9 { - x: 0.0 - y: 0.0 - z: 0.0 - w: 0.0 - } - clipping_mode: CLIPPING_MODE_NONE - clipping_visible: true - clipping_inverted: false - alpha: 1.0 - template_node_child: false - size_mode: SIZE_MODE_MANUAL - custom_type: 0 - enabled: true visible: false - material: "" } nodes { - position { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - rotation { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - scale { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } - size { - x: 200.0 - y: 100.0 - z: 0.0 - w: 1.0 - } - color { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } type: TYPE_TEMPLATE id: "input" parent: "root" - layer: "" inherit_alpha: true - alpha: 1.0 template: "/example/templates/input.gui" - template_node_child: false - custom_type: 0 - enabled: true } nodes { position { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - rotation { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - scale { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } - size { - x: 500.0 - y: 80.0 - z: 0.0 - w: 1.0 - } - color { - x: 0.463 - y: 0.475 - z: 0.49 - w: 1.0 - } - type: TYPE_BOX - blend_mode: BLEND_MODE_ALPHA - texture: "druid/rect_round2_width1" - id: "input/root" - xanchor: XANCHOR_NONE - yanchor: YANCHOR_NONE - pivot: PIVOT_CENTER - adjust_mode: ADJUST_MODE_FIT - parent: "input" - layer: "" - inherit_alpha: true - slice9 { - x: 4.0 - y: 4.0 - z: 4.0 - w: 4.0 - } - clipping_mode: CLIPPING_MODE_NONE - clipping_visible: true - clipping_inverted: false - alpha: 1.0 - template_node_child: true - size_mode: SIZE_MODE_MANUAL - custom_type: 0 - enabled: true - visible: true - material: "" -} -nodes { - position { - x: -240.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - rotation { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - scale { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } - size { - x: 480.0 - y: 50.0 - z: 0.0 - w: 1.0 - } - color { - x: 0.722 - y: 0.741 - z: 0.761 - w: 1.0 - } - type: TYPE_TEXT - blend_mode: BLEND_MODE_ALPHA - text: "Tap me to input" - font: "text_bold" - id: "input/text" - xanchor: XANCHOR_NONE - yanchor: YANCHOR_NONE - pivot: PIVOT_W - outline { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } - shadow { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } - adjust_mode: ADJUST_MODE_FIT - line_break: false - parent: "input/root" - layer: "" - inherit_alpha: true - alpha: 1.0 - outline_alpha: 0.0 - shadow_alpha: 0.0 - template_node_child: true - text_leading: 1.0 - text_tracking: 0.0 - custom_type: 0 - enabled: true - visible: true - material: "" -} -nodes { - position { - x: 0.0 y: -150.0 - z: 0.0 - w: 1.0 - } - rotation { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - scale { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } - size { - x: 200.0 - y: 100.0 - z: 0.0 - w: 1.0 - } - color { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 } type: TYPE_TEMPLATE id: "input_2" parent: "root" - layer: "" inherit_alpha: true - alpha: 1.0 template: "/example/templates/input.gui" - template_node_child: false - custom_type: 0 - enabled: true -} -nodes { - position { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - rotation { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - scale { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } - size { - x: 500.0 - y: 80.0 - z: 0.0 - w: 1.0 - } - color { - x: 0.463 - y: 0.475 - z: 0.49 - w: 1.0 - } - type: TYPE_BOX - blend_mode: BLEND_MODE_ALPHA - texture: "druid/rect_round2_width1" - id: "input_2/root" - xanchor: XANCHOR_NONE - yanchor: YANCHOR_NONE - pivot: PIVOT_CENTER - adjust_mode: ADJUST_MODE_FIT - parent: "input_2" - layer: "" - inherit_alpha: true - slice9 { - x: 4.0 - y: 4.0 - z: 4.0 - w: 4.0 - } - clipping_mode: CLIPPING_MODE_NONE - clipping_visible: true - clipping_inverted: false - alpha: 1.0 - template_node_child: true - size_mode: SIZE_MODE_MANUAL - custom_type: 0 - enabled: true - visible: true - material: "" -} -nodes { - position { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - rotation { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - scale { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } - size { - x: 480.0 - y: 50.0 - z: 0.0 - w: 1.0 - } - color { - x: 0.722 - y: 0.741 - z: 0.761 - w: 1.0 - } - type: TYPE_TEXT - blend_mode: BLEND_MODE_ALPHA - text: "Tap me to input" - font: "text_bold" - id: "input_2/text" - xanchor: XANCHOR_NONE - yanchor: YANCHOR_NONE - pivot: PIVOT_CENTER - outline { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } - shadow { - x: 1.0 - y: 1.0 - z: 1.0 - w: 1.0 - } - adjust_mode: ADJUST_MODE_FIT - line_break: false - parent: "input_2/root" - layer: "" - inherit_alpha: true - alpha: 1.0 - outline_alpha: 0.0 - shadow_alpha: 0.0 - overridden_fields: 1 - overridden_fields: 14 - template_node_child: true - text_leading: 1.0 - text_tracking: 0.0 - custom_type: 0 - enabled: true - visible: true - material: "" } material: "/builtins/materials/gui.material" adjust_reference: ADJUST_REFERENCE_PARENT -max_nodes: 512 diff --git a/example/examples/basic/input/input_password.gui b/example/examples/basic/input/input_password.gui index c93752a..03bdeef 100644 --- a/example/examples/basic/input/input_password.gui +++ b/example/examples/basic/input/input_password.gui @@ -15,19 +15,5 @@ nodes { inherit_alpha: true template: "/example/templates/input.gui" } -nodes { - type: TYPE_BOX - id: "input/root" - parent: "input" - template_node_child: true -} -nodes { - type: TYPE_TEXT - id: "input/text" - parent: "input/root" - overridden_fields: 1 - overridden_fields: 14 - template_node_child: true -} material: "/builtins/materials/gui.material" adjust_reference: ADJUST_REFERENCE_PARENT diff --git a/example/examples/basic/input/rich_input.gui b/example/examples/basic/input/rich_input.gui index 1e09607..89e445d 100644 --- a/example/examples/basic/input/rich_input.gui +++ b/example/examples/basic/input/rich_input.gui @@ -19,55 +19,6 @@ nodes { inherit_alpha: true template: "/example/templates/rich_input.gui" } -nodes { - type: TYPE_BOX - id: "rich_input/root" - parent: "rich_input" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "rich_input/button" - parent: "rich_input/root" - template_node_child: true -} -nodes { - position { - x: -240.0 - } - type: TYPE_TEXT - id: "rich_input/placeholder_text" - pivot: PIVOT_W - parent: "rich_input/button" - overridden_fields: 1 - overridden_fields: 14 - template_node_child: true -} -nodes { - position { - x: -240.0 - } - type: TYPE_TEXT - id: "rich_input/input_text" - pivot: PIVOT_W - parent: "rich_input/button" - overridden_fields: 1 - overridden_fields: 14 - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "rich_input/cursor_node" - parent: "rich_input/button" - overridden_fields: 1 - template_node_child: true -} -nodes { - type: TYPE_TEXT - id: "rich_input/cursor_text" - parent: "rich_input/cursor_node" - template_node_child: true -} nodes { position { y: -150.0 @@ -78,42 +29,5 @@ nodes { inherit_alpha: true template: "/example/templates/rich_input.gui" } -nodes { - type: TYPE_BOX - id: "rich_input_2/root" - parent: "rich_input_2" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "rich_input_2/button" - parent: "rich_input_2/root" - template_node_child: true -} -nodes { - type: TYPE_TEXT - id: "rich_input_2/placeholder_text" - parent: "rich_input_2/button" - template_node_child: true -} -nodes { - type: TYPE_TEXT - id: "rich_input_2/input_text" - parent: "rich_input_2/button" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "rich_input_2/cursor_node" - parent: "rich_input_2/button" - overridden_fields: 1 - template_node_child: true -} -nodes { - type: TYPE_TEXT - id: "rich_input_2/cursor_text" - parent: "rich_input_2/cursor_node" - template_node_child: true -} material: "/builtins/materials/gui.material" adjust_reference: ADJUST_REFERENCE_PARENT diff --git a/example/examples/basic/progress_bar/basic_progress_bar.gui b/example/examples/basic/progress_bar/basic_progress_bar.gui index c119df4..a46689f 100644 --- a/example/examples/basic/progress_bar/basic_progress_bar.gui +++ b/example/examples/basic/progress_bar/basic_progress_bar.gui @@ -30,7 +30,7 @@ nodes { z: 0.49 } type: TYPE_BOX - texture: "druid/pixel" + texture: "druid_example/pixel" id: "progress_bar_back" pivot: PIVOT_W parent: "root" @@ -47,7 +47,7 @@ nodes { z: 0.961 } type: TYPE_BOX - texture: "druid/pixel" + texture: "druid_example/pixel" id: "progress_bar_fill" pivot: PIVOT_W parent: "progress_bar_back" diff --git a/example/examples/basic/progress_bar/basic_progress_bar_slice9.gui b/example/examples/basic/progress_bar/basic_progress_bar_slice9.gui index 271abd2..133f0c7 100644 --- a/example/examples/basic/progress_bar/basic_progress_bar_slice9.gui +++ b/example/examples/basic/progress_bar/basic_progress_bar_slice9.gui @@ -30,7 +30,7 @@ nodes { z: 0.49 } type: TYPE_BOX - texture: "druid/ui_circle_16" + texture: "druid_example/ui_circle_16" id: "progress_bar_back" pivot: PIVOT_W parent: "root" @@ -53,7 +53,7 @@ nodes { z: 0.961 } type: TYPE_BOX - texture: "druid/ui_circle_16" + texture: "druid_example/ui_circle_16" id: "progress_bar_fill" pivot: PIVOT_W parent: "progress_bar_back" diff --git a/example/examples/basic/radio_group/radio_group.gui b/example/examples/basic/radio_group/radio_group.gui index 7b7f98c..a51e797 100644 --- a/example/examples/basic/radio_group/radio_group.gui +++ b/example/examples/basic/radio_group/radio_group.gui @@ -27,55 +27,6 @@ nodes { inherit_alpha: true template: "/example/examples/basic/checkbox/checkbox.gui" } -nodes { - type: TYPE_BOX - id: "checkbox_1/root" - parent: "checkbox_1" - template_node_child: true -} -nodes { - color { - x: 0.31 - y: 0.318 - z: 0.322 - } - type: TYPE_BOX - texture: "druid/ui_circle_32" - id: "checkbox_1/button" - parent: "checkbox_1/root" - slice9 { - x: 8.0 - y: 8.0 - z: 8.0 - w: 8.0 - } - overridden_fields: 5 - overridden_fields: 9 - overridden_fields: 22 - template_node_child: true -} -nodes { - type: TYPE_BOX - texture: "druid/ui_circle_16" - id: "checkbox_1/icon" - parent: "checkbox_1/button" - overridden_fields: 9 - template_node_child: true -} -nodes { - position { - y: -8.0 - } - type: TYPE_BOX - texture: "druid/ui_circle_16" - id: "checkbox_1/selected" - parent: "checkbox_1/button" - overridden_fields: 1 - overridden_fields: 9 - overridden_fields: 38 - template_node_child: true - size_mode: SIZE_MODE_AUTO -} nodes { type: TYPE_TEMPLATE id: "checkbox_2" @@ -83,55 +34,6 @@ nodes { inherit_alpha: true template: "/example/examples/basic/checkbox/checkbox.gui" } -nodes { - type: TYPE_BOX - id: "checkbox_2/root" - parent: "checkbox_2" - template_node_child: true -} -nodes { - color { - x: 0.31 - y: 0.318 - z: 0.322 - } - type: TYPE_BOX - texture: "druid/ui_circle_32" - id: "checkbox_2/button" - parent: "checkbox_2/root" - slice9 { - x: 8.0 - y: 8.0 - z: 8.0 - w: 8.0 - } - overridden_fields: 5 - overridden_fields: 9 - overridden_fields: 22 - template_node_child: true -} -nodes { - type: TYPE_BOX - texture: "druid/ui_circle_16" - id: "checkbox_2/icon" - parent: "checkbox_2/button" - overridden_fields: 9 - template_node_child: true -} -nodes { - position { - y: -8.0 - } - type: TYPE_BOX - texture: "druid/ui_circle_16" - id: "checkbox_2/selected" - parent: "checkbox_2/button" - overridden_fields: 1 - overridden_fields: 9 - overridden_fields: 38 - template_node_child: true - size_mode: SIZE_MODE_AUTO -} nodes { position { x: 100.0 @@ -142,54 +44,5 @@ nodes { inherit_alpha: true template: "/example/examples/basic/checkbox/checkbox.gui" } -nodes { - type: TYPE_BOX - id: "checkbox_3/root" - parent: "checkbox_3" - template_node_child: true -} -nodes { - color { - x: 0.31 - y: 0.318 - z: 0.322 - } - type: TYPE_BOX - texture: "druid/ui_circle_32" - id: "checkbox_3/button" - parent: "checkbox_3/root" - slice9 { - x: 8.0 - y: 8.0 - z: 8.0 - w: 8.0 - } - overridden_fields: 5 - overridden_fields: 9 - overridden_fields: 22 - template_node_child: true -} -nodes { - type: TYPE_BOX - texture: "druid/ui_circle_16" - id: "checkbox_3/icon" - parent: "checkbox_3/button" - overridden_fields: 9 - template_node_child: true -} -nodes { - position { - y: -8.0 - } - type: TYPE_BOX - texture: "druid/ui_circle_16" - id: "checkbox_3/selected" - parent: "checkbox_3/button" - overridden_fields: 1 - overridden_fields: 9 - overridden_fields: 38 - template_node_child: true - size_mode: SIZE_MODE_AUTO -} material: "/builtins/materials/gui.material" adjust_reference: ADJUST_REFERENCE_PARENT diff --git a/example/examples/basic/rich_text/rich_text_tags.gui b/example/examples/basic/rich_text/rich_text_tags.gui index f81b596..0105d87 100644 --- a/example/examples/basic/rich_text/rich_text_tags.gui +++ b/example/examples/basic/rich_text/rich_text_tags.gui @@ -35,7 +35,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/ui_circle_64" + texture: "druid_example/ui_circle_64" id: "background" parent: "root" inherit_alpha: true diff --git a/example/examples/basic/scroll/scroll.gui b/example/examples/basic/scroll/scroll.gui index 335b0e5..fe6722b 100644 --- a/example/examples/basic/scroll/scroll.gui +++ b/example/examples/basic/scroll/scroll.gui @@ -27,7 +27,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "scroll_view" parent: "root" inherit_alpha: true @@ -53,7 +53,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "scroll_content" pivot: PIVOT_N parent: "scroll_view" @@ -76,20 +76,6 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_green.gui" } -nodes { - type: TYPE_BOX - id: "button_tutorial/root" - parent: "button_tutorial" - template_node_child: true -} -nodes { - type: TYPE_TEXT - text: "I do nothing!" - id: "button_tutorial/text" - parent: "button_tutorial/root" - overridden_fields: 8 - template_node_child: true -} nodes { position { x: -185.0 @@ -302,32 +288,6 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_green.gui" } -nodes { - type: TYPE_BOX - id: "button_stencil/root" - parent: "button_stencil" - template_node_child: true -} -nodes { - scale { - x: 0.8 - y: 0.8 - } - size { - x: 300.0 - y: 50.0 - } - type: TYPE_TEXT - text: "Click outside stencil node" - id: "button_stencil/text" - line_break: true - parent: "button_stencil/root" - overridden_fields: 3 - overridden_fields: 4 - overridden_fields: 8 - overridden_fields: 18 - template_node_child: true -} nodes { position { x: -185.0 diff --git a/example/examples/basic/scroll_bind_grid/scroll_bind_grid.gui b/example/examples/basic/scroll_bind_grid/scroll_bind_grid.gui index a0eb02f..5fabe31 100644 --- a/example/examples/basic/scroll_bind_grid/scroll_bind_grid.gui +++ b/example/examples/basic/scroll_bind_grid/scroll_bind_grid.gui @@ -12,7 +12,7 @@ nodes { y: 1000.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "root" inherit_alpha: true visible: false @@ -31,7 +31,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "view" pivot: PIVOT_N parent: "root" @@ -50,7 +50,7 @@ nodes { y: 800.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "content" pivot: PIVOT_N parent: "view" @@ -82,7 +82,7 @@ nodes { z: 0.961 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "panel" parent: "prefab" inherit_alpha: true diff --git a/example/examples/basic/scroll_bind_grid/scroll_bind_grid_horizontal.gui b/example/examples/basic/scroll_bind_grid/scroll_bind_grid_horizontal.gui index f16a69e..18ad39c 100644 --- a/example/examples/basic/scroll_bind_grid/scroll_bind_grid_horizontal.gui +++ b/example/examples/basic/scroll_bind_grid/scroll_bind_grid_horizontal.gui @@ -12,7 +12,7 @@ nodes { y: 1000.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "root" inherit_alpha: true visible: false @@ -31,7 +31,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "view" pivot: PIVOT_W parent: "root" @@ -50,7 +50,7 @@ nodes { y: 360.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "content" pivot: PIVOT_W parent: "view" @@ -82,7 +82,7 @@ nodes { z: 0.961 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "panel" parent: "prefab" inherit_alpha: true diff --git a/example/examples/basic/scroll_bind_grid/scroll_bind_grid_points.gui b/example/examples/basic/scroll_bind_grid/scroll_bind_grid_points.gui index 603dbfd..a973517 100644 --- a/example/examples/basic/scroll_bind_grid/scroll_bind_grid_points.gui +++ b/example/examples/basic/scroll_bind_grid/scroll_bind_grid_points.gui @@ -12,7 +12,7 @@ nodes { y: 1000.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "root" inherit_alpha: true visible: false @@ -31,7 +31,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "view" pivot: PIVOT_N parent: "root" @@ -50,7 +50,7 @@ nodes { y: 800.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "content" pivot: PIVOT_N parent: "view" @@ -82,7 +82,7 @@ nodes { z: 0.961 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "panel" parent: "prefab" inherit_alpha: true diff --git a/example/examples/basic/scroll_slider/scroll_slider.gui b/example/examples/basic/scroll_slider/scroll_slider.gui index c056010..0766e91 100644 --- a/example/examples/basic/scroll_slider/scroll_slider.gui +++ b/example/examples/basic/scroll_slider/scroll_slider.gui @@ -27,7 +27,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "scroll_view" parent: "root" inherit_alpha: true @@ -53,7 +53,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "scroll_content" pivot: PIVOT_N parent: "scroll_view" @@ -76,27 +76,6 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_green.gui" } -nodes { - type: TYPE_BOX - id: "button1/root" - parent: "button1" - template_node_child: true -} -nodes { - scale { - x: 0.9 - y: 0.9 - } - type: TYPE_TEXT - text: "Tap to scroll 1" - id: "button1/text" - line_break: true - parent: "button1/root" - overridden_fields: 3 - overridden_fields: 8 - overridden_fields: 18 - template_node_child: true -} nodes { position { y: -300.0 @@ -107,27 +86,6 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_green.gui" } -nodes { - type: TYPE_BOX - id: "button2/root" - parent: "button2" - template_node_child: true -} -nodes { - scale { - x: 0.9 - y: 0.9 - } - type: TYPE_TEXT - text: "Tap to scroll 2" - id: "button2/text" - line_break: true - parent: "button2/root" - overridden_fields: 3 - overridden_fields: 8 - overridden_fields: 18 - template_node_child: true -} nodes { position { y: -500.0 @@ -138,27 +96,6 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_green.gui" } -nodes { - type: TYPE_BOX - id: "button3/root" - parent: "button3" - template_node_child: true -} -nodes { - scale { - x: 0.9 - y: 0.9 - } - type: TYPE_TEXT - text: "Tap to scroll 3" - id: "button3/text" - line_break: true - parent: "button3/root" - overridden_fields: 3 - overridden_fields: 8 - overridden_fields: 18 - template_node_child: true -} nodes { position { y: -700.0 @@ -169,27 +106,6 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_green.gui" } -nodes { - type: TYPE_BOX - id: "button4/root" - parent: "button4" - template_node_child: true -} -nodes { - scale { - x: 0.9 - y: 0.9 - } - type: TYPE_TEXT - text: "Tap to scroll 4" - id: "button4/text" - line_break: true - parent: "button4/root" - overridden_fields: 3 - overridden_fields: 8 - overridden_fields: 18 - template_node_child: true -} nodes { position { y: -900.0 @@ -200,27 +116,6 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_green.gui" } -nodes { - type: TYPE_BOX - id: "button5/root" - parent: "button5" - template_node_child: true -} -nodes { - scale { - x: 0.9 - y: 0.9 - } - type: TYPE_TEXT - text: "Tap to scroll 5" - id: "button5/text" - line_break: true - parent: "button5/root" - overridden_fields: 3 - overridden_fields: 8 - overridden_fields: 18 - template_node_child: true -} nodes { position { y: -1100.0 @@ -231,27 +126,6 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_green.gui" } -nodes { - type: TYPE_BOX - id: "button6/root" - parent: "button6" - template_node_child: true -} -nodes { - scale { - x: 0.9 - y: 0.9 - } - type: TYPE_TEXT - text: "Tap to scroll 6" - id: "button6/text" - line_break: true - parent: "button6/root" - overridden_fields: 3 - overridden_fields: 8 - overridden_fields: 18 - template_node_child: true -} nodes { position { y: -1300.0 @@ -262,27 +136,6 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_green.gui" } -nodes { - type: TYPE_BOX - id: "button7/root" - parent: "button7" - template_node_child: true -} -nodes { - scale { - x: 0.9 - y: 0.9 - } - type: TYPE_TEXT - text: "Tap to scroll 7" - id: "button7/text" - line_break: true - parent: "button7/root" - overridden_fields: 3 - overridden_fields: 8 - overridden_fields: 18 - template_node_child: true -} nodes { position { y: -1500.0 @@ -293,27 +146,6 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_green.gui" } -nodes { - type: TYPE_BOX - id: "button8/root" - parent: "button8" - template_node_child: true -} -nodes { - scale { - x: 0.9 - y: 0.9 - } - type: TYPE_TEXT - text: "Tap to scroll 8" - id: "button8/text" - line_break: true - parent: "button8/root" - overridden_fields: 3 - overridden_fields: 8 - overridden_fields: 18 - template_node_child: true -} nodes { position { y: -1700.0 @@ -324,27 +156,6 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_green.gui" } -nodes { - type: TYPE_BOX - id: "button9/root" - parent: "button9" - template_node_child: true -} -nodes { - scale { - x: 0.9 - y: 0.9 - } - type: TYPE_TEXT - text: "Tap to scroll 9" - id: "button9/text" - line_break: true - parent: "button9/root" - overridden_fields: 3 - overridden_fields: 8 - overridden_fields: 18 - template_node_child: true -} nodes { position { y: -1900.0 @@ -355,27 +166,6 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_green.gui" } -nodes { - type: TYPE_BOX - id: "button10/root" - parent: "button10" - template_node_child: true -} -nodes { - scale { - x: 0.9 - y: 0.9 - } - type: TYPE_TEXT - text: "Tap to scroll 10" - id: "button10/text" - line_break: true - parent: "button10/root" - overridden_fields: 3 - overridden_fields: 8 - overridden_fields: 18 - template_node_child: true -} nodes { position { y: -2100.0 @@ -386,27 +176,6 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_green.gui" } -nodes { - type: TYPE_BOX - id: "button11/root" - parent: "button11" - template_node_child: true -} -nodes { - scale { - x: 0.9 - y: 0.9 - } - type: TYPE_TEXT - text: "Tap to scroll 11" - id: "button11/text" - line_break: true - parent: "button11/root" - overridden_fields: 3 - overridden_fields: 8 - overridden_fields: 18 - template_node_child: true -} nodes { position { y: -2300.0 @@ -417,27 +186,6 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_green.gui" } -nodes { - type: TYPE_BOX - id: "button12/root" - parent: "button12" - template_node_child: true -} -nodes { - scale { - x: 0.9 - y: 0.9 - } - type: TYPE_TEXT - text: "Tap to scroll 12" - id: "button12/text" - line_break: true - parent: "button12/root" - overridden_fields: 3 - overridden_fields: 8 - overridden_fields: 18 - template_node_child: true -} nodes { position { y: -2500.0 @@ -448,27 +196,6 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_green.gui" } -nodes { - type: TYPE_BOX - id: "button13/root" - parent: "button13" - template_node_child: true -} -nodes { - scale { - x: 0.9 - y: 0.9 - } - type: TYPE_TEXT - text: "Tap to scroll 13" - id: "button13/text" - line_break: true - parent: "button13/root" - overridden_fields: 3 - overridden_fields: 8 - overridden_fields: 18 - template_node_child: true -} nodes { position { x: 200.0 @@ -484,7 +211,7 @@ nodes { z: 0.322 } type: TYPE_BOX - texture: "druid/pixel" + texture: "druid_example/pixel" id: "slider_back" pivot: PIVOT_NE parent: "scroll_view" @@ -505,7 +232,7 @@ nodes { z: 0.49 } type: TYPE_BOX - texture: "druid/ui_circle_16" + texture: "druid_example/ui_circle_16" id: "slider_pin" parent: "slider_back" inherit_alpha: true diff --git a/example/examples/basic/slider/basic_slider.gui b/example/examples/basic/slider/basic_slider.gui index 7b39ff8..7c15e3e 100644 --- a/example/examples/basic/slider/basic_slider.gui +++ b/example/examples/basic/slider/basic_slider.gui @@ -17,7 +17,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/ui_circle_64" + texture: "druid_example/ui_circle_64" id: "root" inherit_alpha: true slice9 { @@ -34,24 +34,6 @@ nodes { inherit_alpha: true template: "/example/templates/slider.gui" } -nodes { - type: TYPE_BOX - id: "slider/root" - parent: "slider" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "slider/slider_back" - parent: "slider/root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "slider/slider_pin" - parent: "slider/root" - template_node_child: true -} nodes { position { y: 50.0 diff --git a/example/examples/basic/slider/basic_slider_stepped.gui b/example/examples/basic/slider/basic_slider_stepped.gui index 7b39ff8..7c15e3e 100644 --- a/example/examples/basic/slider/basic_slider_stepped.gui +++ b/example/examples/basic/slider/basic_slider_stepped.gui @@ -17,7 +17,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/ui_circle_64" + texture: "druid_example/ui_circle_64" id: "root" inherit_alpha: true slice9 { @@ -34,24 +34,6 @@ nodes { inherit_alpha: true template: "/example/templates/slider.gui" } -nodes { - type: TYPE_BOX - id: "slider/root" - parent: "slider" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "slider/slider_back" - parent: "slider/root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "slider/slider_pin" - parent: "slider/root" - template_node_child: true -} nodes { position { y: 50.0 diff --git a/example/examples/basic/slider/basic_slider_vertical.gui b/example/examples/basic/slider/basic_slider_vertical.gui index bcddcd4..b59f960 100644 --- a/example/examples/basic/slider/basic_slider_vertical.gui +++ b/example/examples/basic/slider/basic_slider_vertical.gui @@ -17,7 +17,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/ui_circle_64" + texture: "druid_example/ui_circle_64" id: "root" inherit_alpha: true slice9 { @@ -34,38 +34,6 @@ nodes { inherit_alpha: true template: "/example/templates/slider.gui" } -nodes { - size { - x: 40.0 - y: 260.0 - } - type: TYPE_BOX - id: "slider/root" - parent: "slider" - overridden_fields: 4 - template_node_child: true -} -nodes { - size { - x: 9.0 - y: 260.0 - } - type: TYPE_BOX - id: "slider/slider_back" - parent: "slider/root" - overridden_fields: 4 - template_node_child: true -} -nodes { - position { - y: 118.0 - } - type: TYPE_BOX - id: "slider/slider_pin" - parent: "slider/root" - overridden_fields: 1 - template_node_child: true -} nodes { position { y: 170.0 diff --git a/example/examples/basic/swipe/basic_swipe.gui b/example/examples/basic/swipe/basic_swipe.gui index aa45a77..5889073 100644 --- a/example/examples/basic/swipe/basic_swipe.gui +++ b/example/examples/basic/swipe/basic_swipe.gui @@ -17,7 +17,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/ui_circle_64" + texture: "druid_example/ui_circle_64" id: "root" inherit_alpha: true slice9 { diff --git a/example/examples/basic/text/basic_text.gui b/example/examples/basic/text/basic_text.gui index 24b413a..0fb22eb 100644 --- a/example/examples/basic/text/basic_text.gui +++ b/example/examples/basic/text/basic_text.gui @@ -28,7 +28,7 @@ nodes { z: 0.49 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "text_area" parent: "root" inherit_alpha: true diff --git a/example/examples/basic/text/multiline_text.gui b/example/examples/basic/text/multiline_text.gui index 5025ac8..b4c491a 100644 --- a/example/examples/basic/text/multiline_text.gui +++ b/example/examples/basic/text/multiline_text.gui @@ -28,7 +28,7 @@ nodes { z: 0.49 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "text_area" parent: "root" inherit_alpha: true diff --git a/example/examples/data_list/add_remove_clear/data_list_add_remove_clear.gui b/example/examples/data_list/add_remove_clear/data_list_add_remove_clear.gui index 01a8037..3fad7ab 100644 --- a/example/examples/data_list/add_remove_clear/data_list_add_remove_clear.gui +++ b/example/examples/data_list/add_remove_clear/data_list_add_remove_clear.gui @@ -8,7 +8,7 @@ textures { } nodes { type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "root" inherit_alpha: true size_mode: SIZE_MODE_AUTO @@ -28,7 +28,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/pixel" + texture: "druid_example/pixel" id: "view" pivot: PIVOT_N parent: "root" @@ -41,7 +41,7 @@ nodes { y: 700.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "content" pivot: PIVOT_N parent: "view" @@ -73,7 +73,7 @@ nodes { z: 0.961 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "panel" parent: "prefab" inherit_alpha: true diff --git a/example/examples/data_list/basic/data_list_basic.gui b/example/examples/data_list/basic/data_list_basic.gui index 01a8037..3fad7ab 100644 --- a/example/examples/data_list/basic/data_list_basic.gui +++ b/example/examples/data_list/basic/data_list_basic.gui @@ -8,7 +8,7 @@ textures { } nodes { type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "root" inherit_alpha: true size_mode: SIZE_MODE_AUTO @@ -28,7 +28,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/pixel" + texture: "druid_example/pixel" id: "view" pivot: PIVOT_N parent: "root" @@ -41,7 +41,7 @@ nodes { y: 700.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "content" pivot: PIVOT_N parent: "view" @@ -73,7 +73,7 @@ nodes { z: 0.961 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "panel" parent: "prefab" inherit_alpha: true diff --git a/example/examples/data_list/basic/data_list_horizontal_basic.gui b/example/examples/data_list/basic/data_list_horizontal_basic.gui index 7113e09..e6e975b 100644 --- a/example/examples/data_list/basic/data_list_horizontal_basic.gui +++ b/example/examples/data_list/basic/data_list_horizontal_basic.gui @@ -8,7 +8,7 @@ textures { } nodes { type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "root" inherit_alpha: true size_mode: SIZE_MODE_AUTO @@ -28,7 +28,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/pixel" + texture: "druid_example/pixel" id: "view" pivot: PIVOT_W parent: "root" @@ -41,7 +41,7 @@ nodes { y: 350.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "content" pivot: PIVOT_W parent: "view" @@ -73,7 +73,7 @@ nodes { z: 0.961 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "panel" parent: "prefab" inherit_alpha: true diff --git a/example/examples/data_list/cache_with_component/button_component.gui b/example/examples/data_list/cache_with_component/button_component.gui index 108be79..42d14cc 100644 --- a/example/examples/data_list/cache_with_component/button_component.gui +++ b/example/examples/data_list/cache_with_component/button_component.gui @@ -27,7 +27,7 @@ nodes { z: 0.961 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "panel" parent: "root" inherit_alpha: true diff --git a/example/examples/data_list/cache_with_component/cache_with_component.gui b/example/examples/data_list/cache_with_component/cache_with_component.gui index e5fed03..1be4909 100644 --- a/example/examples/data_list/cache_with_component/cache_with_component.gui +++ b/example/examples/data_list/cache_with_component/cache_with_component.gui @@ -8,7 +8,7 @@ textures { } nodes { type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "root" inherit_alpha: true size_mode: SIZE_MODE_AUTO @@ -28,7 +28,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/pixel" + texture: "druid_example/pixel" id: "view" pivot: PIVOT_N parent: "root" @@ -41,7 +41,7 @@ nodes { y: 700.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "content" pivot: PIVOT_N parent: "view" @@ -58,23 +58,5 @@ nodes { inherit_alpha: true template: "/example/examples/data_list/cache_with_component/button_component.gui" } -nodes { - type: TYPE_BOX - id: "button_component/root" - parent: "button_component" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "button_component/panel" - parent: "button_component/root" - template_node_child: true -} -nodes { - type: TYPE_TEXT - id: "button_component/text" - parent: "button_component/root" - template_node_child: true -} material: "/builtins/materials/gui.material" adjust_reference: ADJUST_REFERENCE_PARENT diff --git a/example/examples/druid_examples.lua b/example/examples/druid_examples.lua index 6303e80..62ec6d2 100644 --- a/example/examples/druid_examples.lua +++ b/example/examples/druid_examples.lua @@ -18,8 +18,9 @@ local M = {} ---@field root string ---@field template string|nil ---@field code_url string|nil @URL to the source code ----@field component_class druid.base_component ----@field on_create fun(instance: druid.base_component, output_list: output_list)|nil +---@field component_class druid.base_component|nil +---@field widget_class druid.widget|nil New way to create components +---@field on_create fun(instance: druid.base_component|druid.widget, output_list: output_list)|nil ---@field get_debug_info (fun(instance: druid.base_component):string)|nil ---@field properties_control (fun(instance: druid.base_component, properties_panel: properties_panel))|nil ---@field information_text_id string|nil diff --git a/example/examples/gamepad/gamepad_tester/gamepad_tester.gui b/example/examples/gamepad/gamepad_tester/gamepad_tester.gui index 993e543..4dbc25b 100644 --- a/example/examples/gamepad/gamepad_tester/gamepad_tester.gui +++ b/example/examples/gamepad/gamepad_tester/gamepad_tester.gui @@ -8,7 +8,7 @@ nodes { y: 1000.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "root" inherit_alpha: true visible: false @@ -19,7 +19,7 @@ nodes { y: 100.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "gamepad" parent: "root" inherit_alpha: true @@ -36,66 +36,6 @@ nodes { inherit_alpha: true template: "/example/examples/gamepad/gamepad_tester/templates/gamepad_stick.gui" } -nodes { - type: TYPE_BOX - id: "stick_left/root" - parent: "stick_left" - template_node_child: true -} -nodes { - type: TYPE_PIE - id: "stick_left/background_mask" - parent: "stick_left/root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "stick_left/background" - parent: "stick_left/background_mask" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "stick_left/stick_root" - parent: "stick_left/root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "stick_left/stick_shadow" - parent: "stick_left/stick_root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "stick_left/stick" - parent: "stick_left/stick_root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "stick_left/dot_1" - parent: "stick_left/stick" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "stick_left/dot_2" - parent: "stick_left/stick" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "stick_left/dot_3" - parent: "stick_left/stick" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "stick_left/dot_4" - parent: "stick_left/stick" - template_node_child: true -} nodes { position { x: 200.0 @@ -107,66 +47,6 @@ nodes { inherit_alpha: true template: "/example/examples/gamepad/gamepad_tester/templates/gamepad_stick.gui" } -nodes { - type: TYPE_BOX - id: "stick_right/root" - parent: "stick_right" - template_node_child: true -} -nodes { - type: TYPE_PIE - id: "stick_right/background_mask" - parent: "stick_right/root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "stick_right/background" - parent: "stick_right/background_mask" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "stick_right/stick_root" - parent: "stick_right/root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "stick_right/stick_shadow" - parent: "stick_right/stick_root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "stick_right/stick" - parent: "stick_right/stick_root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "stick_right/dot_1" - parent: "stick_right/stick" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "stick_right/dot_2" - parent: "stick_right/stick" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "stick_right/dot_3" - parent: "stick_right/stick" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "stick_right/dot_4" - parent: "stick_right/stick" - template_node_child: true -} nodes { position { x: -330.0 @@ -177,7 +57,7 @@ nodes { y: 290.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "dpad" parent: "gamepad" inherit_alpha: true @@ -193,32 +73,6 @@ nodes { inherit_alpha: true template: "/example/examples/gamepad/gamepad_tester/templates/gamepad_button.gui" } -nodes { - type: TYPE_BOX - id: "button_left/button" - parent: "button_left" - template_node_child: true -} -nodes { - type: TYPE_TEXT - id: "button_left/text" - parent: "button_left/button" - overridden_fields: 45 - overridden_fields: 46 - template_node_child: true - enabled: false - visible: false -} -nodes { - rotation { - z: 180.0 - } - type: TYPE_BOX - id: "button_left/icon" - parent: "button_left/button" - overridden_fields: 2 - template_node_child: true -} nodes { position { y: 100.0 @@ -229,32 +83,6 @@ nodes { inherit_alpha: true template: "/example/examples/gamepad/gamepad_tester/templates/gamepad_button.gui" } -nodes { - type: TYPE_BOX - id: "button_up/button" - parent: "button_up" - template_node_child: true -} -nodes { - type: TYPE_TEXT - id: "button_up/text" - parent: "button_up/button" - overridden_fields: 45 - overridden_fields: 46 - template_node_child: true - enabled: false - visible: false -} -nodes { - rotation { - z: 90.0 - } - type: TYPE_BOX - id: "button_up/icon" - parent: "button_up/button" - overridden_fields: 2 - template_node_child: true -} nodes { position { x: 100.0 @@ -265,28 +93,6 @@ nodes { inherit_alpha: true template: "/example/examples/gamepad/gamepad_tester/templates/gamepad_button.gui" } -nodes { - type: TYPE_BOX - id: "button_right/button" - parent: "button_right" - template_node_child: true -} -nodes { - type: TYPE_TEXT - id: "button_right/text" - parent: "button_right/button" - overridden_fields: 45 - overridden_fields: 46 - template_node_child: true - enabled: false - visible: false -} -nodes { - type: TYPE_BOX - id: "button_right/icon" - parent: "button_right/button" - template_node_child: true -} nodes { position { y: -100.0 @@ -297,32 +103,6 @@ nodes { inherit_alpha: true template: "/example/examples/gamepad/gamepad_tester/templates/gamepad_button.gui" } -nodes { - type: TYPE_BOX - id: "button_down/button" - parent: "button_down" - template_node_child: true -} -nodes { - type: TYPE_TEXT - id: "button_down/text" - parent: "button_down/button" - overridden_fields: 45 - overridden_fields: 46 - template_node_child: true - enabled: false - visible: false -} -nodes { - rotation { - z: -90.0 - } - type: TYPE_BOX - id: "button_down/icon" - parent: "button_down/button" - overridden_fields: 2 - template_node_child: true -} nodes { position { x: 330.0 @@ -333,7 +113,7 @@ nodes { y: 290.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "buttons" parent: "gamepad" inherit_alpha: true @@ -349,26 +129,6 @@ nodes { inherit_alpha: true template: "/example/examples/gamepad/gamepad_tester/templates/gamepad_button.gui" } -nodes { - type: TYPE_BOX - id: "button_x/button" - parent: "button_x" - template_node_child: true -} -nodes { - type: TYPE_TEXT - id: "button_x/text" - parent: "button_x/button" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "button_x/icon" - parent: "button_x/button" - overridden_fields: 45 - template_node_child: true - enabled: false -} nodes { position { y: 100.0 @@ -379,28 +139,6 @@ nodes { inherit_alpha: true template: "/example/examples/gamepad/gamepad_tester/templates/gamepad_button.gui" } -nodes { - type: TYPE_BOX - id: "button_y/button" - parent: "button_y" - template_node_child: true -} -nodes { - type: TYPE_TEXT - text: "Y" - id: "button_y/text" - parent: "button_y/button" - overridden_fields: 8 - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "button_y/icon" - parent: "button_y/button" - overridden_fields: 45 - template_node_child: true - enabled: false -} nodes { position { x: 100.0 @@ -411,28 +149,6 @@ nodes { inherit_alpha: true template: "/example/examples/gamepad/gamepad_tester/templates/gamepad_button.gui" } -nodes { - type: TYPE_BOX - id: "button_b/button" - parent: "button_b" - template_node_child: true -} -nodes { - type: TYPE_TEXT - text: "B" - id: "button_b/text" - parent: "button_b/button" - overridden_fields: 8 - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "button_b/icon" - parent: "button_b/button" - overridden_fields: 45 - template_node_child: true - enabled: false -} nodes { position { y: -100.0 @@ -443,28 +159,6 @@ nodes { inherit_alpha: true template: "/example/examples/gamepad/gamepad_tester/templates/gamepad_button.gui" } -nodes { - type: TYPE_BOX - id: "button_a/button" - parent: "button_a" - template_node_child: true -} -nodes { - type: TYPE_TEXT - text: "A" - id: "button_a/text" - parent: "button_a/button" - overridden_fields: 8 - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "button_a/icon" - parent: "button_a/button" - overridden_fields: 45 - template_node_child: true - enabled: false -} nodes { position { y: 160.0 @@ -474,7 +168,7 @@ nodes { y: 290.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "buttons_system" parent: "gamepad" inherit_alpha: true @@ -490,33 +184,6 @@ nodes { inherit_alpha: true template: "/example/examples/gamepad/gamepad_tester/templates/gamepad_button.gui" } -nodes { - size { - x: 180.0 - y: 90.0 - } - type: TYPE_BOX - id: "button_back/button" - parent: "button_back" - overridden_fields: 4 - template_node_child: true -} -nodes { - type: TYPE_TEXT - text: "Back" - id: "button_back/text" - parent: "button_back/button" - overridden_fields: 8 - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "button_back/icon" - parent: "button_back/button" - overridden_fields: 45 - template_node_child: true - enabled: false -} nodes { position { x: 110.0 @@ -527,33 +194,6 @@ nodes { inherit_alpha: true template: "/example/examples/gamepad/gamepad_tester/templates/gamepad_button.gui" } -nodes { - size { - x: 180.0 - y: 90.0 - } - type: TYPE_BOX - id: "button_start/button" - parent: "button_start" - overridden_fields: 4 - template_node_child: true -} -nodes { - type: TYPE_TEXT - text: "Start" - id: "button_start/text" - parent: "button_start/button" - overridden_fields: 8 - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "button_start/icon" - parent: "button_start/button" - overridden_fields: 45 - template_node_child: true - enabled: false -} nodes { position { x: -330.0 @@ -564,7 +204,7 @@ nodes { y: 200.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "button_left_bump" parent: "gamepad" inherit_alpha: true @@ -581,33 +221,6 @@ nodes { inherit_alpha: true template: "/example/examples/gamepad/gamepad_tester/templates/gamepad_button.gui" } -nodes { - size { - x: 180.0 - y: 90.0 - } - type: TYPE_BOX - id: "button_l1/button" - parent: "button_l1" - overridden_fields: 4 - template_node_child: true -} -nodes { - type: TYPE_TEXT - text: "L1" - id: "button_l1/text" - parent: "button_l1/button" - overridden_fields: 8 - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "button_l1/icon" - parent: "button_l1/button" - overridden_fields: 45 - template_node_child: true - enabled: false -} nodes { position { y: 60.0 @@ -618,26 +231,6 @@ nodes { inherit_alpha: true template: "/example/examples/gamepad/gamepad_tester/templates/gamepad_trigger.gui" } -nodes { - type: TYPE_BOX - id: "button_l2/button" - parent: "button_l2" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "button_l2/fill" - parent: "button_l2/button" - template_node_child: true -} -nodes { - type: TYPE_TEXT - text: "L2" - id: "button_l2/text" - parent: "button_l2/button" - overridden_fields: 8 - template_node_child: true -} nodes { position { x: 330.0 @@ -648,7 +241,7 @@ nodes { y: 200.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "button_right_bump" parent: "gamepad" inherit_alpha: true @@ -664,33 +257,6 @@ nodes { inherit_alpha: true template: "/example/examples/gamepad/gamepad_tester/templates/gamepad_button.gui" } -nodes { - size { - x: 180.0 - y: 90.0 - } - type: TYPE_BOX - id: "button_r1/button" - parent: "button_r1" - overridden_fields: 4 - template_node_child: true -} -nodes { - type: TYPE_TEXT - text: "R1" - id: "button_r1/text" - parent: "button_r1/button" - overridden_fields: 8 - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "button_r1/icon" - parent: "button_r1/button" - overridden_fields: 45 - template_node_child: true - enabled: false -} nodes { position { y: 60.0 @@ -701,25 +267,5 @@ nodes { inherit_alpha: true template: "/example/examples/gamepad/gamepad_tester/templates/gamepad_trigger.gui" } -nodes { - type: TYPE_BOX - id: "button_r2/button" - parent: "button_r2" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "button_r2/fill" - parent: "button_r2/button" - template_node_child: true -} -nodes { - type: TYPE_TEXT - text: "R2" - id: "button_r2/text" - parent: "button_r2/button" - overridden_fields: 8 - template_node_child: true -} material: "/builtins/materials/gui.material" adjust_reference: ADJUST_REFERENCE_PARENT diff --git a/example/examples/gamepad/gamepad_tester/templates/gamepad_button.gui b/example/examples/gamepad/gamepad_tester/templates/gamepad_button.gui index 93d6581..b666dda 100644 --- a/example/examples/gamepad/gamepad_tester/templates/gamepad_button.gui +++ b/example/examples/gamepad/gamepad_tester/templates/gamepad_button.gui @@ -17,7 +17,7 @@ nodes { z: 0.322 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "button" inherit_alpha: true slice9 { @@ -65,7 +65,7 @@ nodes { y: 0.984 } type: TYPE_BOX - texture: "druid/icon_arrow" + texture: "druid_example/icon_arrow" id: "icon" parent: "button" inherit_alpha: true diff --git a/example/examples/gamepad/gamepad_tester/templates/gamepad_stick.gui b/example/examples/gamepad/gamepad_tester/templates/gamepad_stick.gui index 3505a94..215dc15 100644 --- a/example/examples/gamepad/gamepad_tester/templates/gamepad_stick.gui +++ b/example/examples/gamepad/gamepad_tester/templates/gamepad_stick.gui @@ -17,7 +17,7 @@ nodes { z: 0.322 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "root" inherit_alpha: true } @@ -46,7 +46,7 @@ nodes { z: 0.322 } type: TYPE_BOX - texture: "druid/pixel" + texture: "druid_example/pixel" id: "background" parent: "background_mask" inherit_alpha: true @@ -59,7 +59,7 @@ nodes { } nodes { type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "stick_root" parent: "root" inherit_alpha: true @@ -77,7 +77,7 @@ nodes { z: 0.0 } type: TYPE_BOX - texture: "druid/ui_circle_64_blur_8" + texture: "druid_example/ui_circle_64_blur_8" id: "stick_shadow" parent: "stick_root" inherit_alpha: true @@ -95,7 +95,7 @@ nodes { z: 0.49 } type: TYPE_BOX - texture: "druid/ui_circle_64" + texture: "druid_example/ui_circle_64" id: "stick" parent: "stick_root" inherit_alpha: true @@ -121,7 +121,7 @@ nodes { z: 0.322 } type: TYPE_BOX - texture: "druid/ui_circle_16" + texture: "druid_example/ui_circle_16" id: "dot_1" parent: "stick" inherit_alpha: true @@ -141,7 +141,7 @@ nodes { z: 0.322 } type: TYPE_BOX - texture: "druid/ui_circle_16" + texture: "druid_example/ui_circle_16" id: "dot_2" parent: "stick" inherit_alpha: true @@ -161,7 +161,7 @@ nodes { z: 0.322 } type: TYPE_BOX - texture: "druid/ui_circle_16" + texture: "druid_example/ui_circle_16" id: "dot_3" parent: "stick" inherit_alpha: true @@ -181,7 +181,7 @@ nodes { z: 0.322 } type: TYPE_BOX - texture: "druid/ui_circle_16" + texture: "druid_example/ui_circle_16" id: "dot_4" parent: "stick" inherit_alpha: true diff --git a/example/examples/gamepad/gamepad_tester/templates/gamepad_trigger.gui b/example/examples/gamepad/gamepad_tester/templates/gamepad_trigger.gui index e057ec9..3403f00 100644 --- a/example/examples/gamepad/gamepad_tester/templates/gamepad_trigger.gui +++ b/example/examples/gamepad/gamepad_tester/templates/gamepad_trigger.gui @@ -17,7 +17,7 @@ nodes { z: 0.322 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "button" inherit_alpha: true slice9 { @@ -41,7 +41,7 @@ nodes { z: 0.961 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "fill" pivot: PIVOT_W parent: "button" diff --git a/example/examples/gamepad/on_screen_control/on_screen_control.gui b/example/examples/gamepad/on_screen_control/on_screen_control.gui index 774696e..8fab1e3 100644 --- a/example/examples/gamepad/on_screen_control/on_screen_control.gui +++ b/example/examples/gamepad/on_screen_control/on_screen_control.gui @@ -13,7 +13,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/ui_circle_64" + texture: "druid_example/ui_circle_64" id: "root" inherit_alpha: true slice9 { @@ -34,7 +34,7 @@ nodes { z: 0.624 } type: TYPE_BOX - texture: "druid/ui_circle_64" + texture: "druid_example/ui_circle_64" id: "character" parent: "root" inherit_alpha: true @@ -56,7 +56,7 @@ nodes { z: 0.157 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "eye_left" parent: "character" inherit_alpha: true @@ -72,7 +72,7 @@ nodes { y: 0.984 } type: TYPE_BOX - texture: "druid/ui_circle_8" + texture: "druid_example/ui_circle_8" id: "eye_left_blick" parent: "eye_left" inherit_alpha: true @@ -89,7 +89,7 @@ nodes { z: 0.157 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "eye_right" parent: "character" inherit_alpha: true @@ -105,7 +105,7 @@ nodes { y: 0.984 } type: TYPE_BOX - texture: "druid/ui_circle_8" + texture: "druid_example/ui_circle_8" id: "eye_right_blick" parent: "eye_right" inherit_alpha: true @@ -133,66 +133,6 @@ nodes { parent: "on_screen_input/root" template_node_child: true } -nodes { - type: TYPE_BOX - id: "on_screen_input/on_screen_stick/root" - parent: "on_screen_input/on_screen_stick" - template_node_child: true -} -nodes { - type: TYPE_PIE - id: "on_screen_input/on_screen_stick/background_mask" - parent: "on_screen_input/on_screen_stick/root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "on_screen_input/on_screen_stick/background" - parent: "on_screen_input/on_screen_stick/background_mask" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "on_screen_input/on_screen_stick/stick_root" - parent: "on_screen_input/on_screen_stick/root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "on_screen_input/on_screen_stick/stick_shadow" - parent: "on_screen_input/on_screen_stick/stick_root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "on_screen_input/on_screen_stick/stick" - parent: "on_screen_input/on_screen_stick/stick_root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "on_screen_input/on_screen_stick/dot_1" - parent: "on_screen_input/on_screen_stick/stick" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "on_screen_input/on_screen_stick/dot_2" - parent: "on_screen_input/on_screen_stick/stick" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "on_screen_input/on_screen_stick/dot_3" - parent: "on_screen_input/on_screen_stick/stick" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "on_screen_input/on_screen_stick/dot_4" - parent: "on_screen_input/on_screen_stick/stick" - template_node_child: true -} nodes { type: TYPE_BOX id: "on_screen_input/on_screen_button" @@ -205,23 +145,5 @@ nodes { parent: "on_screen_input/on_screen_button" template_node_child: true } -nodes { - type: TYPE_BOX - id: "on_screen_input/button_action/button" - parent: "on_screen_input/button_action" - template_node_child: true -} -nodes { - type: TYPE_TEXT - id: "on_screen_input/button_action/text" - parent: "on_screen_input/button_action/button" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "on_screen_input/button_action/icon" - parent: "on_screen_input/button_action/button" - template_node_child: true -} material: "/builtins/materials/gui.material" adjust_reference: ADJUST_REFERENCE_PARENT diff --git a/example/examples/gamepad/on_screen_control/on_screen_input.gui b/example/examples/gamepad/on_screen_control/on_screen_input.gui index f005c06..5a6dc92 100644 --- a/example/examples/gamepad/on_screen_control/on_screen_input.gui +++ b/example/examples/gamepad/on_screen_control/on_screen_input.gui @@ -22,71 +22,6 @@ nodes { inherit_alpha: true template: "/example/examples/gamepad/gamepad_tester/templates/gamepad_stick.gui" } -nodes { - size { - x: 400.0 - y: 400.0 - } - type: TYPE_BOX - id: "on_screen_stick/root" - parent: "on_screen_stick" - overridden_fields: 4 - template_node_child: true -} -nodes { - type: TYPE_PIE - id: "on_screen_stick/background_mask" - parent: "on_screen_stick/root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "on_screen_stick/background" - parent: "on_screen_stick/background_mask" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "on_screen_stick/stick_root" - parent: "on_screen_stick/root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "on_screen_stick/stick_shadow" - parent: "on_screen_stick/stick_root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "on_screen_stick/stick" - parent: "on_screen_stick/stick_root" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "on_screen_stick/dot_1" - parent: "on_screen_stick/stick" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "on_screen_stick/dot_2" - parent: "on_screen_stick/stick" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "on_screen_stick/dot_3" - parent: "on_screen_stick/stick" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "on_screen_stick/dot_4" - parent: "on_screen_stick/stick" - template_node_child: true -} nodes { position { x: 300.0 @@ -108,25 +43,5 @@ nodes { inherit_alpha: true template: "/example/examples/gamepad/gamepad_tester/templates/gamepad_button.gui" } -nodes { - type: TYPE_BOX - id: "button_action/button" - parent: "button_action" - template_node_child: true -} -nodes { - type: TYPE_TEXT - id: "button_action/text" - parent: "button_action/button" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "button_action/icon" - parent: "button_action/button" - overridden_fields: 45 - template_node_child: true - enabled: false -} material: "/builtins/materials/gui.material" adjust_reference: ADJUST_REFERENCE_PARENT diff --git a/example/examples/intro/intro/intro.gui b/example/examples/intro/intro/intro.gui index 61de634..78283a9 100644 --- a/example/examples/intro/intro/intro.gui +++ b/example/examples/intro/intro/intro.gui @@ -25,7 +25,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/ui_circle_64" + texture: "druid_example/ui_circle_64" id: "root" inherit_alpha: true slice9 { @@ -158,7 +158,7 @@ nodes { y: -364.0 } type: TYPE_BOX - texture: "druid/icon_heart" + texture: "druid_example/icon_heart" id: "icon_heart1" parent: "root" inherit_alpha: true @@ -170,7 +170,7 @@ nodes { y: -364.0 } type: TYPE_BOX - texture: "druid/icon_heart" + texture: "druid_example/icon_heart" id: "icon_heart2" parent: "root" inherit_alpha: true @@ -183,7 +183,7 @@ nodes { y: -364.0 } type: TYPE_BOX - texture: "druid/icon_heart" + texture: "druid_example/icon_heart" id: "icon_heart3" parent: "root" inherit_alpha: true diff --git a/example/examples/layout/basic/basic_layout.gui b/example/examples/layout/basic/basic_layout.gui index c411061..ed74c30 100644 --- a/example/examples/layout/basic/basic_layout.gui +++ b/example/examples/layout/basic/basic_layout.gui @@ -13,7 +13,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/ui_circle_64" + texture: "druid_example/ui_circle_64" id: "root" inherit_alpha: true slice9 { @@ -29,7 +29,7 @@ nodes { y: 500.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "layout" parent: "root" inherit_alpha: true @@ -46,7 +46,7 @@ nodes { z: 0.961 } type: TYPE_BOX - texture: "druid/ui_circle_16" + texture: "druid_example/ui_circle_16" id: "prefab" parent: "layout" inherit_alpha: true diff --git a/example/examples/panthera/animation_blend/animation_blend.gui b/example/examples/panthera/animation_blend/animation_blend.gui index ee5efc2..b6a0e2e 100644 --- a/example/examples/panthera/animation_blend/animation_blend.gui +++ b/example/examples/panthera/animation_blend/animation_blend.gui @@ -21,7 +21,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/ui_circle_64" + texture: "druid_example/ui_circle_64" id: "root" inherit_alpha: true slice9 { diff --git a/example/examples/panthera/basic_animation/basic_animation.gui b/example/examples/panthera/basic_animation/basic_animation.gui index 0dd7236..4eb714a 100644 --- a/example/examples/panthera/basic_animation/basic_animation.gui +++ b/example/examples/panthera/basic_animation/basic_animation.gui @@ -20,19 +20,5 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_blue.gui" } -nodes { - type: TYPE_BOX - id: "button/root" - parent: "button" - template_node_child: true -} -nodes { - type: TYPE_TEXT - text: "Hover Me!" - id: "button/text" - parent: "button/root" - overridden_fields: 8 - template_node_child: true -} material: "/builtins/materials/gui.material" adjust_reference: ADJUST_REFERENCE_PARENT diff --git a/example/examples/widgets/hover_hint/hover_hint.gui b/example/examples/widgets/hover_hint/hover_hint.gui index ce4b3c2..f620a93 100644 --- a/example/examples/widgets/hover_hint/hover_hint.gui +++ b/example/examples/widgets/hover_hint/hover_hint.gui @@ -27,7 +27,7 @@ nodes { z: 0.157 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "panel_hint" parent: "root" inherit_alpha: true diff --git a/example/examples/widgets/hover_hint/hover_hint_example.gui b/example/examples/widgets/hover_hint/hover_hint_example.gui index 61ca0d8..9c19b51 100644 --- a/example/examples/widgets/hover_hint/hover_hint_example.gui +++ b/example/examples/widgets/hover_hint/hover_hint_example.gui @@ -13,7 +13,7 @@ nodes { z: 0.204 } type: TYPE_BOX - texture: "druid/ui_circle_64" + texture: "druid_example/ui_circle_64" id: "root" inherit_alpha: true slice9 { @@ -33,24 +33,6 @@ nodes { inherit_alpha: true template: "/example/examples/widgets/hover_hint/hover_hint.gui" } -nodes { - type: TYPE_BOX - id: "hover_hint/root" - parent: "hover_hint" - template_node_child: true -} -nodes { - type: TYPE_BOX - id: "hover_hint/panel_hint" - parent: "hover_hint/root" - template_node_child: true -} -nodes { - type: TYPE_TEXT - id: "hover_hint/text_hint" - parent: "hover_hint/panel_hint" - template_node_child: true -} nodes { position { y: 100.0 @@ -65,7 +47,7 @@ nodes { z: 0.624 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "node_yellow" parent: "root" inherit_alpha: true @@ -90,7 +72,7 @@ nodes { z: 0.608 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "node_red" parent: "root" inherit_alpha: true @@ -115,7 +97,7 @@ nodes { z: 0.961 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "node_blue" parent: "root" inherit_alpha: true @@ -140,7 +122,7 @@ nodes { z: 0.62 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "node_green" parent: "root" inherit_alpha: true diff --git a/example/examples/widgets/memory_panel/example_memory_panel.gui b/example/examples/widgets/memory_panel/example_memory_panel.gui index 2732694..44ee04a 100644 --- a/example/examples/widgets/memory_panel/example_memory_panel.gui +++ b/example/examples/widgets/memory_panel/example_memory_panel.gui @@ -1,6 +1,18 @@ +nodes { + size { + x: 200.0 + y: 100.0 + } + type: TYPE_BOX + id: "root" + inherit_alpha: true + size_mode: SIZE_MODE_AUTO + visible: false +} nodes { type: TYPE_TEMPLATE id: "memory_panel" + parent: "root" inherit_alpha: true template: "/druid/widget/memory_panel/memory_panel.gui" } diff --git a/example/examples/windows/window_confirmation/window_confirmation.gui b/example/examples/windows/window_confirmation/window_confirmation.gui index 185880f..2c11af3 100644 --- a/example/examples/windows/window_confirmation/window_confirmation.gui +++ b/example/examples/windows/window_confirmation/window_confirmation.gui @@ -17,7 +17,7 @@ nodes { y: 500.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "root" adjust_mode: ADJUST_MODE_STRETCH inherit_alpha: true @@ -40,7 +40,7 @@ nodes { z: 0.322 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "window" parent: "root" inherit_alpha: true @@ -65,7 +65,7 @@ nodes { z: 0.624 } type: TYPE_BOX - texture: "druid/ui_rounded_top_32" + texture: "druid_example/ui_rounded_top_32" id: "panel_header" pivot: PIVOT_N parent: "window" @@ -135,7 +135,7 @@ nodes { z: 0.322 } type: TYPE_BOX - texture: "druid/icon_cross" + texture: "druid_example/icon_cross" id: "icon_close" parent: "button_close" inherit_alpha: true @@ -202,18 +202,6 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_green.gui" } -nodes { - type: TYPE_BOX - id: "button_accept/root" - parent: "button_accept" - template_node_child: true -} -nodes { - type: TYPE_TEXT - id: "button_accept/text" - parent: "button_accept/root" - template_node_child: true -} nodes { position { x: 160.0 @@ -225,18 +213,6 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_red.gui" } -nodes { - type: TYPE_BOX - id: "button_decline/root" - parent: "button_decline" - template_node_child: true -} -nodes { - type: TYPE_TEXT - id: "button_decline/text" - parent: "button_decline/root" - template_node_child: true -} layers { name: "druid" } diff --git a/example/examples/windows/window_info/window_info.gui b/example/examples/windows/window_info/window_info.gui index 3601b50..d216457 100644 --- a/example/examples/windows/window_info/window_info.gui +++ b/example/examples/windows/window_info/window_info.gui @@ -17,7 +17,7 @@ nodes { y: 500.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "root" adjust_mode: ADJUST_MODE_STRETCH inherit_alpha: true @@ -40,7 +40,7 @@ nodes { z: 0.322 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "window" parent: "root" inherit_alpha: true @@ -65,7 +65,7 @@ nodes { z: 0.961 } type: TYPE_BOX - texture: "druid/ui_rounded_top_32" + texture: "druid_example/ui_rounded_top_32" id: "panel_header" pivot: PIVOT_N parent: "window" @@ -135,7 +135,7 @@ nodes { z: 0.322 } type: TYPE_BOX - texture: "druid/icon_cross" + texture: "druid_example/icon_cross" id: "icon_close" parent: "button_close" inherit_alpha: true @@ -201,18 +201,6 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_green.gui" } -nodes { - type: TYPE_BOX - id: "button_accept/root" - parent: "button_accept" - template_node_child: true -} -nodes { - type: TYPE_TEXT - id: "button_accept/text" - parent: "button_accept/root" - template_node_child: true -} layers { name: "druid" } diff --git a/example/examples/windows/window_language/window_language.gui b/example/examples/windows/window_language/window_language.gui index 4a5bd26..c3ba2cd 100644 --- a/example/examples/windows/window_language/window_language.gui +++ b/example/examples/windows/window_language/window_language.gui @@ -17,7 +17,7 @@ nodes { y: 580.0 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "root" adjust_mode: ADJUST_MODE_STRETCH inherit_alpha: true @@ -40,7 +40,7 @@ nodes { z: 0.322 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "window" parent: "root" inherit_alpha: true @@ -65,7 +65,7 @@ nodes { z: 0.961 } type: TYPE_BOX - texture: "druid/ui_rounded_top_32" + texture: "druid_example/ui_rounded_top_32" id: "panel_header" pivot: PIVOT_N parent: "window" @@ -135,7 +135,7 @@ nodes { z: 0.322 } type: TYPE_BOX - texture: "druid/icon_cross" + texture: "druid_example/icon_cross" id: "icon_close" parent: "button_close" inherit_alpha: true @@ -173,30 +173,6 @@ nodes { inherit_alpha: true template: "/example/templates/button_text_white.gui" } -nodes { - size { - x: 240.0 - y: 70.0 - } - type: TYPE_BOX - id: "button/root" - parent: "button" - overridden_fields: 4 - template_node_child: true -} -nodes { - size { - x: 220.0 - y: 50.0 - } - type: TYPE_TEXT - text: "English" - id: "button/text" - parent: "button/root" - overridden_fields: 4 - overridden_fields: 8 - template_node_child: true -} layers { name: "druid" } diff --git a/example/templates/button_text_blue.gui b/example/templates/button_text_blue.gui index 1560d06..305913d 100644 --- a/example/templates/button_text_blue.gui +++ b/example/templates/button_text_blue.gui @@ -17,7 +17,7 @@ nodes { z: 0.961 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "root" layer: "druid" inherit_alpha: true diff --git a/example/templates/button_text_green.gui b/example/templates/button_text_green.gui index 543f4fa..81921b6 100644 --- a/example/templates/button_text_green.gui +++ b/example/templates/button_text_green.gui @@ -17,7 +17,7 @@ nodes { z: 0.62 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "root" layer: "druid" inherit_alpha: true diff --git a/example/templates/button_text_red.gui b/example/templates/button_text_red.gui index 07b46e0..1d8efd6 100644 --- a/example/templates/button_text_red.gui +++ b/example/templates/button_text_red.gui @@ -17,7 +17,7 @@ nodes { z: 0.608 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "root" layer: "druid" inherit_alpha: true diff --git a/example/templates/button_text_white.gui b/example/templates/button_text_white.gui index 8398f81..6925cc8 100644 --- a/example/templates/button_text_white.gui +++ b/example/templates/button_text_white.gui @@ -16,7 +16,7 @@ nodes { y: 0.984 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "root" layer: "druid" inherit_alpha: true diff --git a/example/templates/button_text_yellow.gui b/example/templates/button_text_yellow.gui index 2e06dc6..2bd7677 100644 --- a/example/templates/button_text_yellow.gui +++ b/example/templates/button_text_yellow.gui @@ -17,7 +17,7 @@ nodes { z: 0.624 } type: TYPE_BOX - texture: "druid/ui_circle_32" + texture: "druid_example/ui_circle_32" id: "root" layer: "druid" inherit_alpha: true diff --git a/example/templates/input.gui b/example/templates/input.gui index 4389038..508eb27 100644 --- a/example/templates/input.gui +++ b/example/templates/input.gui @@ -17,7 +17,7 @@ nodes { z: 0.49 } type: TYPE_BOX - texture: "druid/rect_round2_width1" + texture: "druid_example/rect_round2_width1" id: "root" inherit_alpha: true slice9 { diff --git a/example/templates/rich_input.gui b/example/templates/rich_input.gui index 0f109d7..89023bd 100644 --- a/example/templates/rich_input.gui +++ b/example/templates/rich_input.gui @@ -22,7 +22,7 @@ nodes { y: 80.0 } type: TYPE_BOX - texture: "druid/rect_round2_width1" + texture: "druid_example/rect_round2_width1" id: "button" parent: "root" inherit_alpha: true @@ -100,7 +100,7 @@ nodes { z: 0.961 } type: TYPE_BOX - texture: "druid/ui_circle_16" + texture: "druid_example/ui_circle_16" id: "cursor_node" parent: "button" inherit_alpha: true diff --git a/example/templates/slider.gui b/example/templates/slider.gui index a1f363a..ce3cb31 100644 --- a/example/templates/slider.gui +++ b/example/templates/slider.gui @@ -13,7 +13,7 @@ nodes { z: 0.157 } type: TYPE_BOX - texture: "druid/empty" + texture: "druid_example/empty" id: "root" inherit_alpha: true } @@ -28,7 +28,7 @@ nodes { z: 0.157 } type: TYPE_BOX - texture: "druid/ui_circle_8" + texture: "druid_example/ui_circle_8" id: "slider_back" parent: "root" inherit_alpha: true @@ -53,7 +53,7 @@ nodes { z: 0.761 } type: TYPE_BOX - texture: "druid/ui_circle_8" + texture: "druid_example/ui_circle_8" id: "slider_pin" parent: "root" inherit_alpha: true