huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-02-07 10:59:49 +00:00
Code Issues Wiki Activity

Dim cel buttons based on whether the cel is transparent/empty or not

Browse source 
Should replace #817, but in a more optimized way, as it does not rely on _input().
This commit is contained in:
Emmanouil Papadeas 2023-03-17 00:02:01 +02:00
parent ad3a0155b6
commit 1a769293fc
3 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Classes/BaseCel.gd
View file

@ -1,7 +1,9 @@
class_name BaseCel class_name BaseCel
extends Reference extends Reference
# Base class for cel properties. ## Base class for cel properties.
# The term "cel" comes from "celluloid" (https://en.wikipedia.org/wiki/Cel). ## The term "cel" comes from "celluloid" (https://en.wikipedia.org/wiki/Cel).
signal texture_changed
var opacity: float var opacity: float
var image_texture: ImageTexture var image_texture: ImageTexture
@ -41,6 +43,7 @@ func get_image() -> Image:
func update_texture() -> void: func update_texture() -> void:
emit_signal("texture_changed")
return return

1
src/Classes/PixelCel.gd
View file

@ -56,6 +56,7 @@ func get_image() -> Image:
func update_texture() -> void: func update_texture() -> void:
image_texture.set_data(image) image_texture.set_data(image)
.update_texture()
func save_image_data_to_pxo(file: File) -> void: func save_image_data_to_pxo(file: File) -> void:

31
src/UI/Timeline/CelButton.gd
View file

@ -8,10 +8,15 @@ var cel: BaseCel
onready var popup_menu: PopupMenu = get_node_or_null("PopupMenu") onready var popup_menu: PopupMenu = get_node_or_null("PopupMenu")
onready var linked_indicator: Polygon2D = get_node_or_null("LinkedIndicator") onready var linked_indicator: Polygon2D = get_node_or_null("LinkedIndicator")
onready var cel_texture: TextureRect = $CelTexture
onready var transparent_checker: ColorRect = $CelTexture/TransparentChecker
func _ready() -> void: func _ready() -> void:
cel = Global.current_project.frames[frame].cels[layer]
button_setup() button_setup()
_dim_checker()
cel.connect("texture_changed", self, "_dim_checker")
func button_setup() -> void: func button_setup() -> void:
@ -20,21 +25,19 @@ func button_setup() -> void:
var base_layer: BaseLayer = Global.current_project.layers[layer] var base_layer: BaseLayer = Global.current_project.layers[layer]
hint_tooltip = tr("Frame: %s, Layer: %s") % [frame + 1, base_layer.name] hint_tooltip = tr("Frame: %s, Layer: %s") % [frame + 1, base_layer.name]
cel = Global.current_project.frames[frame].cels[layer] cel_texture.texture = cel.image_texture
$CelTexture.texture = cel.image_texture
if is_instance_valid(linked_indicator): if is_instance_valid(linked_indicator):
linked_indicator.visible = cel.link_set != null linked_indicator.visible = cel.link_set != null
if cel.link_set != null: if cel.link_set != null:
linked_indicator.color.h = cel.link_set["hue"] linked_indicator.color.h = cel.link_set["hue"]
# Reset the checkers size because it assumes you want the same size as the canvas # Reset the checkers size because it assumes you want the same size as the canvas
var checker = $CelTexture/TransparentChecker transparent_checker.rect_size = transparent_checker.get_parent().rect_size
checker.rect_size = checker.get_parent().rect_size
func _on_CelButton_resized() -> void: func _on_CelButton_resized() -> void:
get_node("CelTexture").rect_min_size.x = rect_min_size.x - 4 cel_texture.rect_min_size.x = rect_min_size.x - 4
get_node("CelTexture").rect_min_size.y = rect_min_size.y - 4 cel_texture.rect_min_size.y = rect_min_size.y - 4
if is_instance_valid(linked_indicator): if is_instance_valid(linked_indicator):
linked_indicator.polygon[1].x = rect_min_size.x linked_indicator.polygon[1].x = rect_min_size.x
@ -194,15 +197,25 @@ func _delete_cel_content() -> void:
project.undo_redo.commit_action() project.undo_redo.commit_action()
func _dim_checker() -> void:
var image := cel_texture.texture.get_data()
if image == null:
return
if image.is_empty() or image.is_invisible():
transparent_checker.self_modulate.a = 0.5
else:
transparent_checker.self_modulate.a = 1.0
func get_drag_data(_position) -> Array: func get_drag_data(_position) -> Array:
var button := Button.new() var button := Button.new()
button.rect_size = rect_size button.rect_size = rect_size
button.theme = Global.control.theme button.theme = Global.control.theme
var texture_rect := TextureRect.new() var texture_rect := TextureRect.new()
texture_rect.rect_size = $CelTexture.rect_size texture_rect.rect_size = cel_texture.rect_size
texture_rect.rect_position = $CelTexture.rect_position texture_rect.rect_position = cel_texture.rect_position
texture_rect.expand = true texture_rect.expand = true
texture_rect.texture = $CelTexture.texture texture_rect.texture = cel_texture.texture
button.add_child(texture_rect) button.add_child(texture_rect)
set_drag_preview(button) set_drag_preview(button)