Merge origin/tmm-dev into tmm-dev

Author: jostja

source/GM-TE/GMTEEditorTileMap.class.st

@@ -55,7 +55,7 @@ GMTEEditorTileMap >> currentTileChanges: aTileDictionary [
 
 {
 	#category : #updating,
-	#'squeak_changestamp' : 'Alex M 7/12/2024 17:16'
+	#'squeak_changestamp' : 'Valentin Teutschbein 7/12/2024 18:28'
 }
 GMTEEditorTileMap >> deleteTiles: anIndexSet inLayer: aLayer [
 	"delete tiles from editable matrix stack at given indices"
@@ -220,13 +220,13 @@ GMTEEditorTileMap >> mouseUp: anEvent [
 
 {
 	#category : #updating,
-	#'squeak_changestamp' : 'Alex M 7/12/2024 17:15'
+	#'squeak_changestamp' : 'Valentin Teutschbein 7/12/2024 18:27'
 }
-GMTEEditorTileMap >> placeTiles: aCoordinateCollection inLayer: aLayer [
+GMTEEditorTileMap >> placeTiles: anIndexSet inLayer: aLayer [
 	"add currently selected tile (model) to editable matrix stack at given indices"
-	
+
 	| tile |
-	aCoordinateCollection do: [:c |
+	anIndexSet do: [:c |
 		self savePreviousImageFromIndex: c inLayer: aLayer.
 		((self tileMatrixStack layer: aLayer) inBounds: c) ifTrue: [
 				tile := self tileMatrixStack layer: aLayer at: c y at: c x.

source/GM-TE/GMTETileMap.class.st

@@ -296,6 +296,23 @@ GMTETileMap >> correctedTilePositionMap: aPoint [
 	^ self correctedTilePosition: aPoint startingOffset: self tileCornerOffsetMap
 ]
 
+{
+	#category : #updating,
+	#'squeak_changestamp' : 'Valentin Teutschbein 7/12/2024 18:32'
+}
+GMTETileMap >> deleteTiles: anIndexSet inLayer: aLayer [
+	"delete tiles from editable matrix stack at given indices"
+	
+	| tile |
+	anIndexSet do: [:c |
+		((self tileMatrixStack layer: aLayer) inBounds: c) ifTrue: [
+			tile := self tileMatrixStack layer: aLayer at: c y at: c x.
+			tile	ifNotNil: [ 
+				tile abandon.
+				self tileMatrixStack layer: aLayer at: c y at: c x put: nil.
+				self saveNewImageFromIndex: c inLayer: aLayer]]]
+]
+
 {
 	#category : #checking,
 	#'squeak_changestamp' : 'Ivo Zilkenat 6/24/2024 11:08'
@@ -811,6 +828,31 @@ GMTETileMap >> moveViewBy: aPoint [
 	self updateMap
 ]
 
+{
+	#category : #updating,
+	#'squeak_changestamp' : 'Valentin Teutschbein 7/12/2024 19:22'
+}
+GMTETileMap >> placeTiles: anIndexSet inLayer: aLayer ofClass: aTileClass withImage: anImage [
+
+	| tile |
+	self assert: (aTileClass inheritsFrom: GMTETile) description: 'Expected GMTETile or subclass'.
+
+	anIndexSet do: [:c |
+		((self tileMatrixStack layer: aLayer) inBounds: c) ifTrue: [
+				tile := self tileMatrixStack layer: aLayer at: c y at: c x.
+				tile ifNil: [tile := self generateTileAtlayer: aLayer x: c x y: c y stack: tileMatrixStack tileType: aTileClass].
+				tile updateSprite: anImage]]
+]
+
+{
+	#category : #updating,
+	#'squeak_changestamp' : 'Valentin Teutschbein 7/12/2024 18:58'
+}
+GMTETileMap >> placeTiles: anIndexSet inLayer: aLayer withImage: anImage [
+
+	self placeTiles: anIndexSet inLayer: aLayer ofClass: GMTETile withImage: anImage
+]
+
 {
 	#category : #updating,
 	#'squeak_changestamp' : 'Ivo Zilkenat 6/24/2024 11:27'