Merge pull request #199 from luiq54/devel

Added HSV Adjust Dialog

Scripts/Canvas.gd

@@ -1010,3 +1010,85 @@ 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(img: Image, id : int, delta : float)->void:
+	var selection_only:bool = !Global.selected_pixels.empty()
+	var layer:Image = img
+	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,-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)
+					elif(!selection_only):
+						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()):
+				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 = 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
+						layer.set_pixel(i,j,c)
+					elif(!selection_only):
+						var c: Color = layer.get_pixel(i,j)
+						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
+						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 = 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)
+
+						c.v = val
+						layer.set_pixel(i,j,c)
+					elif(!selection_only):
+						var c: Color = layer.get_pixel(i,j)
+						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)
+
+						c.v = val
+						layer.set_pixel(i,j,c)
+	layer.unlock()
+	pass

Scripts/Dialogs/HSVDialog.gd

@@ -0,0 +1,96 @@
+extends WindowDialog
+
+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 = $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 preview = $MarginContainer/VBoxContainer/TextureRect
+
+var current_layer:Image
+var preview_image:Image
+var preview_texture:ImageTexture
+
+func _ready():
+	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():
+	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() -> void:
+	disconnect_signals()
+	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() -> 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)
+	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() -> 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")
+	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() -> 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")
+	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_Hue_value_changed(value):
+	hue_spinbox.value = value
+	hue_slider.value = value
+	update_preview()
+
+func _on_Saturation_value_changed(value):
+	sat_spinbox.value = value
+	sat_slider.value = value
+	update_preview()
+
+func _on_Value_value_changed(value):
+	val_spinbox.value = value
+	val_slider.value = value
+	update_preview()
+
+
+
+
+
+
+

Scripts/Main.gd

@@ -70,7 +70,8 @@ func _ready() -> void:
 		"Rotate Image" : 0,
 		"Invert colors" : 0,
 		"Desaturation" : 0,
-		"Outline" : 0
+		"Outline" : 0,
+		"Adjust Hue/Saturation/Value":0
 		}
 	var help_menu_items := {
 		"View Splash Screen" : 0,
@@ -387,6 +388,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: