mirror of
https://github.com/tonytins/CozyPixelStudio.git
synced 2025-06-25 07:04:43 -04:00
Added Previews and Better Saturation/Value Lerping
This commit is contained in:
luiq54
parent
2b8796aacc
commit
cb051239dc
4 changed files with 186 additions and 149 deletions
|
|
@ -1011,9 +1011,9 @@ func blend_rect(bg : Image, brush : Image, src_rect : Rect2, dst : Vector2) -> v
|
|||
bg.set_pixel(dst_x, dst_y, out_color)
|
||||
brush.unlock()
|
||||
|
||||
func adjust_hsv(id,delta)->void:
|
||||
func adjust_hsv(img: Image, id, delta)->void:
|
||||
var selection_only:bool = !Global.selected_pixels.empty()
|
||||
var layer:Image = layers[Global.current_layer][0]
|
||||
var layer:Image = img
|
||||
layer.lock()
|
||||
match id:
|
||||
#Hue
|
||||
|
|
@ -1022,25 +1022,25 @@ func adjust_hsv(id,delta)->void:
|
|||
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)
|
||||
var hue = range_lerp(c.h,0,1,-180,180)
|
||||
hue = hue + delta
|
||||
|
||||
while(hue >= 360):
|
||||
while(hue >= 180):
|
||||
hue -= 360
|
||||
while(hue < 0):
|
||||
while(hue < -180):
|
||||
hue += 360
|
||||
c.h = range_lerp(hue,0,360,0,1)
|
||||
c.h = range_lerp(hue,-180,180,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)
|
||||
var hue = range_lerp(c.h,0,1,-180,180)
|
||||
hue = hue + delta
|
||||
|
||||
while(hue >= 360):
|
||||
while(hue >= 180):
|
||||
hue -= 360
|
||||
while(hue < 0):
|
||||
while(hue < -180):
|
||||
hue += 360
|
||||
c.h = range_lerp(hue,0,360,0,1)
|
||||
c.h = range_lerp(hue,-180,180,0,1)
|
||||
layer.set_pixel(i,j,c)
|
||||
|
||||
#Saturation
|
||||
|
|
@ -1049,19 +1049,21 @@ func adjust_hsv(id,delta)->void:
|
|||
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)
|
||||
var sat = c.s
|
||||
if delta > 0:
|
||||
sat = range_lerp(delta,0,100,c.s,1)
|
||||
elif delta < 0:
|
||||
sat = range_lerp(delta,-100,0,0,c.s)
|
||||
c.s = sat
|
||||
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)
|
||||
var sat = c.s
|
||||
if delta > 0:
|
||||
sat = range_lerp(delta,0,100,c.s,1)
|
||||
elif delta < 0:
|
||||
sat = range_lerp(delta,-100,0,0,c.s)
|
||||
c.s = sat
|
||||
print(sat)
|
||||
layer.set_pixel(i,j,c)
|
||||
|
||||
#value
|
||||
|
|
@ -1070,21 +1072,23 @@ func adjust_hsv(id,delta)->void:
|
|||
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
|
||||
var val = c.v
|
||||
if delta > 0:
|
||||
val = range_lerp(delta,0,100,c.v,1)
|
||||
elif delta < 0:
|
||||
val = range_lerp(delta,-100,0,0,c.v)
|
||||
|
||||
val = clamp(val,0,100)
|
||||
c.v = range_lerp(val,0,100,0,1)
|
||||
c.s = val
|
||||
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
|
||||
var val = c.v
|
||||
if delta > 0:
|
||||
val = range_lerp(delta,0,100,c.v,1)
|
||||
elif delta < 0:
|
||||
val = range_lerp(delta,-100,0,0,c.v)
|
||||
|
||||
val = clamp(val,0,100)
|
||||
c.v = range_lerp(val,0,100,0,1)
|
||||
c.v = val
|
||||
layer.set_pixel(i,j,c)
|
||||
|
||||
layer.unlock()
|
||||
update_texture(Global.current_layer)
|
||||
pass
|
||||
|
|
|
|||
|
|
@ -1,45 +1,62 @@
|
|||
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_slider = $MarginContainer/VBoxContainer/HBoxContainer/Sliders/Hue
|
||||
onready var sat_slider = $MarginContainer/VBoxContainer/HBoxContainer/Sliders/Saturation
|
||||
onready var val_slider = $MarginContainer/VBoxContainer/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_spinbox = $MarginContainer/VBoxContainer/HBoxContainer/TextBoxes/Hue
|
||||
onready var sat_spinbox = $MarginContainer/VBoxContainer/HBoxContainer/TextBoxes/Saturation
|
||||
onready var val_spinbox = $MarginContainer/VBoxContainer/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()
|
||||
onready var preview = $MarginContainer/VBoxContainer/TextureRect
|
||||
|
||||
var oldHue = 180
|
||||
var oldSat = 50
|
||||
var oldVal = 50
|
||||
var current_layer:Image
|
||||
var preview_image:Image
|
||||
var preview_texture:ImageTexture
|
||||
|
||||
func _ready():
|
||||
get_close_button().connect("pressed",self,"_on_Cancel_pressed")
|
||||
current_layer = Image.new()
|
||||
preview_image = Image.new()
|
||||
preview_texture = ImageTexture.new()
|
||||
preview_texture.flags = 0
|
||||
|
||||
func _on_HSVDialog_about_to_show():
|
||||
current_layer = Global.canvas.layers[Global.current_layer][0]
|
||||
preview_image.copy_from(current_layer)
|
||||
update_preview()
|
||||
|
||||
func _on_Cancel_pressed():
|
||||
Global.undo_redo.undo()
|
||||
visible = false
|
||||
reset()
|
||||
|
||||
func _on_Apply_pressed():
|
||||
Global.canvas.handle_undo("Draw")
|
||||
Global.canvas.adjust_hsv(current_layer,0,hue_slider.value)
|
||||
Global.canvas.adjust_hsv(current_layer,1,sat_slider.value)
|
||||
Global.canvas.adjust_hsv(current_layer,2,val_slider.value)
|
||||
Global.canvas.update_texture(Global.current_layer)
|
||||
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)
|
||||
hue_slider.value = 0
|
||||
sat_slider.value = 0
|
||||
val_slider.value = 0
|
||||
hue_spinbox.value = 0
|
||||
sat_spinbox.value = 0
|
||||
val_spinbox.value = 0
|
||||
reconnect_signals()
|
||||
|
||||
func update_preview():
|
||||
preview_image.copy_from(current_layer)
|
||||
Global.canvas.adjust_hsv(preview_image,0,hue_slider.value)
|
||||
Global.canvas.adjust_hsv(preview_image,1,sat_slider.value)
|
||||
Global.canvas.adjust_hsv(preview_image,2,val_slider.value)
|
||||
preview_texture.create_from_image(preview_image, 0)
|
||||
preview.texture = preview_texture
|
||||
|
||||
func disconnect_signals():
|
||||
hue_slider.disconnect("value_changed",self,"_on_Hue_value_changed")
|
||||
sat_slider.disconnect("value_changed",self,"_on_Saturation_value_changed")
|
||||
|
|
@ -56,32 +73,20 @@ func reconnect_signals():
|
|||
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)
|
||||
hue_spinbox.value = value
|
||||
hue_slider.value = value
|
||||
update_preview()
|
||||
|
||||
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)
|
||||
|
||||
sat_spinbox.value = value
|
||||
sat_slider.value = value
|
||||
update_preview()
|
||||
|
||||
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)
|
||||
|
||||
val_spinbox.value = value
|
||||
val_slider.value = value
|
||||
update_preview()
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue