huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-31 07:29:49 +00:00
Code Issues Wiki Activity

Make RGBA bool uniforms in invert and desaturate buttons instead of checkboxes in layer effects

Browse source 
They are now consistent with their image effect counterparts.
This commit is contained in:
Emmanouil Papadeas 2025-01-29 21:51:55 +02:00
parent 80fba954ae
commit 5e2901971b
3 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/Classes/ShaderLoader.gd
View file

@ -19,6 +19,7 @@ static func create_ui_for_shader_uniforms(
var uniform_data: PackedStringArray = []
var description: String = ""
var description_began := false
var color_button_hbox: HBoxContainer = null # Used for RGBA buttons, if they exist.
for line in code:
# Management of "end" tags
if line.begins_with("// (end DESCRIPTION)"):
@ -270,26 +271,37 @@ static func create_ui_for_shader_uniforms(
params, u_name, hbox, value_changed, parent_node, file_selected
)
parent_node.add_child(hbox)
elif u_type == "bool":
var label := Label.new()
label.text = humanized_u_name
label.size_flags_horizontal = Control.SIZE_EXPAND_FILL
var checkbox := CheckBox.new()
checkbox.text = "On"
if u_value == "true":
checkbox.button_pressed = true
if params.has(u_name):
checkbox.button_pressed = params[u_name]
var button: BaseButton
if u_name in ["red", "green", "blue", "alpha"]:
button = Button.new()
button.text = u_name[0].to_upper()
button.toggle_mode = true
if is_instance_valid(color_button_hbox):
color_button_hbox.add_child(button)
else:
color_button_hbox = HBoxContainer.new()
color_button_hbox.add_child(button)
parent_node.add_child(color_button_hbox)
else:
params[u_name] = checkbox.button_pressed
checkbox.toggled.connect(value_changed.bind(u_name))
checkbox.size_flags_horizontal = Control.SIZE_EXPAND_FILL
checkbox.mouse_default_cursor_shape = Control.CURSOR_POINTING_HAND
var hbox := HBoxContainer.new()
hbox.add_child(label)
hbox.add_child(checkbox)
parent_node.add_child(hbox)
button = CheckBox.new()
var label := Label.new()
label.text = humanized_u_name
label.size_flags_horizontal = Control.SIZE_EXPAND_FILL
button.text = "On"
var hbox := HBoxContainer.new()
hbox.add_child(label)
hbox.add_child(button)
parent_node.add_child(hbox)
if u_value == "true":
button.button_pressed = true
if params.has(u_name):
button.button_pressed = params[u_name]
else:
params[u_name] = button.button_pressed
button.toggled.connect(value_changed.bind(u_name))
button.size_flags_horizontal = Control.SIZE_EXPAND_FILL
button.mouse_default_cursor_shape = Control.CURSOR_POINTING_HAND
static func _vec2str_to_vector2(vec2: String) -> Vector2:

2
src/Shaders/Effects/Desaturate.gdshader
View file

@ -2,8 +2,8 @@ shader_type canvas_item;
render_mode unshaded;
uniform bool red = true;
uniform bool blue = true;
uniform bool green = true;
uniform bool blue = true;
uniform bool alpha = false;
uniform sampler2D selection : filter_nearest;

2
src/Shaders/Effects/Invert.gdshader
View file

@ -2,8 +2,8 @@ shader_type canvas_item;
render_mode unshaded;
uniform bool red = true;
uniform bool blue = true;
uniform bool green = true;
uniform bool blue = true;
uniform bool alpha = false;
uniform sampler2D selection : filter_nearest;