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

Add a get_current_cel() method in Project

Browse source
This commit is contained in:
Emmanouil Papadeas 2023-01-02 15:30:45 +02:00
parent 3c4b9ad5b4
commit 47ef98ec76
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Classes/Project.gd
View file

@ -127,6 +127,10 @@ func new_empty_frame() -> Frame:
return frame return frame
func get_current_cel() -> BaseCel:
return frames[current_frame].cels[current_layer]
func selection_map_changed() -> void: func selection_map_changed() -> void:
var image_texture := ImageTexture.new() var image_texture := ImageTexture.new()
has_selection = !selection_map.is_invisible() has_selection = !selection_map.is_invisible()

3
src/Tools/BaseTool.gd
View file

@ -88,8 +88,7 @@ func _get_draw_rect() -> Rect2:
func _get_draw_image() -> Image: func _get_draw_image() -> Image:
var project: Project = Global.current_project return Global.current_project.get_current_cel().get_image()
return project.frames[project.current_frame].cels[project.current_layer].get_image()
func _get_selected_draw_images() -> Array: # Array of Images func _get_selected_draw_images() -> Array: # Array of Images

10
src/UI/Canvas/Selection.gd
View file

@ -567,7 +567,7 @@ func transform_content_cancel() -> void:
project.selection_map_changed() project.selection_map_changed()
preview_image = original_preview_image preview_image = original_preview_image
if !is_pasting: if !is_pasting:
var cel_image: Image = project.frames[project.current_frame].cels[project.current_layer].image var cel_image: Image = project.get_current_cel().get_image()
cel_image.blit_rect_mask( cel_image.blit_rect_mask(
preview_image, preview_image,
preview_image, preview_image,
@ -669,7 +669,7 @@ func copy() -> void:
var cl_big_bounding_rectangle := Rect2() var cl_big_bounding_rectangle := Rect2()
var cl_selection_offset := Vector2.ZERO var cl_selection_offset := Vector2.ZERO
var image: Image = project.frames[project.current_frame].cels[project.current_layer].get_image() var image: Image = project.get_current_cel().get_image()
var to_copy := Image.new() var to_copy := Image.new()
if !project.has_selection: if !project.has_selection:
to_copy.copy_from(image) to_copy.copy_from(image)
@ -805,7 +805,7 @@ func delete(selected_cels := true) -> void:
if selected_cels: if selected_cels:
images = _get_selected_draw_images() images = _get_selected_draw_images()
else: else:
images = [project.frames[project.current_frame].cels[project.current_layer].image] images = [project.get_current_cel().get_image()]
if project.has_selection: if project.has_selection:
var blank := Image.new() var blank := Image.new()
@ -829,7 +829,7 @@ func new_brush() -> void:
if !project.has_selection: if !project.has_selection:
return return
var image: Image = project.frames[project.current_frame].cels[project.current_layer].image var image: Image = project.get_current_cel().get_image()
var brush := Image.new() var brush := Image.new()
if is_moving_content: if is_moving_content:
brush.copy_from(preview_image) brush.copy_from(preview_image)
@ -911,7 +911,7 @@ func clear_selection(use_undo := false) -> void:
func _get_preview_image() -> void: func _get_preview_image() -> void:
var project: Project = Global.current_project var project: Project = Global.current_project
var cel_image: Image = project.frames[project.current_frame].cels[project.current_layer].image var cel_image: Image = project.get_current_cel().get_image()
if original_preview_image.is_empty(): if original_preview_image.is_empty():
# original_preview_image.copy_from(cel_image) # original_preview_image.copy_from(cel_image)
original_preview_image = cel_image.get_rect(big_bounding_rectangle) original_preview_image = cel_image.get_rect(big_bounding_rectangle)