huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-02-13 17:23:08 +00:00
Code Issues Wiki Activity

Make it work with transparent colors (more consistent with aseprite), and improve ui a bit. This should be the last commit to this pr

Browse source
This commit is contained in:
Variable 2024-09-15 17:19:50 +05:00
parent cf8aeda4e2
commit dfa98edfd5
2 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Tools/DesignTools/Shading.gd
View file

@ -13,6 +13,7 @@ var _hue_amount := 10
var _sat_amount := 10 var _sat_amount := 10
var _value_amount := 10 var _value_amount := 10
var _colors_right := 10 var _colors_right := 10
var _old_palette: Palette
class LightenDarkenOp: class LightenDarkenOp:
@ -33,7 +34,7 @@ class LightenDarkenOp:
func process(_src: Color, dst: Color) -> Color: func process(_src: Color, dst: Color) -> Color:
changed = true changed = true
if dst.a == 0: if dst.a == 0 and shading_mode != ShadingMode.COLOR_REPLACE:
return dst return dst
if shading_mode == ShadingMode.SIMPLE: if shading_mode == ShadingMode.SIMPLE:
if lighten_or_darken == LightenDarken.LIGHTEN: if lighten_or_darken == LightenDarken.LIGHTEN:
@ -120,8 +121,7 @@ class LightenDarkenOp:
func _init() -> void: func _init() -> void:
_drawer.color_op = LightenDarkenOp.new() _drawer.color_op = LightenDarkenOp.new()
Tools.color_changed.connect(_check_palette_color) Tools.color_changed.connect(_refresh_colors_array)
Palettes.palette_selected.connect(_check_palette_color)
Palettes.palette_selected.connect(palette_changed) Palettes.palette_selected.connect(palette_changed)
@ -221,7 +221,7 @@ func update_config() -> void:
$AmountSlider.visible = _shading_mode == ShadingMode.SIMPLE $AmountSlider.visible = _shading_mode == ShadingMode.SIMPLE
$HueShiftingOptions.visible = _shading_mode == ShadingMode.HUE_SHIFTING $HueShiftingOptions.visible = _shading_mode == ShadingMode.HUE_SHIFTING
$ColorReplaceOptions.visible = _shading_mode == ShadingMode.COLOR_REPLACE $ColorReplaceOptions.visible = _shading_mode == ShadingMode.COLOR_REPLACE
_check_palette_color() _refresh_colors_array()
update_strength() update_strength()
@ -324,7 +324,7 @@ func update_brush() -> void:
## this function is also used by a signal, this is why there is _color = Color.TRANSPARENT in here. ## this function is also used by a signal, this is why there is _color = Color.TRANSPARENT in here.
func _check_palette_color(_color = Color.TRANSPARENT, mouse_button := tool_slot.button) -> void: func _refresh_colors_array(_color = Color.TRANSPARENT, mouse_button := tool_slot.button) -> void:
if mouse_button != tool_slot.button: if mouse_button != tool_slot.button:
return return
if _shading_mode == ShadingMode.COLOR_REPLACE: if _shading_mode == ShadingMode.COLOR_REPLACE:
@ -359,9 +359,16 @@ func construct_preview() -> void:
var color_rect := ColorRect.new() var color_rect := ColorRect.new()
color_rect.color = color color_rect.color = color
color_rect.custom_minimum_size = Vector2(20, 20) color_rect.custom_minimum_size = Vector2(20, 20)
var checker = preload("res://src/UI/Nodes/TransparentChecker.tscn").instantiate()
checker.show_behind_parent = true
checker.set_anchors_preset(Control.PRESET_FULL_RECT)
color_rect.add_child(checker)
colors_container.add_child(color_rect) colors_container.add_child(color_rect)
func palette_changed(_palette_name): func palette_changed(_palette_name):
Palettes.current_palette.data_changed.connect(_check_palette_color) if _old_palette:
_check_palette_color() _old_palette.data_changed.disconnect(_refresh_colors_array)
Palettes.current_palette.data_changed.connect(_refresh_colors_array)
_old_palette = Palettes.current_palette
_refresh_colors_array()

17
src/Tools/DesignTools/Shading.tscn
View file

@ -72,6 +72,7 @@ value = 10.0
prefix = "Value:" prefix = "Value:"
[node name="ColorReplaceOptions" type="VBoxContainer" parent="." index="9"] [node name="ColorReplaceOptions" type="VBoxContainer" parent="." index="9"]
visible = false
layout_mode = 2 layout_mode = 2
[node name="Settings" type="VBoxContainer" parent="ColorReplaceOptions" index="0"] [node name="Settings" type="VBoxContainer" parent="ColorReplaceOptions" index="0"]
@ -84,9 +85,21 @@ max_value = 10.0
allow_greater = true allow_greater = true
prefix = "Colors Right" prefix = "Colors Right"
[node name="Label" type="Label" parent="ColorReplaceOptions/Settings" index="1"] [node name="HBoxContainer" type="HBoxContainer" parent="ColorReplaceOptions/Settings" index="1"]
layout_mode = 2 layout_mode = 2
text = "(Darken <--> Lighten)"
[node name="DarkenLabel" type="Label" parent="ColorReplaceOptions/Settings/HBoxContainer" index="0"]
layout_mode = 2
text = "Darken"
[node name="HSeparator" type="HSeparator" parent="ColorReplaceOptions/Settings/HBoxContainer" index="1"]
layout_mode = 2
size_flags_horizontal = 3
[node name="LightenLabel" type="Label" parent="ColorReplaceOptions/Settings/HBoxContainer" index="2"]
layout_mode = 2
text = "Lighten"
horizontal_alignment = 2
[node name="Colors" type="HFlowContainer" parent="ColorReplaceOptions/Settings" index="2"] [node name="Colors" type="HFlowContainer" parent="ColorReplaceOptions/Settings" index="2"]
layout_mode = 2 layout_mode = 2