Merge origin/tmm-dev into tmm-dev

Author: Ivo Zilkenat

source/GM-TE/GMTEBlendLayersCommand.class.st

@@ -0,0 +1,5 @@
+Class {
+	#name : #GMTEBlendLayersCommand,
+	#superclass : #GMTETilemapSizeCommand,
+	#category : #'GM-TE-UI'
+}

source/GM-TE/GMTECompositeCommand.class.st

@@ -1,6 +1,6 @@
 Class {
 	#name : #GMTEDeleteLayersCommand,
-	#superclass : #GMTEEditTilesCommand,
+	#superclass : #GMTETilemapSizeCommand,
 	#instVars : [
 		'layers'
 	],
@@ -9,13 +9,15 @@ Class {
 
 {
 	#category : #'as yet unclassified',
-	#'squeak_changestamp' : 'Alex M 7/10/2024 04:21'
+	#'squeak_changestamp' : 'Alex M 7/12/2024 18:57'
 }
 GMTEDeleteLayersCommand class >> fromLayers: aLayerList editor: anEditor [
 
 	^ (self new)
 		layers: ((SortedCollection sortBlock: [:a :b | a < b]) addAll: aLayerList; yourself);
 		editor: anEditor;
+		newSize: 0 @ 0;
+		saveTiles;
 		yourself
 ]
 
@@ -47,9 +49,10 @@ GMTEDeleteLayersCommand >> layers: anObject [
 
 {
 	#category : #execution,
-	#'squeak_changestamp' : 'Alex M 7/10/2024 04:05'
+	#'squeak_changestamp' : 'Alex M 7/12/2024 18:55'
 }
 GMTEDeleteLayersCommand >> undo [
 
-	self editor addTilemapLayersAt: self layers
+	self editor addTilemapLayersAt: self layers.
+	self restoreTiles
 ]

source/GM-TE/GMTEDeleteLayersCommand.class.st

@@ -77,22 +77,23 @@ GMTEEditTilesCommand >> initialize [
 
 {
 	#category : #execution,
-	#'squeak_changestamp' : 'Alex M 7/10/2024 13:44'
+	#'squeak_changestamp' : 'Alex M 7/12/2024 19:47'
 }
 GMTEEditTilesCommand >> placeTilesFromList: aList [
-	| tile sprite layer x y |
+	| tile sprite layer x y tileMap |
 
+	tileMap := self tileMap.
 	aList keysDo: [ :coordinates |
 		x := coordinates at: 1.
 		y := coordinates at: 2.
 		layer := coordinates at: 3.
 
-		tile := self tileMap tileMatrixStack layer: layer at: y at: x.
+		tile := tileMap tileMatrixStack layer: layer at: y at: x.
 		sprite := aList at: coordinates.
 		tile
 			ifNil: [sprite 
 				ifNotNil: [
-					tile := tileMap generateTileAtlayer: layer x: x y: y stack: self tileMap tileMatrixStack tileType: GMTETile. 
+					tile := tileMap generateTileAtlayer: layer x: x y: y stack: tileMap tileMatrixStack tileType: GMTETile. 
 					tile updateSprite: sprite]]
 			ifNotNil: [sprite
 				ifNil: [