From 79ff486c7b749ae53200fa0a6f2cf0427f5f6bb9 Mon Sep 17 00:00:00 2001 From: Emmanouil Papadeas Date: Tue, 7 Nov 2023 00:52:25 +0200 Subject: [PATCH] Put all of the image effect shaders in an Effects folder --- src/Autoload/DrawingAlgos.gd | 2 +- src/Classes/SelectionMap.gd | 2 +- src/Shaders/{ => Effects}/Desaturate.gdshader | 0 src/Shaders/{ => Effects}/DropShadow.gdshader | 0 src/Shaders/{ => Effects}/GradientMap.gdshader | 0 src/Shaders/{ => Effects}/Gradients/Linear.gdshader | 0 .../{ => Effects}/Gradients/LinearDithering.gdshader | 0 src/Shaders/{ => Effects}/HSV.gdshader | 0 src/Shaders/{ => Effects}/Invert.gdshader | 0 src/Shaders/{ => Effects}/OffsetPixels.gdshader | 0 src/Shaders/{ => Effects}/OutlineInline.gdshader | 0 src/Shaders/{ => Effects}/Posterize.gdshader | 0 .../{ => Effects}/Rotation/NearestNeighbour.gdshader | 0 src/Shaders/{ => Effects}/Rotation/OmniScale.gdshader | 0 src/Shaders/{ => Effects}/Rotation/SmearRotxel.gdshader | 0 src/Shaders/{ => Effects}/Rotation/cleanEdge.gdshader | 0 src/UI/Dialogs/ImageEffects/DesaturateDialog.gd | 2 +- src/UI/Dialogs/ImageEffects/DropShadowDialog.gd | 2 +- src/UI/Dialogs/ImageEffects/GradientDialog.gd | 4 ++-- src/UI/Dialogs/ImageEffects/GradientMapDialog.gd | 2 +- src/UI/Dialogs/ImageEffects/HSVDialog.gd | 2 +- src/UI/Dialogs/ImageEffects/InvertColorsDialog.gd | 2 +- src/UI/Dialogs/ImageEffects/OffsetImage.gd | 2 +- src/UI/Dialogs/ImageEffects/OutlineDialog.gd | 2 +- src/UI/Dialogs/ImageEffects/Posterize.gd | 2 +- src/UI/Dialogs/ImageEffects/RotateImage.gd | 8 +++++--- src/UI/Dialogs/ImageEffects/ScaleImage.gd | 4 +++- 27 files changed, 20 insertions(+), 16 deletions(-) rename src/Shaders/{ => Effects}/Desaturate.gdshader (100%) rename src/Shaders/{ => Effects}/DropShadow.gdshader (100%) rename src/Shaders/{ => Effects}/GradientMap.gdshader (100%) rename src/Shaders/{ => Effects}/Gradients/Linear.gdshader (100%) rename src/Shaders/{ => Effects}/Gradients/LinearDithering.gdshader (100%) rename src/Shaders/{ => Effects}/HSV.gdshader (100%) rename src/Shaders/{ => Effects}/Invert.gdshader (100%) rename src/Shaders/{ => Effects}/OffsetPixels.gdshader (100%) rename src/Shaders/{ => Effects}/OutlineInline.gdshader (100%) rename src/Shaders/{ => Effects}/Posterize.gdshader (100%) rename src/Shaders/{ => Effects}/Rotation/NearestNeighbour.gdshader (100%) rename src/Shaders/{ => Effects}/Rotation/OmniScale.gdshader (100%) rename src/Shaders/{ => Effects}/Rotation/SmearRotxel.gdshader (100%) rename src/Shaders/{ => Effects}/Rotation/cleanEdge.gdshader (100%) diff --git a/src/Autoload/DrawingAlgos.gd b/src/Autoload/DrawingAlgos.gd index b46579d52..b6c2286ea 100644 --- a/src/Autoload/DrawingAlgos.gd +++ b/src/Autoload/DrawingAlgos.gd @@ -5,7 +5,7 @@ enum GradientDirection { TOP, BOTTOM, LEFT, RIGHT } enum Interpolation { SCALE3X = 5, CLEANEDGE = 6, OMNISCALE = 7 } var blend_layers_shader := preload("res://src/Shaders/BlendLayers.gdshader") var clean_edge_shader: Shader -var omniscale_shader := preload("res://src/Shaders/Rotation/OmniScale.gdshader") +var omniscale_shader := preload("res://src/Shaders/Effects/Rotation/OmniScale.gdshader") ## Blends canvas layers into passed image starting from the origin position diff --git a/src/Classes/SelectionMap.gd b/src/Classes/SelectionMap.gd index 3d92ea002..49c504343 100644 --- a/src/Classes/SelectionMap.gd +++ b/src/Classes/SelectionMap.gd @@ -1,7 +1,7 @@ class_name SelectionMap extends Image -var invert_shader := preload("res://src/Shaders/Invert.gdshader") +var invert_shader := preload("res://src/Shaders/Effects/Invert.gdshader") func is_pixel_selected(pixel: Vector2i) -> bool: diff --git a/src/Shaders/Desaturate.gdshader b/src/Shaders/Effects/Desaturate.gdshader similarity index 100% rename from src/Shaders/Desaturate.gdshader rename to src/Shaders/Effects/Desaturate.gdshader diff --git a/src/Shaders/DropShadow.gdshader b/src/Shaders/Effects/DropShadow.gdshader similarity index 100% rename from src/Shaders/DropShadow.gdshader rename to src/Shaders/Effects/DropShadow.gdshader diff --git a/src/Shaders/GradientMap.gdshader b/src/Shaders/Effects/GradientMap.gdshader similarity index 100% rename from src/Shaders/GradientMap.gdshader rename to src/Shaders/Effects/GradientMap.gdshader diff --git a/src/Shaders/Gradients/Linear.gdshader b/src/Shaders/Effects/Gradients/Linear.gdshader similarity index 100% rename from src/Shaders/Gradients/Linear.gdshader rename to src/Shaders/Effects/Gradients/Linear.gdshader diff --git a/src/Shaders/Gradients/LinearDithering.gdshader b/src/Shaders/Effects/Gradients/LinearDithering.gdshader similarity index 100% rename from src/Shaders/Gradients/LinearDithering.gdshader rename to src/Shaders/Effects/Gradients/LinearDithering.gdshader diff --git a/src/Shaders/HSV.gdshader b/src/Shaders/Effects/HSV.gdshader similarity index 100% rename from src/Shaders/HSV.gdshader rename to src/Shaders/Effects/HSV.gdshader diff --git a/src/Shaders/Invert.gdshader b/src/Shaders/Effects/Invert.gdshader similarity index 100% rename from src/Shaders/Invert.gdshader rename to src/Shaders/Effects/Invert.gdshader diff --git a/src/Shaders/OffsetPixels.gdshader b/src/Shaders/Effects/OffsetPixels.gdshader similarity index 100% rename from src/Shaders/OffsetPixels.gdshader rename to src/Shaders/Effects/OffsetPixels.gdshader diff --git a/src/Shaders/OutlineInline.gdshader b/src/Shaders/Effects/OutlineInline.gdshader similarity index 100% rename from src/Shaders/OutlineInline.gdshader rename to src/Shaders/Effects/OutlineInline.gdshader diff --git a/src/Shaders/Posterize.gdshader b/src/Shaders/Effects/Posterize.gdshader similarity index 100% rename from src/Shaders/Posterize.gdshader rename to src/Shaders/Effects/Posterize.gdshader diff --git a/src/Shaders/Rotation/NearestNeighbour.gdshader b/src/Shaders/Effects/Rotation/NearestNeighbour.gdshader similarity index 100% rename from src/Shaders/Rotation/NearestNeighbour.gdshader rename to src/Shaders/Effects/Rotation/NearestNeighbour.gdshader diff --git a/src/Shaders/Rotation/OmniScale.gdshader b/src/Shaders/Effects/Rotation/OmniScale.gdshader similarity index 100% rename from src/Shaders/Rotation/OmniScale.gdshader rename to src/Shaders/Effects/Rotation/OmniScale.gdshader diff --git a/src/Shaders/Rotation/SmearRotxel.gdshader b/src/Shaders/Effects/Rotation/SmearRotxel.gdshader similarity index 100% rename from src/Shaders/Rotation/SmearRotxel.gdshader rename to src/Shaders/Effects/Rotation/SmearRotxel.gdshader diff --git a/src/Shaders/Rotation/cleanEdge.gdshader b/src/Shaders/Effects/Rotation/cleanEdge.gdshader similarity index 100% rename from src/Shaders/Rotation/cleanEdge.gdshader rename to src/Shaders/Effects/Rotation/cleanEdge.gdshader diff --git a/src/UI/Dialogs/ImageEffects/DesaturateDialog.gd b/src/UI/Dialogs/ImageEffects/DesaturateDialog.gd index fd54405d1..c025cb799 100644 --- a/src/UI/Dialogs/ImageEffects/DesaturateDialog.gd +++ b/src/UI/Dialogs/ImageEffects/DesaturateDialog.gd @@ -5,7 +5,7 @@ var green := true var blue := true var alpha := false -var shader := preload("res://src/Shaders/Desaturate.gdshader") +var shader := preload("res://src/Shaders/Effects/Desaturate.gdshader") func _ready() -> void: diff --git a/src/UI/Dialogs/ImageEffects/DropShadowDialog.gd b/src/UI/Dialogs/ImageEffects/DropShadowDialog.gd index b8e898c36..519f2d5e2 100644 --- a/src/UI/Dialogs/ImageEffects/DropShadowDialog.gd +++ b/src/UI/Dialogs/ImageEffects/DropShadowDialog.gd @@ -2,7 +2,7 @@ extends ImageEffect enum Animate { OFFSET_X, OFFSET_Y } var color := Color.BLACK -var shader := preload("res://src/Shaders/DropShadow.gdshader") +var shader := preload("res://src/Shaders/Effects/DropShadow.gdshader") @onready var shadow_color := $VBoxContainer/ShadowOptions/ShadowColor as ColorPickerButton diff --git a/src/UI/Dialogs/ImageEffects/GradientDialog.gd b/src/UI/Dialogs/ImageEffects/GradientDialog.gd index f7007d636..6bd772f87 100644 --- a/src/UI/Dialogs/ImageEffects/GradientDialog.gd +++ b/src/UI/Dialogs/ImageEffects/GradientDialog.gd @@ -3,8 +3,8 @@ extends ImageEffect enum { LINEAR, RADIAL, LINEAR_DITHERING, RADIAL_DITHERING } enum Animate { POSITION, SIZE, ANGLE, CENTER_X, CENTER_Y, RADIUS_X, RADIUS_Y } -var shader_linear := preload("res://src/Shaders/Gradients/Linear.gdshader") -var shader_linear_dither := preload("res://src/Shaders/Gradients/LinearDithering.gdshader") +var shader_linear := preload("res://src/Shaders/Effects/Gradients/Linear.gdshader") +var shader_linear_dither := preload("res://src/Shaders/Effects/Gradients/LinearDithering.gdshader") var shader := shader_linear var dither_matrices: Array[DitherMatrix] = [ diff --git a/src/UI/Dialogs/ImageEffects/GradientMapDialog.gd b/src/UI/Dialogs/ImageEffects/GradientMapDialog.gd index 754e347bb..97df8b39a 100644 --- a/src/UI/Dialogs/ImageEffects/GradientMapDialog.gd +++ b/src/UI/Dialogs/ImageEffects/GradientMapDialog.gd @@ -1,6 +1,6 @@ extends ImageEffect -var shader := preload("res://src/Shaders/GradientMap.gdshader") +var shader := preload("res://src/Shaders/Effects/GradientMap.gdshader") func _ready() -> void: diff --git a/src/UI/Dialogs/ImageEffects/HSVDialog.gd b/src/UI/Dialogs/ImageEffects/HSVDialog.gd index cee1c2fe8..010967fec 100644 --- a/src/UI/Dialogs/ImageEffects/HSVDialog.gd +++ b/src/UI/Dialogs/ImageEffects/HSVDialog.gd @@ -1,7 +1,7 @@ extends ImageEffect enum Animate { HUE, SATURATION, VALUE } -var shader := preload("res://src/Shaders/HSV.gdshader") +var shader := preload("res://src/Shaders/Effects/HSV.gdshader") @onready var hue_slider := $VBoxContainer/HueSlider as ValueSlider @onready var sat_slider := $VBoxContainer/SaturationSlider as ValueSlider diff --git a/src/UI/Dialogs/ImageEffects/InvertColorsDialog.gd b/src/UI/Dialogs/ImageEffects/InvertColorsDialog.gd index 5693d7da6..abfad838b 100644 --- a/src/UI/Dialogs/ImageEffects/InvertColorsDialog.gd +++ b/src/UI/Dialogs/ImageEffects/InvertColorsDialog.gd @@ -5,7 +5,7 @@ var green := true var blue := true var alpha := false -var shader := preload("res://src/Shaders/Invert.gdshader") +var shader := preload("res://src/Shaders/Effects/Invert.gdshader") func _ready() -> void: diff --git a/src/UI/Dialogs/ImageEffects/OffsetImage.gd b/src/UI/Dialogs/ImageEffects/OffsetImage.gd index 3f0e3694a..4a332150a 100644 --- a/src/UI/Dialogs/ImageEffects/OffsetImage.gd +++ b/src/UI/Dialogs/ImageEffects/OffsetImage.gd @@ -2,7 +2,7 @@ extends ImageEffect enum Animate { OFFSET_X, OFFSET_Y } -var shader := preload("res://src/Shaders/OffsetPixels.gdshader") +var shader := preload("res://src/Shaders/Effects/OffsetPixels.gdshader") var wrap_around := false @onready var offset_sliders := $VBoxContainer/OffsetOptions/OffsetSliders as ValueSliderV2 diff --git a/src/UI/Dialogs/ImageEffects/OutlineDialog.gd b/src/UI/Dialogs/ImageEffects/OutlineDialog.gd index e900fb47e..eafee76dc 100644 --- a/src/UI/Dialogs/ImageEffects/OutlineDialog.gd +++ b/src/UI/Dialogs/ImageEffects/OutlineDialog.gd @@ -5,7 +5,7 @@ var color := Color.BLACK var thickness := 1 var pattern := 0 var inside_image := false -var shader := preload("res://src/Shaders/OutlineInline.gdshader") +var shader := preload("res://src/Shaders/Effects/OutlineInline.gdshader") @onready var outline_color := $VBoxContainer/OutlineOptions/OutlineColor as ColorPickerButton diff --git a/src/UI/Dialogs/ImageEffects/Posterize.gd b/src/UI/Dialogs/ImageEffects/Posterize.gd index c76fbca58..2c10cc79f 100644 --- a/src/UI/Dialogs/ImageEffects/Posterize.gd +++ b/src/UI/Dialogs/ImageEffects/Posterize.gd @@ -1,6 +1,6 @@ extends ImageEffect -var shader := preload("res://src/Shaders/Posterize.gdshader") +var shader := preload("res://src/Shaders/Effects/Posterize.gdshader") var levels := 2.0 var dither := 0.0 diff --git a/src/UI/Dialogs/ImageEffects/RotateImage.gd b/src/UI/Dialogs/ImageEffects/RotateImage.gd index 6594e0fd1..a698edcfe 100644 --- a/src/UI/Dialogs/ImageEffects/RotateImage.gd +++ b/src/UI/Dialogs/ImageEffects/RotateImage.gd @@ -4,8 +4,8 @@ enum { ROTXEL_SMEAR, CLEANEDGE, OMNISCALE, NNS, NN, ROTXEL, URD } enum Animate { ANGLE, INITIAL_ANGLE } var live_preview := true -var rotxel_shader := preload("res://src/Shaders/Rotation/SmearRotxel.gdshader") -var nn_shader := preload("res://src/Shaders/Rotation/NearestNeighbour.gdshader") +var rotxel_shader := preload("res://src/Shaders/Effects/Rotation/SmearRotxel.gdshader") +var nn_shader := preload("res://src/Shaders/Effects/Rotation/NearestNeighbour.gdshader") var pivot := Vector2.INF var drag_pivot := false @@ -37,7 +37,9 @@ func _ready() -> void: func _about_to_popup() -> void: if DrawingAlgos.clean_edge_shader == null: - DrawingAlgos.clean_edge_shader = load("res://src/Shaders/Rotation/cleanEdge.gdshader") + DrawingAlgos.clean_edge_shader = load( + "res://src/Shaders/Effects/Rotation/cleanEdge.gdshader" + ) drag_pivot = false if pivot == Vector2.INF: _calculate_pivot() diff --git a/src/UI/Dialogs/ImageEffects/ScaleImage.gd b/src/UI/Dialogs/ImageEffects/ScaleImage.gd index c6cb21fcd..72c9cd123 100644 --- a/src/UI/Dialogs/ImageEffects/ScaleImage.gd +++ b/src/UI/Dialogs/ImageEffects/ScaleImage.gd @@ -23,7 +23,9 @@ func _ready() -> void: func _on_ScaleImage_about_to_show() -> void: if DrawingAlgos.clean_edge_shader == null: - DrawingAlgos.clean_edge_shader = load("res://src/Shaders/Rotation/cleanEdge.gdshader") + DrawingAlgos.clean_edge_shader = load( + "res://src/Shaders/Effects/Rotation/cleanEdge.gdshader" + ) Global.canvas.selection.transform_content_confirm() aspect_ratio = float(Global.current_project.size.x) / float(Global.current_project.size.y) width_value.value = Global.current_project.size.x