Added HSV Adjust Dialog

This commit is contained in:
luiq54 2020-04-13 19:40:17 +05:30
parent bdd3cdf45e
commit 2b8796aacc
5 changed files with 318 additions and 3 deletions

View file

@ -1010,3 +1010,81 @@ func blend_rect(bg : Image, brush : Image, src_rect : Rect2, dst : Vector2) -> v
if out_color.a != 0:
bg.set_pixel(dst_x, dst_y, out_color)
brush.unlock()
func adjust_hsv(id,delta)->void:
var selection_only:bool = !Global.selected_pixels.empty()
var layer:Image = layers[Global.current_layer][0]
layer.lock()
match id:
#Hue
0:
for i in range(layer.get_width()):
for j in range(layer.get_height()):
if(selection_only and Global.selected_pixels.has(Vector2(i,j))):
var c: Color = layer.get_pixel(i,j)
var hue = range_lerp(c.h,0,1,0,360)
hue = hue + delta
while(hue >= 360):
hue -= 360
while(hue < 0):
hue += 360
c.h = range_lerp(hue,0,360,0,1)
layer.set_pixel(i,j,c)
elif(!selection_only):
var c: Color = layer.get_pixel(i,j)
var hue = range_lerp(c.h,0,1,0,360)
hue = hue + delta
while(hue >= 360):
hue -= 360
while(hue < 0):
hue += 360
c.h = range_lerp(hue,0,360,0,1)
layer.set_pixel(i,j,c)
#Saturation
1:
for i in range(layer.get_width()):
for j in range(layer.get_height()):
if(selection_only and Global.selected_pixels.has(Vector2(i,j))):
var c: Color = layer.get_pixel(i,j)
var sat = range_lerp(c.s,0,1,0,100)
sat = sat + delta
sat = clamp(sat,0,100)
c.s = range_lerp(sat,0,100,0,1)
layer.set_pixel(i,j,c)
elif(!selection_only):
var c: Color = layer.get_pixel(i,j)
var sat = range_lerp(c.s,0,1,0,100)
sat = sat + delta
sat = clamp(sat,0,100)
c.s = range_lerp(sat,0,100,0,1)
layer.set_pixel(i,j,c)
#value
2:
for i in range(layer.get_width()):
for j in range(layer.get_height()):
if(selection_only and Global.selected_pixels.has(Vector2(i,j))):
var c: Color = layer.get_pixel(i,j)
var val = range_lerp(c.v,0,1,0,100)
val = val + delta
val = clamp(val,0,100)
c.v = range_lerp(val,0,100,0,1)
layer.set_pixel(i,j,c)
elif(!selection_only):
var c: Color = layer.get_pixel(i,j)
var val = range_lerp(c.v,0,1,0,100)
val = val + delta
val = clamp(val,0,100)
c.v = range_lerp(val,0,100,0,1)
layer.set_pixel(i,j,c)
layer.unlock()
update_texture(Global.current_layer)
pass

View file

@ -0,0 +1,91 @@
extends WindowDialog
onready var hue_slider = $ HBoxContainer/Sliders/Hue
onready var sat_slider = $ HBoxContainer/Sliders/Saturation
onready var val_slider = $ HBoxContainer/Sliders/Value
onready var hue_spinbox = $ HBoxContainer/TextBoxes/Hue
onready var sat_spinbox = $ HBoxContainer/TextBoxes/Saturation
onready var val_spinbox = $ HBoxContainer/TextBoxes/Value
onready var hue_text = $ HBoxContainer/TextBoxes/Hue.get_line_edit()
onready var sat_text = $ HBoxContainer/TextBoxes/Saturation.get_line_edit()
onready var val_text = $ HBoxContainer/TextBoxes/Value.get_line_edit()
var oldHue = 180
var oldSat = 50
var oldVal = 50
func _ready():
get_close_button().connect("pressed",self,"_on_Cancel_pressed")
func _on_Cancel_pressed():
Global.undo_redo.undo()
visible = false
reset()
func _on_Apply_pressed():
Global.canvas.handle_redo("Draw")
reset()
visible = false
func reset():
disconnect_signals()
hue_slider.value = 180
sat_slider.value = 50
val_slider.value = 50
hue_text.text = str(180)
sat_text.text = str(50)
val_text.text = str(50)
reconnect_signals()
func disconnect_signals():
hue_slider.disconnect("value_changed",self,"_on_Hue_value_changed")
sat_slider.disconnect("value_changed",self,"_on_Saturation_value_changed")
val_slider.disconnect("value_changed",self,"_on_Value_value_changed")
hue_spinbox.disconnect("value_changed",self,"_on_Hue_value_changed")
sat_spinbox.disconnect("value_changed",self,"_on_Saturation_value_changed")
val_spinbox.disconnect("value_changed",self,"_on_Value_value_changed")
func reconnect_signals():
hue_slider.connect("value_changed",self,"_on_Hue_value_changed")
sat_slider.connect("value_changed",self,"_on_Saturation_value_changed")
val_slider.connect("value_changed",self,"_on_Value_value_changed")
hue_spinbox.connect("value_changed",self,"_on_Hue_value_changed")
sat_spinbox.connect("value_changed",self,"_on_Saturation_value_changed")
val_spinbox.connect("value_changed",self,"_on_Value_value_changed")
func _on_HSVDialog_about_to_show():
Global.canvas.handle_undo("Draw")
func _on_Hue_value_changed(value):
hue_text.text = str(value)
hue_slider.value = int(value)
var delta = value - oldHue
oldHue = value
Global.canvas.adjust_hsv(0,delta)
func _on_Saturation_value_changed(value):
sat_text.text = str(value)
sat_slider.value = int(value)
var delta = value - oldSat
oldSat = value
Global.canvas.adjust_hsv(1,delta)
func _on_Value_value_changed(value):
val_text.text = str(value)
val_slider.value = int(value)
var delta = value - oldVal
oldVal = value
Global.canvas.adjust_hsv(2,delta)

View file

@ -70,7 +70,8 @@ func _ready() -> void:
"Rotate Image" : 0,
"Invert colors" : 0,
"Desaturation" : 0,
"Outline" : 0
"Outline" : 0,
"Adjust Hue/Sat/Val":0
}
var help_menu_items := {
"View Splash Screen" : 0,
@ -385,6 +386,9 @@ func image_menu_id_pressed(id : int) -> void:
7: # Outline
$OutlineDialog.popup_centered()
Global.can_draw = false
8: # HSV
$HSVDialog.popup_centered()
Global.can_draw = false
func help_menu_id_pressed(id : int) -> void:
match id: