From 847fbd35ddcd3d4b954ee1d43c997eed7612441d Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 3 Jan 2022 14:45:40 +0100 Subject: [PATCH] Added more buttons to the mesh data editor's sidebar. --- .../addons/mesh_data_resource_editor/MDIEd.gd | 7 ++++ .../mesh_data_resource_editor/MDIEd.tscn | 38 +++++++++++++++++++ .../mesh_data_resource_editor/MIDGizmo.gd | 9 +++++ .../mesh_data_resource_editor/plugin.gd | 8 ++++ 4 files changed, 62 insertions(+) diff --git a/game/addons/mesh_data_resource_editor/MDIEd.gd b/game/addons/mesh_data_resource_editor/MDIEd.gd index 7586286d..96e07892 100644 --- a/game/addons/mesh_data_resource_editor/MDIEd.gd +++ b/game/addons/mesh_data_resource_editor/MDIEd.gd @@ -132,3 +132,10 @@ func _on_AddBox_pressed(): func _on_UnwrapButton_pressed(): plugin.uv_unwrap() + +func _on_add_triangle_pressed(): + plugin.add_triangle() + +func _on_add_quad_pressed(): + plugin.add_quad() + diff --git a/game/addons/mesh_data_resource_editor/MDIEd.tscn b/game/addons/mesh_data_resource_editor/MDIEd.tscn index 7fef67e5..dd921f90 100644 --- a/game/addons/mesh_data_resource_editor/MDIEd.tscn +++ b/game/addons/mesh_data_resource_editor/MDIEd.tscn @@ -218,6 +218,30 @@ margin_right = 349.0 margin_bottom = 20.0 text = "Gen Tangents" +[node name="RemDoubles" type="Button" parent="VBoxContainer/Operations/Operations"] +margin_left = 353.0 +margin_right = 451.0 +margin_bottom = 20.0 +text = "Rem Doubles" + +[node name="Merge" type="Button" parent="VBoxContainer/Operations/Operations"] +margin_left = 455.0 +margin_right = 507.0 +margin_bottom = 20.0 +text = "Merge" + +[node name="Split" type="Button" parent="VBoxContainer/Operations/Operations"] +margin_left = 511.0 +margin_right = 551.0 +margin_bottom = 20.0 +text = "Split" + +[node name="SplitOffset" type="Button" parent="VBoxContainer/Operations/Operations"] +margin_left = 555.0 +margin_right = 638.0 +margin_bottom = 20.0 +text = "Split Offset" + [node name="HSeparator3" type="HSeparator" parent="VBoxContainer"] margin_top = 140.0 margin_right = 1010.0 @@ -246,6 +270,18 @@ margin_right = 36.0 margin_bottom = 20.0 text = "Box" +[node name="AddTriangle" type="Button" parent="VBoxContainer/Add/Add"] +margin_left = 40.0 +margin_right = 102.0 +margin_bottom = 20.0 +text = "Triangle" + +[node name="AdQuad" type="Button" parent="VBoxContainer/Add/Add"] +margin_left = 106.0 +margin_right = 152.0 +margin_bottom = 20.0 +text = "Quad" + [node name="HSeparator2" type="HSeparator" parent="VBoxContainer"] margin_top = 190.0 margin_right = 1010.0 @@ -293,3 +329,5 @@ script = ExtResource( 3 ) [connection signal="pressed" from="VBoxContainer/Operations/Operations/Extrude" to="." method="_on_Extrude_pressed"] [connection signal="pressed" from="VBoxContainer/Operations/Operations/UnwrapButton" to="." method="_on_UnwrapButton_pressed"] [connection signal="pressed" from="VBoxContainer/Add/Add/AddBox" to="." method="_on_AddBox_pressed"] +[connection signal="pressed" from="VBoxContainer/Add/Add/AddTriangle" to="." method="_on_add_triangle_pressed"] +[connection signal="pressed" from="VBoxContainer/Add/Add/AdQuad" to="." method="_on_add_quad_pressed"] diff --git a/game/addons/mesh_data_resource_editor/MIDGizmo.gd b/game/addons/mesh_data_resource_editor/MIDGizmo.gd index f7738501..a9aeb443 100644 --- a/game/addons/mesh_data_resource_editor/MIDGizmo.gd +++ b/game/addons/mesh_data_resource_editor/MIDGizmo.gd @@ -373,3 +373,12 @@ func on_mdr_changed() -> void: recalculate_handle_points() redraw() + +func add_triangle() -> void: + if !_mdr: + return + + + +func add_quad() -> void: + pass diff --git a/game/addons/mesh_data_resource_editor/plugin.gd b/game/addons/mesh_data_resource_editor/plugin.gd index 12fc237f..e127316c 100644 --- a/game/addons/mesh_data_resource_editor/plugin.gd +++ b/game/addons/mesh_data_resource_editor/plugin.gd @@ -173,3 +173,11 @@ func add_box() -> void: if mdr: MeshAddUtils.add_box(mdr) + +func add_triangle() -> void: + for g in active_gizmos: + g.add_triangle() + +func add_quad() -> void: + for g in active_gizmos: + g.add_quad()