Basic Layer Groups and Timeline Refactor

Translations/Translations.pot

@@ -316,7 +316,7 @@ msgstr ""
 msgid "New frame"
 msgstr ""
 
-msgid "Replace frame"
+msgid "Replace cel"
 msgstr ""
 
 msgid "New layer"
@@ -1540,12 +1540,18 @@ msgstr ""
 msgid "Layer"
 msgstr ""
 
+msgid "Group"
+msgstr ""
+
 msgid "Layers"
 msgstr ""
 
 msgid "Create a new layer"
 msgstr ""
 
+msgid "Create a new group layer"
+msgstr ""
+
 msgid "Remove current layer"
 msgstr ""
 
@@ -1580,6 +1586,9 @@ msgid "Enable/disable cel linking\n\n"
 "Linked cels are being shared across multiple frames"
 msgstr ""
 
+msgid "Expand/collapse group"
+msgstr ""
+
 msgid "Palette"
 msgstr ""
 

assets/graphics/layers/group_collapsed.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/group_collapsed.png-9d08fac1c2f635c754860111d024aa0f.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/graphics/layers/group_collapsed.png"
+dest_files=[ "res://.import/group_collapsed.png-9d08fac1c2f635c754860111d024aa0f.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

assets/graphics/layers/group_expanded.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/group_expanded.png-f3cd620185a4989737d6d9a36f4b57f3.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/graphics/layers/group_expanded.png"
+dest_files=[ "res://.import/group_expanded.png-f3cd620185a4989737d6d9a36f4b57f3.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

assets/graphics/layers/group_new.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/group_new.png-4ebdc7dd84d8c8a7b7979f50f4471543.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/graphics/layers/group_new.png"
+dest_files=[ "res://.import/group_new.png-4ebdc7dd84d8c8a7b7979f50f4471543.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

project.godot

@@ -14,6 +14,16 @@ _global_script_classes=[ {
 "language": "GDScript",
 "path": "res://src/Classes/AnimationTag.gd"
 }, {
+"base": "Reference",
+"class": "BaseCel",
+"language": "GDScript",
+"path": "res://src/Classes/BaseCel.gd"
+}, {
+"base": "Reference",
+"class": "BaseLayer",
+"language": "GDScript",
+"path": "res://src/Classes/BaseLayer.gd"
+}, {
 "base": "VBoxContainer",
 "class": "BaseTool",
 "language": "GDScript",
@@ -30,11 +40,6 @@ _global_script_classes=[ {
 "path": "res://src/UI/Canvas/Canvas.gd"
 }, {
 "base": "Reference",
-"class": "Cel",
-"language": "GDScript",
-"path": "res://src/Classes/Cel.gd"
-}, {
-"base": "Reference",
 "class": "Drawer",
 "language": "GDScript",
 "path": "res://src/Classes/Drawers.gd"
@@ -49,6 +54,16 @@ _global_script_classes=[ {
 "language": "GDScript",
 "path": "res://src/UI/Nodes/GradientEdit.gd"
 }, {
+"base": "BaseCel",
+"class": "GroupCel",
+"language": "GDScript",
+"path": "res://src/Classes/GroupCel.gd"
+}, {
+"base": "BaseLayer",
+"class": "GroupLayer",
+"language": "GDScript",
+"path": "res://src/Classes/GroupLayer.gd"
+}, {
 "base": "Line2D",
 "class": "Guide",
 "language": "GDScript",
@@ -59,11 +74,6 @@ _global_script_classes=[ {
 "language": "GDScript",
 "path": "res://src/Classes/ImageEffect.gd"
 }, {
-"base": "Reference",
-"class": "Layer",
-"language": "GDScript",
-"path": "res://src/Classes/Layer.gd"
-}, {
 "base": "Button",
 "class": "LayerButton",
 "language": "GDScript",
@@ -99,6 +109,16 @@ _global_script_classes=[ {
 "language": "GDScript",
 "path": "res://src/UI/PatternsPopup.gd"
 }, {
+"base": "BaseCel",
+"class": "PixelCel",
+"language": "GDScript",
+"path": "res://src/Classes/PixelCel.gd"
+}, {
+"base": "BaseLayer",
+"class": "PixelLayer",
+"language": "GDScript",
+"path": "res://src/Classes/PixelLayer.gd"
+}, {
 "base": "Reference",
 "class": "Project",
 "language": "GDScript",
@@ -136,23 +156,27 @@ _global_script_classes=[ {
 } ]
 _global_script_class_icons={
 "AnimationTag": "",
+"BaseCel": "",
+"BaseLayer": "",
 "BaseTool": "",
 "Brushes": "",
 "Canvas": "",
-"Cel": "",
 "Drawer": "",
 "Frame": "",
 "GradientEditNode": "",
+"GroupCel": "",
+"GroupLayer": "",
 "Guide": "",
 "ImageEffect": "",
-"Layer": "",
 "LayerButton": "",
 "Palette": "",
 "PaletteColor": "",
 "PaletteGrid": "",
 "PalettePanel": "",
 "PaletteSwatch": "",
 "Patterns": "",
+"PixelCel": "",
+"PixelLayer": "",
 "Project": "",
 "SelectionMap": "",
 "SelectionTool": "",

src/Autoload/DrawingAlgos.gd

@@ -423,6 +423,8 @@ func scale_image(width: int, height: int, interpolation: int) -> void:
 
 	for f in Global.current_project.frames:
 		for i in range(f.cels.size() - 1, -1, -1):
+			if f.cels[i] is GroupCel:
+				continue
 			var sprite := Image.new()
 			sprite.copy_from(f.cels[i].image)
 			# Different method for scale_3x
@@ -449,6 +451,8 @@ func centralize() -> void:
 	# Find used rect of the current frame (across all of the layers)
 	var used_rect := Rect2()
 	for cel in Global.current_project.frames[Global.current_project.current_frame].cels:
+		if not cel is PixelCel:
+			continue
 		var cel_rect: Rect2 = cel.image.get_used_rect()
 		if not cel_rect.has_no_area():
 			used_rect = cel_rect if used_rect.has_no_area() else used_rect.merge(cel_rect)
@@ -457,14 +461,16 @@ func centralize() -> void:
 
 	var offset: Vector2 = (0.5 * (Global.current_project.size - used_rect.size)).floor()
 	general_do_centralize()
-	for c in Global.current_project.frames[Global.current_project.current_frame].cels:
+	for cel in Global.current_project.frames[Global.current_project.current_frame].cels:
+		if not cel is PixelCel:
+			continue
 		var sprite := Image.new()
 		sprite.create(
 			Global.current_project.size.x, Global.current_project.size.y, false, Image.FORMAT_RGBA8
 		)
-		sprite.blend_rect(c.image, used_rect, offset)
-		Global.current_project.undo_redo.add_do_property(c.image, "data", sprite.data)
-		Global.current_project.undo_redo.add_undo_property(c.image, "data", c.image.data)
+		sprite.blend_rect(cel.image, used_rect, offset)
+		Global.current_project.undo_redo.add_do_property(cel.image, "data", sprite.data)
+		Global.current_project.undo_redo.add_undo_property(cel.image, "data", cel.image.data)
 	general_undo_centralize()
 
 
@@ -473,6 +479,8 @@ func crop_image() -> void:
 	var used_rect := Rect2()
 	for f in Global.current_project.frames:
 		for cel in f.cels:
+			if not cel is PixelCel:
+				continue
 			cel.image.unlock()  # May be unneeded now, but keep it just in case
 			var cel_used_rect: Rect2 = cel.image.get_used_rect()
 			if cel_used_rect == Rect2(0, 0, 0, 0):  # If the cel has no content
@@ -493,6 +501,8 @@ func crop_image() -> void:
 	# Loop through all the cels to crop them
 	for f in Global.current_project.frames:
 		for cel in f.cels:
+			if not cel is PixelCel:
+				continue
 			var sprite: Image = cel.image.get_rect(used_rect)
 			Global.current_project.undo_redo.add_do_property(cel.image, "data", sprite.data)
 			Global.current_project.undo_redo.add_undo_property(cel.image, "data", cel.image.data)
@@ -504,6 +514,8 @@ func resize_canvas(width: int, height: int, offset_x: int, offset_y: int) -> voi
 	general_do_scale(width, height)
 	for f in Global.current_project.frames:
 		for c in f.cels:
+			if not c is PixelCel:
+				continue
 			var sprite := Image.new()
 			sprite.create(width, height, false, Image.FORMAT_RGBA8)
 			sprite.blend_rect(

src/Autoload/Export.gd

@@ -380,7 +380,7 @@ func blend_layers(image: Image, frame: Frame, origin: Vector2 = Vector2(0, 0)) -
 	image.lock()
 	var layer_i := 0
 	for cel in frame.cels:
-		if Global.current_project.layers[layer_i].visible:
+		if Global.current_project.layers[layer_i].is_visible_in_hierarchy() and cel is PixelCel:
 			var cel_image := Image.new()
 			cel_image.copy_from(cel.image)
 			cel_image.lock()
@@ -406,9 +406,12 @@ func blend_selected_cels(image: Image, frame: Frame, origin: Vector2 = Vector2(0
 		var test_array = [Global.current_project.current_frame, cel_ind]
 		if not test_array in Global.current_project.selected_cels:
 			continue
+		if not frame.cels[cel_ind] is PixelCel:
+			continue
+
+		var cel: PixelCel = frame.cels[cel_ind]
 
-		var cel: Cel = frame.cels[cel_ind]
-		if Global.current_project.layers[layer_i].visible:
+		if Global.current_project.layers[layer_i].is_visible_in_hierarchy():
 			var cel_image := Image.new()
 			cel_image.copy_from(cel.image)
 			cel_image.lock()

src/Autoload/Global.gd

@@ -2,6 +2,7 @@ extends Node
 
 signal project_changed
 
+enum LayerTypes { PIXEL, GROUP }
 enum GridTypes { CARTESIAN, ISOMETRIC, ALL }
 enum PressureSensitivity { NONE, ALPHA, SIZE, ALPHA_AND_SIZE }
 enum ColorFrom { THEME, CUSTOM }
@@ -59,7 +60,6 @@ var current_project_index := 0 setget _project_changed
 var ui_tooltips := {}
 
 # Canvas related stuff
-var layers_changed_skip := false
 var can_draw := false
 var move_guides_on_canvas := false
 var has_focus := false
@@ -144,6 +144,10 @@ var palettes := {}
 
 # Nodes
 var notification_label_node: PackedScene = preload("res://src/UI/NotificationLabel.tscn")
+var pixel_layer_button_node: PackedScene = preload("res://src/UI/Timeline/PixelLayerButton.tscn")
+var group_layer_button_node: PackedScene = preload("res://src/UI/Timeline/GroupLayerButton.tscn")
+var pixel_cel_button_node: PackedScene = preload("res://src/UI/Timeline/PixelCelButton.tscn")
+var group_cel_button_node: PackedScene = preload("res://src/UI/Timeline/GroupCelButton.tscn")
 
 onready var control: Node = get_tree().current_scene
 
@@ -449,24 +453,14 @@ func undo_or_redo(
 		if action_name == "Scale":
 			for i in project.frames.size():
 				for j in project.layers.size():
-					var current_cel: Cel = project.frames[i].cels[j]
-					current_cel.image_texture.create_from_image(current_cel.image, 0)
+					var current_cel: BaseCel = project.frames[i].cels[j]
+					current_cel.image_texture.create_from_image(current_cel.get_image(), 0)
 			canvas.camera_zoom()
 			canvas.grid.update()
 			canvas.pixel_grid.update()
 			project.selection_map_changed()
 			cursor_position_label.text = "[%s×%s]" % [project.size.x, project.size.y]
 
-	elif "Frame" in action_name:
-		# This actually means that frames.size is one, but it hasn't been updated yet
-		if (undo and project.frames.size() == 2) or project.frames.size() == 1:  # Stop animating
-			play_forward.pressed = false
-			play_backwards.pressed = false
-			animation_timer.stop()
-
-	elif "Move Cels" == action_name:
-		project.frames = project.frames  # to call frames_changed
-
 	canvas.update()
 	if !project.has_changed:
 		project.has_changed = true