From c3c35c7e379a64b460b2e79637affb3c0cbf68eb Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 15 Jan 2022 17:06:38 +0100 Subject: [PATCH] Moved the add at buttons to under edge's options. --- .../mesh_data_resource_editor/MDIEd.tscn | 91 ++++++++++--------- 1 file changed, 47 insertions(+), 44 deletions(-) diff --git a/game/addons/mesh_data_resource_editor/MDIEd.tscn b/game/addons/mesh_data_resource_editor/MDIEd.tscn index 520e87ef..b94701a6 100644 --- a/game/addons/mesh_data_resource_editor/MDIEd.tscn +++ b/game/addons/mesh_data_resource_editor/MDIEd.tscn @@ -275,11 +275,12 @@ text = "" [node name="EdgeOps" type="VBoxContainer" parent="VBoxContainer/ScrollContainer/VBoxContainer2"] visible = false -margin_right = 109.0 -margin_bottom = 56.0 +margin_top = 108.0 +margin_right = 998.0 +margin_bottom = 206.0 [node name="OperationsLabel" type="Label" parent="VBoxContainer/ScrollContainer/VBoxContainer2/EdgeOps"] -margin_right = 1010.0 +margin_right = 998.0 margin_bottom = 14.0 text = "= Edge =" align = 1 @@ -287,8 +288,34 @@ valign = 1 [node name="Operations" type="VBoxContainer" parent="VBoxContainer/ScrollContainer/VBoxContainer2/EdgeOps"] margin_top = 18.0 -margin_right = 1010.0 -margin_bottom = 56.0 +margin_right = 998.0 +margin_bottom = 98.0 + +[node name="Label" type="Label" parent="VBoxContainer/ScrollContainer/VBoxContainer2/EdgeOps/Operations"] +margin_right = 998.0 +margin_bottom = 14.0 +text = "Append" +align = 1 +valign = 1 + +[node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer/ScrollContainer/VBoxContainer2/EdgeOps/Operations"] +margin_top = 18.0 +margin_right = 998.0 +margin_bottom = 38.0 + +[node name="TriAt" type="Button" parent="VBoxContainer/ScrollContainer/VBoxContainer2/EdgeOps/Operations/HBoxContainer2"] +margin_right = 497.0 +margin_bottom = 20.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "Tri" + +[node name="QuadAt" type="Button" parent="VBoxContainer/ScrollContainer/VBoxContainer2/EdgeOps/Operations/HBoxContainer2"] +margin_left = 501.0 +margin_right = 998.0 +margin_bottom = 20.0 +size_flags_horizontal = 3 +text = "Quad" [node name="Extrude" type="Button" parent="VBoxContainer/ScrollContainer/VBoxContainer2/EdgeOps/Operations"] visible = false @@ -297,27 +324,28 @@ margin_bottom = 20.0 text = "Extrude" [node name="SeamLabel" type="Label" parent="VBoxContainer/ScrollContainer/VBoxContainer2/EdgeOps/Operations"] -margin_right = 1010.0 -margin_bottom = 14.0 +margin_top = 42.0 +margin_right = 998.0 +margin_bottom = 56.0 text = "Seam" align = 1 valign = 1 [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/ScrollContainer/VBoxContainer2/EdgeOps/Operations"] -margin_top = 18.0 -margin_right = 1010.0 -margin_bottom = 38.0 +margin_top = 60.0 +margin_right = 998.0 +margin_bottom = 80.0 size_flags_horizontal = 3 [node name="Mark" type="Button" parent="VBoxContainer/ScrollContainer/VBoxContainer2/EdgeOps/Operations/HBoxContainer"] -margin_right = 503.0 +margin_right = 497.0 margin_bottom = 20.0 size_flags_horizontal = 3 text = "Mark" [node name="Unmark" type="Button" parent="VBoxContainer/ScrollContainer/VBoxContainer2/EdgeOps/Operations/HBoxContainer"] -margin_left = 507.0 -margin_right = 1010.0 +margin_left = 501.0 +margin_right = 998.0 margin_bottom = 20.0 size_flags_horizontal = 3 text = "Unmark" @@ -459,45 +487,20 @@ margin_right = 998.0 margin_bottom = 20.0 text = "Box" -[node name="Tri" type="HBoxContainer" parent="VBoxContainer/ScrollContainer/VBoxContainer2/Add/Add"] +[node name="AddTriangle" type="Button" parent="VBoxContainer/ScrollContainer/VBoxContainer2/Add/Add"] margin_top = 24.0 margin_right = 998.0 margin_bottom = 44.0 size_flags_horizontal = 3 - -[node name="AddTriangle" type="Button" parent="VBoxContainer/ScrollContainer/VBoxContainer2/Add/Add/Tri"] -margin_right = 497.0 -margin_bottom = 20.0 -size_flags_horizontal = 3 text = "Tri" -[node name="At" type="Button" parent="VBoxContainer/ScrollContainer/VBoxContainer2/Add/Add/Tri"] -margin_left = 501.0 -margin_right = 998.0 -margin_bottom = 20.0 -size_flags_horizontal = 3 -size_flags_vertical = 3 -text = "At" - -[node name="Quad" type="HBoxContainer" parent="VBoxContainer/ScrollContainer/VBoxContainer2/Add/Add"] +[node name="AddQuad" type="Button" parent="VBoxContainer/ScrollContainer/VBoxContainer2/Add/Add"] margin_top = 48.0 margin_right = 998.0 margin_bottom = 68.0 size_flags_horizontal = 3 - -[node name="AddQuad" type="Button" parent="VBoxContainer/ScrollContainer/VBoxContainer2/Add/Add/Quad"] -margin_right = 497.0 -margin_bottom = 20.0 -size_flags_horizontal = 3 text = "Quad" -[node name="At" type="Button" parent="VBoxContainer/ScrollContainer/VBoxContainer2/Add/Add/Quad"] -margin_left = 501.0 -margin_right = 998.0 -margin_bottom = 20.0 -size_flags_horizontal = 3 -text = "At" - [node name="HSeparator2" type="HSeparator" parent="VBoxContainer/ScrollContainer/VBoxContainer2"] margin_top = 454.0 margin_right = 998.0 @@ -542,6 +545,8 @@ script = ExtResource( 3 ) [connection signal="pressed" from="VBoxContainer/ScrollContainer/VBoxContainer2/VertexOps/Operations/HBoxContainer/ConnectMed" to="." method="_on_connect_to_avg_pressed"] [connection signal="pressed" from="VBoxContainer/ScrollContainer/VBoxContainer2/VertexOps/Operations/HBoxContainer/ConnectToLast" to="." method="_on_connect_to_last_selected_pressed"] [connection signal="pressed" from="VBoxContainer/ScrollContainer/VBoxContainer2/VertexOps/Operations/HBoxContainer/Disconnect" to="." method="_on_disconnect_pressed"] +[connection signal="pressed" from="VBoxContainer/ScrollContainer/VBoxContainer2/EdgeOps/Operations/HBoxContainer2/TriAt" to="." method="_on_add_triangle_at_pressed"] +[connection signal="pressed" from="VBoxContainer/ScrollContainer/VBoxContainer2/EdgeOps/Operations/HBoxContainer2/QuadAt" to="." method="_on_add_auad_at_pressed"] [connection signal="pressed" from="VBoxContainer/ScrollContainer/VBoxContainer2/EdgeOps/Operations/Extrude" to="." method="_on_Extrude_pressed"] [connection signal="pressed" from="VBoxContainer/ScrollContainer/VBoxContainer2/EdgeOps/Operations/HBoxContainer/Mark" to="." method="_on_mark_seam_pressed"] [connection signal="pressed" from="VBoxContainer/ScrollContainer/VBoxContainer2/EdgeOps/Operations/HBoxContainer/Unmark" to="." method="_on_unmark_seam_pressed"] @@ -553,7 +558,5 @@ script = ExtResource( 3 ) [connection signal="pressed" from="VBoxContainer/ScrollContainer/VBoxContainer2/Operations/Operations/Clean" to="." method="_on_MergeOptimize_pressed"] [connection signal="pressed" from="VBoxContainer/ScrollContainer/VBoxContainer2/Operations/Operations/UnwrapButton2" to="." method="_on_UnwrapButton_pressed"] [connection signal="pressed" from="VBoxContainer/ScrollContainer/VBoxContainer2/Add/Add/AddBox" to="." method="_on_AddBox_pressed"] -[connection signal="pressed" from="VBoxContainer/ScrollContainer/VBoxContainer2/Add/Add/Tri/AddTriangle" to="." method="_on_add_triangle_pressed"] -[connection signal="pressed" from="VBoxContainer/ScrollContainer/VBoxContainer2/Add/Add/Tri/At" to="." method="_on_add_triangle_at_pressed"] -[connection signal="pressed" from="VBoxContainer/ScrollContainer/VBoxContainer2/Add/Add/Quad/AddQuad" to="." method="_on_add_quad_pressed"] -[connection signal="pressed" from="VBoxContainer/ScrollContainer/VBoxContainer2/Add/Add/Quad/At" to="." method="_on_add_auad_at_pressed"] +[connection signal="pressed" from="VBoxContainer/ScrollContainer/VBoxContainer2/Add/Add/AddTriangle" to="." method="_on_add_triangle_pressed"] +[connection signal="pressed" from="VBoxContainer/ScrollContainer/VBoxContainer2/Add/Add/AddQuad" to="." method="_on_add_quad_pressed"]