huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-02-13 09:13:07 +00:00
Code Issues Wiki Activity

Move some code away from GradientDialog to GradientEdit

Browse source
This commit is contained in:
Emmanouil Papadeas 2025-02-10 22:22:55 +02:00
parent 3fa0110614
commit 0b759c8c71
2 changed files with 31 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/UI/Dialogs/ImageEffects/GradientDialog.gd
View file

@ -43,24 +43,6 @@ func commit_action(cel: Image, project := Global.current_project) -> void:
var selection := project.selection_map.return_cropped_copy(project.size) var selection := project.selection_map.return_cropped_copy(project.size)
selection_tex = ImageTexture.create_from_image(selection) selection_tex = ImageTexture.create_from_image(selection)
var dither_texture := selected_dither_matrix.texture
var gradient := gradient_edit.gradient
var offsets := gradient.offsets
offsets.sort()
var n_of_colors := offsets.size()
# Pass the gradient offsets as an array to the shader,
# but we can't provide arrays with variable sizes as uniforms, instead we construct
# a Nx1 grayscale texture with each offset stored in each pixel, and pass it to the shader.
var offsets_image := Image.create(n_of_colors, 1, false, Image.FORMAT_L8)
# Construct an image that contains the selected colors of the gradient without interpolation.
var gradient_image := Image.create(n_of_colors, 1, false, Image.FORMAT_RGBA8)
for i in n_of_colors:
var c := offsets[i]
offsets_image.set_pixel(i, 0, Color(c, c, c, c))
var actual_index := gradient.offsets.find(offsets[i])
if actual_index == -1:
actual_index = i
gradient_image.set_pixel(i, 0, gradient.colors[actual_index])
var center := Vector2( var center := Vector2(
animate_panel.get_animated_value(commit_idx, Animate.CENTER_X), animate_panel.get_animated_value(commit_idx, Animate.CENTER_X),
animate_panel.get_animated_value(commit_idx, Animate.CENTER_Y) animate_panel.get_animated_value(commit_idx, Animate.CENTER_Y)
@ -71,8 +53,8 @@ func commit_action(cel: Image, project := Global.current_project) -> void:
) )
var params := { var params := {
"gradient_texture": gradient_edit.texture, "gradient_texture": gradient_edit.texture,
"gradient_texture_no_interpolation": ImageTexture.create_from_image(gradient_image), "gradient_texture_no_interpolation": gradient_edit.get_gradient_texture_no_interpolation(),
"gradient_offset_texture": ImageTexture.create_from_image(offsets_image), "gradient_offset_texture": gradient_edit.get_gradient_offsets_texture(),
"use_dithering": dithering_option_button.selected > 0, "use_dithering": dithering_option_button.selected > 0,
"selection": selection_tex, "selection": selection_tex,
"repeat": repeat_option_button.selected, "repeat": repeat_option_button.selected,
@ -81,7 +63,7 @@ func commit_action(cel: Image, project := Global.current_project) -> void:
"angle": animate_panel.get_animated_value(commit_idx, Animate.ANGLE), "angle": animate_panel.get_animated_value(commit_idx, Animate.ANGLE),
"center": center / 100.0, "center": center / 100.0,
"radius": radius, "radius": radius,
"dither_texture": dither_texture, "dither_texture": selected_dither_matrix.texture,
"shape": shape_option_button.selected, "shape": shape_option_button.selected,
} }

28
src/UI/Nodes/GradientEdit.gd
View file

@ -231,6 +231,34 @@ func set_gradient_texture(new_texture: GradientTexture2D) -> void:
gradient = texture.gradient gradient = texture.gradient
## Construct an image that contains the selected colors of the gradient without interpolation.
func get_gradient_texture_no_interpolation() -> ImageTexture:
var offsets := gradient.offsets
offsets.sort()
var n_of_colors := offsets.size()
var gradient_image := Image.create(n_of_colors, 1, false, Image.FORMAT_RGBA8)
for i in n_of_colors:
var actual_index := gradient.offsets.find(offsets[i])
if actual_index == -1:
actual_index = i
gradient_image.set_pixel(i, 0, gradient.colors[actual_index])
return ImageTexture.create_from_image(gradient_image)
## Pass the gradient offsets as an array to the shader,
## but we can't provide arrays with variable sizes as uniforms, instead we construct
## a Nx1 grayscale texture with each offset stored in each pixel, and pass it to the shader.
func get_gradient_offsets_texture() -> ImageTexture:
var offsets := gradient.offsets
offsets.sort()
var n_of_colors := offsets.size()
var offsets_image := Image.create(n_of_colors, 1, false, Image.FORMAT_L8)
for i in n_of_colors:
var c := offsets[i]
offsets_image.set_pixel(i, 0, Color(c, c, c, c))
return ImageTexture.create_from_image(offsets_image)
func serialize_gradient(grad: Gradient) -> Dictionary: func serialize_gradient(grad: Gradient) -> Dictionary:
var dict := {} var dict := {}
dict["offsets"] = grad.offsets dict["offsets"] = grad.offsets