tonytins/CozyPixelStudio
1
0
Fork 0
mirror of https://github.com/tonytins/CozyPixelStudio.git synced 2025-06-25 07:04:43 -04:00
Code Issues Projects Releases Wiki Activity

Fix minor bugs and cleanup

Browse source
This commit is contained in:
luiq54 2020-04-15 15:19:29 +05:30
parent cb051239dc
commit 8fdeb63778
6 changed files with 33 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Scripts/Canvas.gd
View file

@ -1011,7 +1011,7 @@ 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(img: Image, id, delta)->void:
func adjust_hsv(img: Image, id : int, delta : float)->void:
var selection_only:bool = !Global.selected_pixels.empty()
var layer:Image = img
layer.lock()
@ -1024,7 +1024,7 @@ func adjust_hsv(img: Image, id, delta)->void:
var c: Color = layer.get_pixel(i,j)
var hue = range_lerp(c.h,0,1,-180,180)
hue = hue + delta
while(hue >= 180):
hue -= 360
while(hue < -180):
@ -1035,14 +1035,14 @@ func adjust_hsv(img: Image, id, delta)->void:
var c: Color = layer.get_pixel(i,j)
var hue = range_lerp(c.h,0,1,-180,180)
hue = hue + delta
while(hue >= 180):
hue -= 360
while(hue < -180):
hue += 360
c.h = range_lerp(hue,-180,180,0,1)
layer.set_pixel(i,j,c)
#Saturation
1:
for i in range(layer.get_width()):
@ -1055,6 +1055,7 @@ func adjust_hsv(img: Image, id, delta)->void:
elif delta < 0:
sat = range_lerp(delta,-100,0,0,c.s)
c.s = sat
layer.set_pixel(i,j,c)
elif(!selection_only):
var c: Color = layer.get_pixel(i,j)
var sat = c.s
@ -1063,9 +1064,8 @@ func adjust_hsv(img: Image, id, delta)->void:
elif delta < 0:
sat = range_lerp(delta,-100,0,0,c.s)
c.s = sat
print(sat)
layer.set_pixel(i,j,c)
#value
2:
for i in range(layer.get_width()):
@ -1077,8 +1077,8 @@ func adjust_hsv(img: Image, id, delta)->void:
val = range_lerp(delta,0,100,c.v,1)
elif delta < 0:
val = range_lerp(delta,-100,0,0,c.v)
c.s = val
c.v = val
layer.set_pixel(i,j,c)
elif(!selection_only):
var c: Color = layer.get_pixel(i,j)
@ -1087,7 +1087,7 @@ func adjust_hsv(img: Image, id, delta)->void:
val = range_lerp(delta,0,100,c.v,1)
elif delta < 0:
val = range_lerp(delta,-100,0,0,c.v)
c.v = val
layer.set_pixel(i,j,c)
layer.unlock()

8
Scripts/Dialogs/HSVDialog.gd
View file

@ -39,7 +39,7 @@ func _on_Apply_pressed():
reset()
visible = false
func reset():
func reset() -> void:
disconnect_signals()
hue_slider.value = 0
sat_slider.value = 0
@ -49,7 +49,7 @@ func reset():
val_spinbox.value = 0
reconnect_signals()
func update_preview():
func update_preview() -> void:
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)
@ -57,7 +57,7 @@ func update_preview():
preview_texture.create_from_image(preview_image, 0)
preview.texture = preview_texture
func disconnect_signals():
func disconnect_signals() -> void:
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")
@ -65,7 +65,7 @@ func disconnect_signals():
sat_spinbox.disconnect("value_changed",self,"_on_Saturation_value_changed")
val_spinbox.disconnect("value_changed",self,"_on_Value_value_changed")
func reconnect_signals():
func reconnect_signals() -> void:
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")

2
Scripts/Main.gd
View file

@ -71,7 +71,7 @@ func _ready() -> void:
"Invert colors" : 0,
"Desaturation" : 0,
"Outline" : 0,
"Adjust Hue/Sat/Val":0
"Adjust Hue/Saturation/Value":0
}
var help_menu_items := {
"View Splash Screen" : 0,