Changed Global node variables to arrays for left/right

Instead of having 2 variables for left & right nodes, use an array instead. This will help with better looking code, automation and less repetitive code, as seen in ToolButtons.gd. Move related refactoring will follow.
This commit is contained in:
OverloadedOrama 2020-05-31 18:03:44 +03:00
parent 37a8ad2447
commit c538140de2
12 changed files with 187 additions and 230 deletions

View file

@ -27,8 +27,8 @@ func open(palette : String) -> void:
self.popup_centered()
Global.dialog_open(true)
left_color_button.modulate = Global.left_color_picker.color
right_color_button.modulate = Global.right_color_picker.color
left_color_button.modulate = Global.color_pickers[0].color
right_color_button.modulate = Global.color_pickers[1].color
func _display_palette() -> void:
@ -177,12 +177,12 @@ func _refresh_hint_tooltip(_index : int) -> void:
func _on_LeftColor_pressed() -> void:
color_picker.color = Global.left_color_picker.color
color_picker.color = Global.color_pickers[0].color
_on_EditPaletteColorPicker_color_changed(color_picker.color)
func _on_RightColor_pressed() -> void:
color_picker.color = Global.right_color_picker.color
color_picker.color = Global.color_pickers[1].color
_on_EditPaletteColorPicker_color_changed(color_picker.color)

View file

@ -165,10 +165,10 @@ func on_color_select(index : int) -> void:
var color : Color = Global.palettes[current_palette].get_color(index)
if Input.is_action_just_pressed("left_mouse"):
Global.left_color_picker.color = color
Global.color_pickers[0].color = color
Global.update_left_custom_brush()
elif Input.is_action_just_pressed("right_mouse"):
Global.right_color_picker.color = color
Global.color_pickers[1].color = color
Global.update_right_custom_brush()