Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2025-02-01 14:37:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed per vertex/edge/face merge option. Also hidden extrude in edge for now.

Browse Source
This commit is contained in:
Relintai 2022-01-15 16:16:11 +01:00
parent 8ee90e179c
commit d32b9a50ea
4 changed files with 18 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
game/addons/mesh_data_resource_editor/MDIEd.gd
View File

@ -139,9 +139,6 @@ func _on_add_triangle_pressed():
func _on_add_quad_pressed():
plugin.add_quad()
func _on_merge_pressed():
plugin.merge()
func _on_split_pressed():
plugin.split()

55
game/addons/mesh_data_resource_editor/MDIEd.tscn
View File

@ -181,7 +181,7 @@ margin_bottom = 94.0
[node name="VertexOps" type="VBoxContainer" parent="VBoxContainer"]
margin_top = 98.0
margin_right = 1010.0
margin_bottom = 226.0
margin_bottom = 202.0
[node name="OperationsLabel" type="Label" parent="VBoxContainer/VertexOps"]
margin_right = 1010.0
@ -193,37 +193,31 @@ valign = 1
[node name="Operations" type="VBoxContainer" parent="VBoxContainer/VertexOps"]
margin_top = 18.0
margin_right = 1010.0
margin_bottom = 128.0
margin_bottom = 104.0
[node name="AddFace" type="Button" parent="VBoxContainer/VertexOps/Operations"]
margin_right = 1010.0
margin_bottom = 20.0
text = "Create Face"
[node name="Merge" type="Button" parent="VBoxContainer/VertexOps/Operations"]
[node name="Split" type="Button" parent="VBoxContainer/VertexOps/Operations"]
margin_top = 24.0
margin_right = 1010.0
margin_bottom = 44.0
text = "Merge"
[node name="Split" type="Button" parent="VBoxContainer/VertexOps/Operations"]
margin_top = 48.0
margin_right = 1010.0
margin_bottom = 68.0
text = "Split"
[node name="Label" type="Label" parent="VBoxContainer/VertexOps/Operations"]
margin_top = 72.0
margin_top = 48.0
margin_right = 1010.0
margin_bottom = 86.0
margin_bottom = 62.0
text = "Connect"
align = 1
valign = 1
[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/VertexOps/Operations"]
margin_top = 90.0
margin_top = 66.0
margin_right = 1010.0
margin_bottom = 110.0
margin_bottom = 86.0
size_flags_horizontal = 3
[node name="ConnectToFirst" type="Button" parent="VBoxContainer/VertexOps/Operations/HBoxContainer"]
@ -276,16 +270,11 @@ margin_right = 1010.0
margin_bottom = 134.0
[node name="Extrude" type="Button" parent="VBoxContainer/EdgeOps/Operations"]
visible = false
margin_right = 1010.0
margin_bottom = 20.0
text = "Extrude"
[node name="Merge" type="Button" parent="VBoxContainer/EdgeOps/Operations"]
margin_top = 24.0
margin_right = 1010.0
margin_bottom = 44.0
text = "Merge"
[node name="Split" type="Button" parent="VBoxContainer/EdgeOps/Operations"]
margin_top = 48.0
margin_right = 1010.0
@ -315,11 +304,6 @@ margin_right = 1010.0
margin_bottom = 20.0
text = "Delete"
[node name="Merge" type="Button" parent="VBoxContainer/FaceOps/Operations"]
margin_right = 1010.0
margin_bottom = 20.0
text = "Merge"
[node name="Split" type="Button" parent="VBoxContainer/FaceOps/Operations"]
margin_top = 24.0
margin_right = 1010.0
@ -327,9 +311,9 @@ margin_bottom = 44.0
text = "Split"
[node name="Operations" type="VBoxContainer" parent="VBoxContainer"]
margin_top = 230.0
margin_top = 206.0
margin_right = 1010.0
margin_bottom = 364.0
margin_bottom = 340.0
[node name="OperationsLabel" type="Label" parent="VBoxContainer/Operations"]
margin_right = 1010.0
@ -373,14 +357,14 @@ margin_bottom = 116.0
text = "MergeOptim"
[node name="HSeparator3" type="HSeparator" parent="VBoxContainer"]
margin_top = 368.0
margin_top = 344.0
margin_right = 1010.0
margin_bottom = 372.0
margin_bottom = 348.0
[node name="Add" type="VBoxContainer" parent="VBoxContainer"]
margin_top = 376.0
margin_top = 352.0
margin_right = 1010.0
margin_bottom = 462.0
margin_bottom = 438.0
[node name="AddLabel" type="Label" parent="VBoxContainer/Add"]
margin_right = 1010.0
@ -436,12 +420,12 @@ margin_bottom = 20.0
text = "At"
[node name="HSeparator2" type="HSeparator" parent="VBoxContainer"]
margin_top = 466.0
margin_top = 442.0
margin_right = 1010.0
margin_bottom = 470.0
margin_bottom = 446.0
[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer"]
margin_top = 474.0
margin_top = 450.0
margin_right = 1010.0
margin_bottom = 586.0
size_flags_horizontal = 3
@ -457,7 +441,7 @@ valign = 1
[node name="UVEditorScrollContainer" type="ScrollContainer" parent="VBoxContainer/VBoxContainer"]
margin_top = 18.0
margin_right = 1010.0
margin_bottom = 112.0
margin_bottom = 136.0
size_flags_horizontal = 3
size_flags_vertical = 3
__meta__ = {
@ -483,17 +467,14 @@ script = ExtResource( 3 )
[connection signal="toggled" from="VBoxContainer/Actions/Actions/VBoxContainer2/HBoxContainer3/Face" to="." method="on_selection_mode_face_toggled"]
[connection signal="toggled" from="VBoxContainer/Actions/Actions/VBoxContainer2/HBoxContainer3/Face" to="VBoxContainer/FaceOps" method="set_visible"]
[connection signal="pressed" from="VBoxContainer/VertexOps/Operations/AddFace" to="." method="_oncreate_face_pressed"]
[connection signal="pressed" from="VBoxContainer/VertexOps/Operations/Merge" to="." method="_on_merge_pressed"]
[connection signal="pressed" from="VBoxContainer/VertexOps/Operations/Split" to="." method="_on_split_pressed"]
[connection signal="pressed" from="VBoxContainer/VertexOps/Operations/HBoxContainer/ConnectToFirst" to="." method="_on_connect_to_first_selected_pressed"]
[connection signal="pressed" from="VBoxContainer/VertexOps/Operations/HBoxContainer/ConnectMed" to="." method="_on_connect_to_avg_pressed"]
[connection signal="pressed" from="VBoxContainer/VertexOps/Operations/HBoxContainer/ConnectToLast" to="." method="_on_connect_to_last_selected_pressed"]
[connection signal="pressed" from="VBoxContainer/VertexOps/Operations/HBoxContainer/Disconnect" to="." method="_on_disconnect_pressed"]
[connection signal="pressed" from="VBoxContainer/EdgeOps/Operations/Extrude" to="." method="_on_Extrude_pressed"]
[connection signal="pressed" from="VBoxContainer/EdgeOps/Operations/Merge" to="." method="_on_merge_pressed"]
[connection signal="pressed" from="VBoxContainer/EdgeOps/Operations/Split" to="." method="_on_split_pressed"]
[connection signal="pressed" from="VBoxContainer/FaceOps/Operations/Delete" to="." method="_on_delete_pressed"]
[connection signal="pressed" from="VBoxContainer/FaceOps/Operations/Merge" to="." method="_on_merge_pressed"]
[connection signal="pressed" from="VBoxContainer/FaceOps/Operations/Split" to="." method="_on_split_pressed"]
[connection signal="pressed" from="VBoxContainer/Operations/Operations/UnwrapButton" to="." method="_on_UnwrapButton_pressed"]
[connection signal="pressed" from="VBoxContainer/Operations/Operations/GenNormals" to="." method="_on_GenNormals_pressed"]

3
game/addons/mesh_data_resource_editor/MIDGizmo.gd
View File

@ -597,9 +597,6 @@ func add_box() -> void:
if _mdr:
MDRMeshUtils.add_box(_mdr)
func merge():
pass
func split():
pass

4
game/addons/mesh_data_resource_editor/plugin.gd
View File

@ -190,10 +190,6 @@ func add_quad_at() -> void:
for g in active_gizmos:
g.add_quad_at()
func merge():
for g in active_gizmos:
g.merge()
func split():
for g in active_gizmos:
g.split()