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

Added Previews and Better Saturation/Value Lerping

Browse source
This commit is contained in:
luiq54 2020-04-14 16:21:35 +05:30
parent 2b8796aacc
commit cb051239dc
4 changed files with 186 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

66
Scripts/Canvas.gd
View file

@ -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