diff --git a/material_maker/preview/preview_2d_panel.gd b/material_maker/preview/preview_2d_panel.gd index 0ec31ef9..a1a8b5f5 100644 --- a/material_maker/preview/preview_2d_panel.gd +++ b/material_maker/preview/preview_2d_panel.gd @@ -43,6 +43,10 @@ func update_shader_options() -> void: material.set_shader_param("margin", 0) setup_controls() +func on_resized() -> void: + .on_resized() + setup_controls() + func _on_gui_input(event): if event is InputEventMouseButton: if event.pressed and event.button_index == BUTTON_RIGHT: diff --git a/material_maker/preview/preview_2d_panel.tscn b/material_maker/preview/preview_2d_panel.tscn index 4cb6d639..a6fda8d6 100644 --- a/material_maker/preview/preview_2d_panel.tscn +++ b/material_maker/preview/preview_2d_panel.tscn @@ -103,7 +103,16 @@ margin_right = 37.0 margin_bottom = 61.0 texture = SubResource( 3 ) -[node name="Rect1" parent="." index="2" instance=ExtResource( 2 )] +[node name="P3" parent="." index="2" instance=ExtResource( 2 )] +visible = false +self_modulate = Color( 0, 1, 0.380392, 1 ) +margin_left = 5.0 +margin_top = 29.0 +margin_right = 37.0 +margin_bottom = 61.0 +texture = SubResource( 4 ) + +[node name="Rect1" parent="." index="3" instance=ExtResource( 2 )] visible = false self_modulate = Color( 1, 0.631373, 0, 1 ) margin_left = 5.0 @@ -114,7 +123,7 @@ texture = SubResource( 4 ) parent_control = "P1" control_type = 1 -[node name="Radius1" parent="." index="3" instance=ExtResource( 2 )] +[node name="Radius1" parent="." index="4" instance=ExtResource( 2 )] visible = false self_modulate = Color( 1, 0.631373, 0, 1 ) margin_left = 5.0 @@ -126,7 +135,7 @@ texture = SubResource( 4 ) parent_control = "P1" control_type = 2 -[node name="Radius11" parent="." index="4" instance=ExtResource( 2 )] +[node name="Radius11" parent="." index="5" instance=ExtResource( 2 )] visible = false self_modulate = Color( 1, 0.631373, 0, 1 ) margin_left = 5.0 @@ -138,7 +147,7 @@ texture = SubResource( 4 ) parent_control = "Radius1" control_type = 2 -[node name="Scale1" parent="." index="5" instance=ExtResource( 2 )] +[node name="Scale1" parent="." index="6" instance=ExtResource( 2 )] visible = false self_modulate = Color( 1, 0.631373, 0, 1 ) margin_left = 5.0 @@ -150,7 +159,7 @@ texture = SubResource( 4 ) parent_control = "P1" control_type = 3 -[node name="Angle1" parent="." index="6" instance=ExtResource( 2 )] +[node name="Angle1" parent="." index="7" instance=ExtResource( 2 )] visible = false self_modulate = Color( 1, 0.631373, 0, 1 ) margin_left = 5.0 @@ -162,7 +171,7 @@ texture = SubResource( 4 ) parent_control = "P1" control_type = 2 -[node name="Angle2" parent="." index="7" instance=ExtResource( 2 )] +[node name="Angle2" parent="." index="8" instance=ExtResource( 2 )] visible = false self_modulate = Color( 1, 0.631373, 0, 1 ) margin_left = 5.0 @@ -174,7 +183,7 @@ texture = SubResource( 4 ) parent_control = "P1" control_type = 2 -[node name="ContextMenu" type="PopupMenu" parent="." index="8"] +[node name="ContextMenu" type="PopupMenu" parent="." index="9"] margin_right = 109.0 margin_bottom = 52.0 items = [ "Show tiling", null, 1, false, false, 0, 0, null, "", false ] diff --git a/material_maker/widgets/node_editor/parameter.tscn b/material_maker/widgets/node_editor/parameter.tscn index c3233ddf..4f014fbc 100644 --- a/material_maker/widgets/node_editor/parameter.tscn +++ b/material_maker/widgets/node_editor/parameter.tscn @@ -9,8 +9,6 @@ [ext_resource path="res://material_maker/widgets/node_editor/parameter_color.tscn" type="PackedScene" id=7] [ext_resource path="res://material_maker/widgets/node_editor/parameter_gradient.tscn" type="PackedScene" id=8] - - [sub_resource type="AtlasTexture" id=1] flags = 4 atlas = ExtResource( 2 ) @@ -67,18 +65,19 @@ text = "Label" [node name="Type" type="OptionButton" parent="."] margin_left = 236.0 -margin_right = 305.0 +margin_right = 293.0 margin_bottom = 24.0 text = "float" -items = [ "float", null, false, -1, null, "size", null, false, -1, null, "enum", null, false, -1, null, "boolean", null, false, -1, null, "color", null, false, -1, null, "gradient", null, false, -1, null ] +items = [ "float", null, false, 0, null, "size", null, false, 1, null, "enum", null, false, 2, null, "boolean", null, false, 3, null, "color", null, false, 4, null, "gradient", null, false, 5, null ] selected = 0 [node name="Types" type="HBoxContainer" parent="."] -margin_left = 309.0 -margin_right = 856.0 +margin_left = 297.0 +margin_right = 818.0 margin_bottom = 24.0 [node name="float" parent="Types" instance=ExtResource( 3 )] +margin_right = 521.0 [node name="size" parent="Types" instance=ExtResource( 4 )] visible = false diff --git a/material_maker/widgets/node_editor/parameter_float.gd b/material_maker/widgets/node_editor/parameter_float.gd index 757d668f..930b3d1d 100644 --- a/material_maker/widgets/node_editor/parameter_float.gd +++ b/material_maker/widgets/node_editor/parameter_float.gd @@ -1,6 +1,6 @@ extends HBoxContainer -const CONTROLS = [ "None", "P1.x", "P1.y", "P1.a", "P1.r", "P2.x", "P2.y", "P2.a", "P2.r", "Rect1.x", "Rect1.y", "Radius1.r", "Radius1.a", "Radius11.r", "Radius11.a", "Scale1.x", "Scale1.y", "Angle1.a", "Angle2.a" ] +const CONTROLS = [ "None", "P1.x", "P1.y", "P1.a", "P1.r", "P2.x", "P2.y", "P2.a", "P2.r", "P3.x", "P3.y", "Rect1.x", "Rect1.y", "Radius1.r", "Radius1.a", "Radius11.r", "Radius11.a", "Scale1.x", "Scale1.y", "Angle1.a", "Angle2.a" ] func _ready() -> void: $Control.clear() diff --git a/material_maker/widgets/node_editor/parameter_float.tscn b/material_maker/widgets/node_editor/parameter_float.tscn index 46a93f4b..2d6fcd05 100644 --- a/material_maker/widgets/node_editor/parameter_float.tscn +++ b/material_maker/widgets/node_editor/parameter_float.tscn @@ -3,7 +3,6 @@ [ext_resource path="res://material_maker/widgets/node_editor/parameter_float.gd" type="Script" id=1] [ext_resource path="res://material_maker/widgets/float_edit.tscn" type="PackedScene" id=2] - [node name="float" type="HBoxContainer"] margin_right = 400.0 margin_bottom = 24.0 @@ -92,10 +91,9 @@ text = "Control:" [node name="Control" type="OptionButton" parent="."] margin_left = 458.0 -margin_right = 533.0 +margin_right = 521.0 margin_bottom = 24.0 text = "None" -selected = 0 [connection signal="value_changed" from="Min" to="." method="_on_Min_value_changed"] [connection signal="value_changed" from="Max" to="." method="_on_Max_value_changed"] [connection signal="value_changed" from="Step" to="." method="_on_Step_value_changed"]