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

Merge branch 'master' of github.com:Variable-ind/Pixelorama into Tile-Imps

Browse source
This commit is contained in:
Variable 2024-12-06 21:18:58 +05:00
parent f6a2aa9253 d41037d2df
commit 4df163568e
3 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Classes/Cels/CelTileMap.gd
View file

@ -656,6 +656,21 @@ func update_texture(undo := false) -> void:
var tile_size := current_tile.image.get_size() var tile_size := current_tile.image.get_size()
image.blit_rect(current_tile.image, Rect2i(Vector2i.ZERO, tile_size), coords) image.blit_rect(current_tile.image, Rect2i(Vector2i.ZERO, tile_size), coords)
continue continue
if not editing_images.has(index):
if not _tiles_equal(i, image_portion, current_tile.image):
var transformed_image := transform_tile(
image_portion, cell_data.flip_h, cell_data.flip_v, cell_data.transpose, true
)
editing_images[index] = [i, transformed_image]
for i in cells.size():
var cell_data := cells[i]
var index := cell_data.index
if index >= tileset.tiles.size():
index = 0
var coords := get_cell_coords_in_image(i)
var rect := Rect2i(coords, tileset.tile_size)
var image_portion := image.get_region(rect)
if editing_images.has(index): if editing_images.has(index):
var editing_portion := editing_images[index][0] as int var editing_portion := editing_images[index][0] as int
if i == editing_portion: if i == editing_portion:
@ -670,12 +685,6 @@ func update_texture(undo := false) -> void:
if not image_portion.get_data() == transformed_editing_image.get_data(): if not image_portion.get_data() == transformed_editing_image.get_data():
var tile_size := image_portion.get_size() var tile_size := image_portion.get_size()
image.blit_rect(transformed_editing_image, Rect2i(Vector2i.ZERO, tile_size), coords) image.blit_rect(transformed_editing_image, Rect2i(Vector2i.ZERO, tile_size), coords)
else:
if not _tiles_equal(i, image_portion, current_tile.image):
var transformed_image := transform_tile(
image_portion, cell_data.flip_h, cell_data.flip_v, cell_data.transpose, true
)
editing_images[index] = [i, transformed_image]
super.update_texture(undo) super.update_texture(undo)

1
src/Tools/BaseDraw.gd
View file

@ -276,6 +276,7 @@ func prepare_undo(action: String) -> void:
func commit_undo() -> void: func commit_undo() -> void:
var project := Global.current_project var project := Global.current_project
Global.canvas.update_selected_cels_textures(project)
project.update_tilemaps(_undo_data) project.update_tilemaps(_undo_data)
var redo_data := _get_undo_data() var redo_data := _get_undo_data()
var frame := -1 var frame := -1

1
src/Tools/UtilityTools/Text.gd
View file

@ -163,6 +163,7 @@ func text_to_pixels() -> void:
func commit_undo(action: String, undo_data: Dictionary) -> void: func commit_undo(action: String, undo_data: Dictionary) -> void:
var project := Global.current_project var project := Global.current_project
Global.canvas.update_selected_cels_textures(project)
project.update_tilemaps(undo_data) project.update_tilemaps(undo_data)
var redo_data := _get_undo_data() var redo_data := _get_undo_data()
var frame := -1 var frame := -1