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

Optimize canvas drawing by only calling queue_redraw when the image has changed

Browse source
This commit is contained in:
Emmanouil Papadeas 2023-10-31 14:06:59 +02:00
parent 76e8dfeaaf
commit 58e694abec
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Tools/3DShapeEdit.gd
View file

@ -77,6 +77,7 @@ var _object_names := {
func sprite_changed_this_frame(): func sprite_changed_this_frame():
_checker_update_qued = true _checker_update_qued = true
_old_cel_image = _cel.get_image() _old_cel_image = _cel.get_image()
Global.canvas.sprite_changed_this_frame = true
func _input(_event: InputEvent) -> void: func _input(_event: InputEvent) -> void:

17
src/UI/Canvas/Canvas.gd
View file

@ -69,7 +69,7 @@ func _input(event: InputEvent) -> void:
): ):
return return
var tmp_position: Vector2 = Global.main_viewport.get_local_mouse_position() var tmp_position := Global.main_viewport.get_local_mouse_position()
if get_velocity: if get_velocity:
var velocity := Input.get_vector( var velocity := Input.get_vector(
"move_mouse_left", "move_mouse_right", "move_mouse_up", "move_mouse_down" "move_mouse_left", "move_mouse_right", "move_mouse_up", "move_mouse_down"
@ -82,14 +82,12 @@ func _input(event: InputEvent) -> void:
var tmp_transform := get_canvas_transform().affine_inverse() var tmp_transform := get_canvas_transform().affine_inverse()
current_pixel = tmp_transform.basis_xform(tmp_position) + tmp_transform.origin current_pixel = tmp_transform.basis_xform(tmp_position) + tmp_transform.origin
if Global.has_focus:
queue_redraw()
sprite_changed_this_frame = false sprite_changed_this_frame = false
Tools.handle_draw(Vector2i(current_pixel.floor()), event) Tools.handle_draw(Vector2i(current_pixel.floor()), event)
if sprite_changed_this_frame: if sprite_changed_this_frame:
if Global.has_focus:
queue_redraw()
update_selected_cels_textures() update_selected_cels_textures()
@ -106,7 +104,7 @@ func update_texture(layer_i: int, frame_i := -1, project := Global.current_proje
frame_i = project.current_frame frame_i = project.current_frame
if frame_i < project.frames.size() and layer_i < project.layers.size(): if frame_i < project.frames.size() and layer_i < project.layers.size():
var current_cel: BaseCel = project.frames[frame_i].cels[layer_i] var current_cel := project.frames[frame_i].cels[layer_i]
current_cel.update_texture() current_cel.update_texture()
@ -115,7 +113,7 @@ func update_selected_cels_textures(project := Global.current_project) -> void:
var frame_index: int = cel_index[0] var frame_index: int = cel_index[0]
var layer_index: int = cel_index[1] var layer_index: int = cel_index[1]
if frame_index < project.frames.size() and layer_index < project.layers.size(): if frame_index < project.frames.size() and layer_index < project.layers.size():
var current_cel: BaseCel = project.frames[frame_index].cels[layer_index] var current_cel := project.frames[frame_index].cels[layer_index]
current_cel.update_texture() current_cel.update_texture()
@ -129,7 +127,8 @@ func draw_layers() -> void:
for i in Global.current_project.layers.size(): for i in Global.current_project.layers.size():
if current_cels[i] is GroupCel: if current_cels[i] is GroupCel:
continue continue
if Global.current_project.layers[i].is_visible_in_hierarchy(): var layer := Global.current_project.layers[i]
if layer.is_visible_in_hierarchy():
var cel_image := current_cels[i].get_image() var cel_image := current_cels[i].get_image()
textures.append(cel_image) textures.append(cel_image)
opacities.append(current_cels[i].opacity) opacities.append(current_cels[i].opacity)
@ -137,7 +136,7 @@ func draw_layers() -> void:
origins.append(Vector2(move_preview_location) / Vector2(cel_image.get_size())) origins.append(Vector2(move_preview_location) / Vector2(cel_image.get_size()))
else: else:
origins.append(Vector2.ZERO) origins.append(Vector2.ZERO)
blend_modes.append(Global.current_project.layers[i].blend_mode) blend_modes.append(layer.blend_mode)
var texture_array := Texture2DArray.new() var texture_array := Texture2DArray.new()
texture_array.create_from_images(textures) texture_array.create_from_images(textures)
material.set_shader_parameter("layers", texture_array) material.set_shader_parameter("layers", texture_array)