diff --git a/src/Shaders/Gradients/Dithering.gdshader b/src/Shaders/Gradients/LinearDithering.gdshader similarity index 100% rename from src/Shaders/Gradients/Dithering.gdshader rename to src/Shaders/Gradients/LinearDithering.gdshader diff --git a/src/Shaders/Gradients/Step.gdshader b/src/Shaders/Gradients/LinearStep.gdshader similarity index 100% rename from src/Shaders/Gradients/Step.gdshader rename to src/Shaders/Gradients/LinearStep.gdshader diff --git a/src/UI/Dialogs/ImageEffects/GradientDialog.gd b/src/UI/Dialogs/ImageEffects/GradientDialog.gd index 3ec6e25e6..360efe1ec 100644 --- a/src/UI/Dialogs/ImageEffects/GradientDialog.gd +++ b/src/UI/Dialogs/ImageEffects/GradientDialog.gd @@ -1,12 +1,12 @@ extends ImageEffect -enum { LINEAR, RADIAL, STEP, RADIAL_STEP, DITHERING, RADIAL_DITHERING } +enum { LINEAR, RADIAL, LINEAR_STEP, RADIAL_STEP, LINEAR_DITHERING, RADIAL_DITHERING } var shader_linear: Shader = preload("res://src/Shaders/Gradients/Linear.gdshader") var shader_radial: Shader = preload("res://src/Shaders/Gradients/Radial.gdshader") -var shader_step: Shader = preload("res://src/Shaders/Gradients/Step.gdshader") +var shader_linear_step: Shader = preload("res://src/Shaders/Gradients/LinearStep.gdshader") var shader_radial_step: Shader = preload("res://src/Shaders/Gradients/RadialStep.gdshader") -var shader_dither: Shader = preload("res://src/Shaders/Gradients/Dithering.gdshader") +var shader_linear_dither: Shader = preload("res://src/Shaders/Gradients/LinearDithering.gdshader") var shader_radial_dither: Shader = preload("res://src/Shaders/Gradients/RadialDithering.gdshader") var confirmed := false @@ -123,14 +123,14 @@ func _on_TypeOptionButton_item_selected(index: int) -> void: RADIAL: shader = shader_radial get_tree().set_group("gradient_radial", "visible", true) - STEP: - shader = shader_step + LINEAR_STEP: + shader = shader_linear_step get_tree().set_group("gradient_step", "visible", true) RADIAL_STEP: shader = shader_radial_step get_tree().set_group("gradient_radial_step", "visible", true) - DITHERING: - shader = shader_dither + LINEAR_DITHERING: + shader = shader_linear_dither get_tree().set_group("gradient_dithering", "visible", true) RADIAL_DITHERING: shader = shader_radial_dither diff --git a/src/UI/Dialogs/ImageEffects/GradientDialog.tscn b/src/UI/Dialogs/ImageEffects/GradientDialog.tscn index 4033a0764..dac139308 100644 --- a/src/UI/Dialogs/ImageEffects/GradientDialog.tscn +++ b/src/UI/Dialogs/ImageEffects/GradientDialog.tscn @@ -65,7 +65,7 @@ margin_right = 278.0 margin_bottom = 20.0 mouse_default_cursor_shape = 2 text = "Linear" -items = [ "Linear", null, false, 0, null, "Radial", null, false, 1, null, "Step", null, false, 2, null, "Radial Step", null, false, 3, null, "Dithering", null, false, 4, null, "Radial Dithering", null, false, 5, null ] +items = [ "Linear", null, false, 0, null, "Radial", null, false, 1, null, "Linear Step", null, false, 2, null, "Radial Step", null, false, 3, null, "Linear Dithering", null, false, 4, null, "Radial Dithering", null, false, 5, null ] selected = 0 [node name="ColorsLabel" type="Label" parent="VBoxContainer/OptionsContainer" groups=["gradient_common"]] diff --git a/src/UI/Dialogs/ImageEffects/ImageEffects.tscn b/src/UI/Dialogs/ImageEffects/ImageEffects.tscn index 4e1d67a90..eddf0d123 100644 --- a/src/UI/Dialogs/ImageEffects/ImageEffects.tscn +++ b/src/UI/Dialogs/ImageEffects/ImageEffects.tscn @@ -34,7 +34,6 @@ margin_bottom = 392.0 [node name="DesaturateDialog" parent="." instance=ExtResource( 3 )] [node name="OutlineDialog" parent="." instance=ExtResource( 13 )] -visible = false margin_right = 217.0 margin_bottom = 106.0