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

Update druid component template

Browse Source
This commit is contained in:
Insality 2024-10-15 00:56:19 +03:00
parent 87f52551e2
commit a0113d3356
3 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
druid/editor_scripts/component.lua_template
View File

@ -1,9 +1,9 @@
--- For component interest functions --- For component interest functions
--- see https://github.com/Insality/druid/blob/develop/docs_md/02-creating_custom_components.md --- see https://github.com/Insality/druid/blob/master/docs_md/02-creating_custom_components.md
--- Require this component in you gui file: --- Require this component in you gui file:
--- local {COMPONENT_NAME} = require("{COMPONENT_PATH}") --- $ local {COMPONENT_NAME} = require("{COMPONENT_PATH}")
--- And create this component via: --- And create this component via:
--- self.{COMPONENT_TYPE} = self.druid:new({COMPONENT_NAME}, template, nodes) --- $ self.{COMPONENT_TYPE} = self.druid:new({COMPONENT_NAME}, template, nodes)
local component = require("druid.component") local component = require("druid.component")
@ -11,10 +11,6 @@ local component = require("druid.component")
---@field druid druid_instance{COMPONENT_ANNOTATIONS} ---@field druid druid_instance{COMPONENT_ANNOTATIONS}
local M = component.create("{COMPONENT_TYPE}") local M = component.create("{COMPONENT_TYPE}")
local SCHEME = {
{SCHEME_LIST}
}
---@param template string ---@param template string
---@param nodes table<hash, node> ---@param nodes table<hash, node>
@ -22,9 +18,5 @@ function M:init(template, nodes)
self.druid = self:get_druid(template, nodes){COMPONENT_DEFINE} self.druid = self:get_druid(template, nodes){COMPONENT_DEFINE}
end end
function M:on_remove()
end
{COMPONENT_FUNCTIONS} {COMPONENT_FUNCTIONS}
return M return M

24
druid/editor_scripts/create_druid_component.py
View File

@ -28,53 +28,53 @@ def process_component(node_name, component_name):
if node_name == "root": if node_name == "root":
component_annotations += "\n---@field root node" component_annotations += "\n---@field root node"
component_define += "\n\tself.root = self:get_node(SCHEME.ROOT)" component_define += "\n\tself.root = self:get_node(\"root\")"
if node_name.startswith("button"): if node_name.startswith("button"):
component_annotations += "\n---@field {0} druid.button".format(node_name) component_annotations += "\n---@field {0} druid.button".format(node_name)
component_functions += "\nfunction M:_on_{0}()\n\tprint(\"Click on {0}\")\nend\n\n".format(node_name) component_functions += "\nfunction M:_on_{0}()\n\tprint(\"Click on {0}\")\nend\n\n".format(node_name)
component_define += "\n\tself.{0} = self.druid:new_button(SCHEME.{1}, self._on_{0})".format(node_name, get_id(node_name)) component_define += "\n\tself.{0} = self.druid:new_button(\"{1}\", self._on_{0})".format(node_name, node_name)
if node_name.startswith("text"): if node_name.startswith("text"):
component_annotations += "\n---@field {0} druid.text".format(node_name) component_annotations += "\n---@field {0} druid.text".format(node_name)
component_define += "\n\tself.{0} = self.druid:new_text(SCHEME.{1})".format(node_name, get_id(node_name)) component_define += "\n\tself.{0} = self.druid:new_text(\"{1}\")".format(node_name, node_name)
if node_name.startswith("lang_text"): if node_name.startswith("lang_text"):
component_annotations += "\n---@field {0} druid.text".format(node_name) component_annotations += "\n---@field {0} druid.text".format(node_name)
component_define += "\n\tself.{0} = self.druid:new_lang_text(SCHEME.{1}, \"lang_id\")".format(node_name, get_id(node_name)) component_define += "\n\tself.{0} = self.druid:new_lang_text(\"{1}\", \"lang_id\")".format(node_name, node_name)
if node_name.startswith("grid") or node_name.startswith("static_grid"): if node_name.startswith("grid") or node_name.startswith("static_grid"):
component_annotations += "\n---@field {0} druid.static_grid".format(node_name) component_annotations += "\n---@field {0} druid.static_grid".format(node_name)
component_define += "\n--TODO: Replace prefab_name with grid element prefab" component_define += "\n--TODO: Replace prefab_name with grid element prefab"
component_define += "\n\tself.{0} = self.druid:new_static_grid(SCHEME.{1}, \"prefab_name\", 1)".format(node_name, get_id(node_name)) component_define += "\n\tself.{0} = self.druid:new_static_grid(\"{1}\", \"prefab_name\", 1)".format(node_name, node_name)
if node_name.startswith("dynamic_grid"): if node_name.startswith("dynamic_grid"):
component_annotations += "\n---@field {0} druid.dynamic_grid".format(node_name) component_annotations += "\n---@field {0} druid.dynamic_grid".format(node_name)
component_define += "\n\tself.{0} = self.druid:new_dynamic_grid(SCHEME.{1})".format(node_name, get_id(node_name)) component_define += "\n\tself.{0} = self.druid:new_dynamic_grid(\"{1}\")".format(node_name, node_name)
if node_name.startswith("scroll_view"): if node_name.startswith("scroll_view"):
field_name = node_name.replace("_view", "") field_name = node_name.replace("_view", "")
content_name = node_name.replace("_view", "_content") content_name = node_name.replace("_view", "_content")
component_annotations += "\n---@field {0} druid.scroll".format(field_name) component_annotations += "\n---@field {0} druid.scroll".format(field_name)
component_define += "\n\tself.{0} = self.druid:new_scroll(SCHEME.{1}, SCHEME.{2})".format(field_name, get_id(node_name), get_id(content_name)) component_define += "\n\tself.{0} = self.druid:new_scroll(\"{1}\", \"{2}\")".format(field_name, node_name, content_name)
if node_name.startswith("blocker"): if node_name.startswith("blocker"):
component_annotations += "\n---@field {0} druid.blocker".format(node_name) component_annotations += "\n---@field {0} druid.blocker".format(node_name)
component_define += "\n\tself.{0} = self.druid:new_blocker(SCHEME.{1})".format(node_name, get_id(node_name)) component_define += "\n\tself.{0} = self.druid:new_blocker(\"{1}\")".format(node_name, node_name)
if node_name.startswith("slider"): if node_name.startswith("slider"):
component_annotations += "\n---@field {0} druid.slider".format(node_name) component_annotations += "\n---@field {0} druid.slider".format(node_name)
component_define += "\n--TODO: Replace slider end position. It should be only vertical or horizontal" component_define += "\n--TODO: Replace slider end position. It should be only vertical or horizontal"
component_define += "\n\tself.{0} = self.druid:new_slider(SCHEME.{1}, vmath.vector3(100, 0, 0), self._on_{0}_change)".format(node_name, get_id(node_name)) component_define += "\n\tself.{0} = self.druid:new_slider(\"{1}\", vmath.vector3(100, 0, 0), self._on_{0}_change)".format(node_name, node_name)
component_functions += "\nfunction M:_on_{0}_change(value)\n\tprint(\"Slider change:\", value)\nend\n\n".format(node_name) component_functions += "\nfunction M:_on_{0}_change(value)\n\tprint(\"Slider change:\", value)\nend\n\n".format(node_name)
if node_name.startswith("progress"): if node_name.startswith("progress"):
component_annotations += "\n---@field {0} druid.progress".format(node_name) component_annotations += "\n---@field {0} druid.progress".format(node_name)
component_define += "\n\tself.{0} = self.druid:new_progress(SCHEME.{1}, \"x\")".format(node_name, get_id(node_name)) component_define += "\n\tself.{0} = self.druid:new_progress(\"{1}\", \"x\")".format(node_name, get_id(node_name))
if node_name.startswith("timer"): if node_name.startswith("timer"):
component_annotations += "\n---@field {0} druid.timer".format(node_name) component_annotations += "\n---@field {0} druid.timer".format(node_name)
component_define += "\n\tself.{0} = self.druid:new_timer(SCHEME.{1}, 59, 0, self._on_{0}_end)".format(node_name, get_id(node_name)) component_define += "\n\tself.{0} = self.druid:new_timer(\"{1}\", 59, 0, self._on_{0}_end)".format(node_name, get_id(node_name))
component_functions += "\nfunction M:_on_{0}_end()\n\tprint(\"Timer {0} trigger\")\nend\n\n".format(node_name) component_functions += "\nfunction M:_on_{0}_end()\n\tprint(\"Timer {0} trigger\")\nend\n\n".format(node_name)
@ -126,7 +126,7 @@ def main():
filedata = filedata.replace("{COMPONENT_DEFINE}", component_define) filedata = filedata.replace("{COMPONENT_DEFINE}", component_define)
filedata = filedata.replace("{COMPONENT_FUNCTIONS}", component_functions) filedata = filedata.replace("{COMPONENT_FUNCTIONS}", component_functions)
filedata = filedata.replace("{COMPONENT_ANNOTATIONS}", component_annotations) filedata = filedata.replace("{COMPONENT_ANNOTATIONS}", component_annotations)
filedata = filedata.replace("{SCHEME_LIST}", ",\n".join(scheme_list)) #filedata = filedata.replace("{SCHEME_LIST}", ",\n".join(scheme_list))
output_file = open(output_full_path, "w") output_file = open(output_full_path, "w")
output_file.write(filedata) output_file.write(filedata)

12
druid/extended/figma_layout.lua
View File

@ -93,14 +93,16 @@ function M:set_type(type)
end end
---@param is_hug boolean
---@param is_hug_width boolean
---@param is_hug_height boolean
---@return druid.figma_layout ---@return druid.figma_layout
function M:set_hug_content(entity, is_hug) function M:set_hug_content(is_hug_width, is_hug_height)
self.is_resize_width = is_hug self.is_resize_width = is_hug_width or false
self.is_resize_height = is_hug self.is_resize_height = is_hug_height or false
self.is_dirty = true self.is_dirty = true
return entity return self
end end
---@param node_or_node_id string|node ---@param node_or_node_id string|node