diff --git a/game/addons/mesh_data_resource_editor/MIDGizmo.gd b/game/addons/mesh_data_resource_editor/MIDGizmo.gd index 6afc3f90..eaf7fe03 100644 --- a/game/addons/mesh_data_resource_editor/MIDGizmo.gd +++ b/game/addons/mesh_data_resource_editor/MIDGizmo.gd @@ -1034,13 +1034,11 @@ func uv_unwrap() -> void: if mdr_arr.size() != ArrayMesh.ARRAY_MAX || mdr_arr[ArrayMesh.ARRAY_VERTEX] == null || mdr_arr[ArrayMesh.ARRAY_VERTEX].size() == 0: return - var mesh : Array = _mdr.get_array() + var uvs : PoolVector2Array = MeshUtils.uv_unwrap(mdr_arr) - var uvs : PoolVector2Array = MeshUtils.uv_unwrap(mesh) - - if uvs.size() != mdr_arr[ArrayMesh.ARRAY_VERTEX]: + if uvs.size() != mdr_arr[ArrayMesh.ARRAY_VERTEX].size(): print("Error: Could not unwrap mesh!") return - mesh[ArrayMesh.ARRAY_TEX_UV] = uvs - _mdr.set_array(mesh) + mdr_arr[ArrayMesh.ARRAY_TEX_UV] = uvs + _mdr.set_array(mdr_arr) diff --git a/game/addons/mesh_data_resource_editor/plugin.gd b/game/addons/mesh_data_resource_editor/plugin.gd index 5ab631c5..3f0aa1e1 100644 --- a/game/addons/mesh_data_resource_editor/plugin.gd +++ b/game/addons/mesh_data_resource_editor/plugin.gd @@ -231,5 +231,5 @@ func apply_seam(): func uv_unwrap() -> void: for g in active_gizmos: - g.apply_seam() + g.uv_unwrap() diff --git a/game/ui/theme/ui_theme.tres b/game/ui/theme/ui_theme.tres index 5a97dde7..8843c57e 100644 --- a/game/ui/theme/ui_theme.tres +++ b/game/ui/theme/ui_theme.tres @@ -100,7 +100,7 @@ Button/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) Button/colors/font_color_hover = Color( 0.941176, 0.941176, 0.941176, 1 ) Button/colors/font_color_pressed = Color( 1, 1, 1, 1 ) Button/constants/hseparation = 0 -Button/fonts/font = null +Button/fonts/font = ExtResource( 6 ) Button/styles/disabled = ExtResource( 2 ) Button/styles/focus = ExtResource( 3 ) Button/styles/hover = ExtResource( 5 ) @@ -113,7 +113,7 @@ CheckBox/colors/font_color_hover_pressed = Color( 1, 1, 1, 1 ) CheckBox/colors/font_color_pressed = Color( 1, 1, 1, 1 ) CheckBox/constants/check_vadjust = 0 CheckBox/constants/hseparation = 4 -CheckBox/fonts/font = null +CheckBox/fonts/font = ExtResource( 6 ) CheckBox/icons/checked = ExtResource( 19 ) CheckBox/icons/radio_checked = ExtResource( 17 ) CheckBox/icons/radio_unchecked = ExtResource( 16 ) @@ -131,7 +131,7 @@ CheckButton/colors/font_color_hover_pressed = Color( 1, 1, 1, 1 ) CheckButton/colors/font_color_pressed = Color( 1, 1, 1, 1 ) CheckButton/constants/check_vadjust = 0 CheckButton/constants/hseparation = 4 -CheckButton/fonts/font = null +CheckButton/fonts/font = ExtResource( 6 ) CheckButton/icons/off = ExtResource( 18 ) CheckButton/icons/on = ExtResource( 19 ) CheckButton/styles/disabled = ExtResource( 2 ) @@ -164,7 +164,7 @@ ItemList/constants/hseparation = 4 ItemList/constants/icon_margin = 4 ItemList/constants/line_separation = 4 ItemList/constants/vseparation = 2 -ItemList/fonts/font = null +ItemList/fonts/font = ExtResource( 6 ) ItemList/styles/bg = ExtResource( 8 ) ItemList/styles/bg_focus = ExtResource( 14 ) ItemList/styles/cursor = null @@ -178,7 +178,7 @@ LineEdit/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 ) LineEdit/colors/font_color_selected = Color( 0, 0, 0, 1 ) LineEdit/colors/selection_color = Color( 0.490196, 0.490196, 0.490196, 1 ) LineEdit/constants/minimum_spaces = 24 -LineEdit/fonts/font = null +LineEdit/fonts/font = ExtResource( 6 ) LineEdit/icons/clear = null LineEdit/styles/focus = ExtResource( 3 ) LineEdit/styles/normal = ExtResource( 9 ) @@ -189,7 +189,7 @@ OptionButton/colors/font_color_hover = Color( 0.94, 0.94, 0.94, 1 ) OptionButton/colors/font_color_pressed = Color( 1, 1, 1, 1 ) OptionButton/constants/arrow_margin = 4 OptionButton/constants/hseparation = 4 -OptionButton/fonts/font = null +OptionButton/fonts/font = ExtResource( 6 ) OptionButton/icons/arrow = ExtResource( 20 ) OptionButton/styles/disabled = ExtResource( 2 ) OptionButton/styles/focus = ExtResource( 3 ) @@ -204,7 +204,7 @@ PopupMenu/colors/font_color_disabled = Color( 0.4, 0.4, 0.4, 0.8 ) PopupMenu/colors/font_color_hover = Color( 0.88, 0.88, 0.88, 1 ) PopupMenu/constants/hseparation = 8 PopupMenu/constants/vseparation = 8 -PopupMenu/fonts/font = null +PopupMenu/fonts/font = ExtResource( 6 ) PopupMenu/icons/checked = null PopupMenu/icons/radio_checked = ExtResource( 17 ) PopupMenu/icons/radio_unchecked = ExtResource( 16 ) @@ -219,7 +219,7 @@ PopupMenu/styles/separator = ExtResource( 15 ) PopupPanel/styles/panel = ExtResource( 8 ) ProgressBar/colors/font_color = Color( 0.941176, 0.941176, 0.941176, 1 ) ProgressBar/colors/font_color_shadow = Color( 0, 0, 0, 1 ) -ProgressBar/fonts/font = null +ProgressBar/fonts/font = ExtResource( 6 ) ProgressBar/styles/bg = ExtResource( 11 ) ProgressBar/styles/fg = ExtResource( 12 ) TabContainer/colors/font_color_bg = Color( 0.69, 0.69, 0.69, 1 ) @@ -230,7 +230,7 @@ TabContainer/constants/label_valign_bg = 4 TabContainer/constants/label_valign_fg = 0 TabContainer/constants/side_margin = 16 TabContainer/constants/top_margin = 48 -TabContainer/fonts/font = null +TabContainer/fonts/font = ExtResource( 6 ) TabContainer/icons/decrement = null TabContainer/icons/decrement_highlight = null TabContainer/icons/increment = null @@ -248,7 +248,7 @@ Tabs/constants/hseparation = 8 Tabs/constants/label_valign_bg = 4 Tabs/constants/label_valign_fg = 0 Tabs/constants/top_margin = 48 -Tabs/fonts/font = null +Tabs/fonts/font = ExtResource( 6 ) Tabs/icons/close = null Tabs/icons/decrement = null Tabs/icons/decrement_highlight = null @@ -290,7 +290,7 @@ TextEdit/constants/completion_lines = 7 TextEdit/constants/completion_max_width = 50 TextEdit/constants/completion_scroll_width = 3 TextEdit/constants/line_spacing = 8 -TextEdit/fonts/font = null +TextEdit/fonts/font = ExtResource( 6 ) TextEdit/icons/fold = null TextEdit/icons/folded = null TextEdit/icons/space = null @@ -304,7 +304,7 @@ ToolButton/colors/font_color_disabled = Color( 0.9, 0.95, 1, 0.3 ) ToolButton/colors/font_color_hover = Color( 0.94, 0.94, 0.94, 1 ) ToolButton/colors/font_color_pressed = Color( 1, 1, 1, 1 ) ToolButton/constants/hseparation = 3 -ToolButton/fonts/font = null +ToolButton/fonts/font = ExtResource( 6 ) ToolButton/styles/disabled = ExtResource( 2 ) ToolButton/styles/focus = ExtResource( 3 ) ToolButton/styles/hover = ExtResource( 5 ) @@ -314,7 +314,7 @@ TooltipLabel/colors/font_color = Color( 1, 1, 1, 1 ) TooltipLabel/colors/font_color_shadow = Color( 0, 0, 0, 0.1 ) TooltipLabel/constants/shadow_offset_x = 1 TooltipLabel/constants/shadow_offset_y = 1 -TooltipLabel/fonts/font = null +TooltipLabel/fonts/font = ExtResource( 6 ) TooltipPanel/styles/panel = ExtResource( 8 ) Tree/colors/cursor_color = Color( 0, 0, 0, 1 ) Tree/colors/custom_button_font_highlight = Color( 0.94, 0.94, 0.94, 1 ) @@ -333,8 +333,8 @@ Tree/constants/item_margin = 24 Tree/constants/scroll_border = 4 Tree/constants/scroll_speed = 12 Tree/constants/vseparation = 8 -Tree/fonts/font = null -Tree/fonts/title_button_font = null +Tree/fonts/font = ExtResource( 6 ) +Tree/fonts/title_button_font = ExtResource( 6 ) Tree/icons/arrow = null Tree/icons/arrow_collapsed = null Tree/icons/checked = null @@ -369,7 +369,7 @@ WindowDialog/constants/close_h_ofs = 36 WindowDialog/constants/close_v_ofs = 36 WindowDialog/constants/scaleborder_size = 8 WindowDialog/constants/title_height = 40 -WindowDialog/fonts/title_font = null +WindowDialog/fonts/title_font = ExtResource( 6 ) WindowDialog/icons/close = null WindowDialog/icons/close_highlight = null WindowDialog/styles/panel = ExtResource( 8 )