fixed tile updating for rectangle brush

Author: valteu

source/GM-TE/GMTEBrush.class.st

@@ -6,7 +6,8 @@ Class {
 		'radius',
 		'layer',
 		'currentMatrixIndex',
-		'firstMatrixIndex'
+		'firstMatrixIndex',
+		'outputSet'
 	],
 	#category : #'GM-TE-UI'
 }
@@ -56,11 +57,12 @@ GMTEBrush >> executeWithMatrixIndex: anIndex andLayer: aLayer [
 
 {
 	#category : #forms,
-	#'squeak_changestamp' : 'Valentin Teutschbein 7/9/2024 08:47'
+	#'squeak_changestamp' : 'Valentin Teutschbein 7/9/2024 22:04'
 }
 GMTEBrush >> fillBrush [
 
 	| collection startTile visited |
+	self resetOutputSet.
 	self currentMatrixIndex ifNil: [^nil].
 
 	visited := Matrix rows: (self layer rowCount) columns: self layer columnCount.
@@ -71,9 +73,9 @@ GMTEBrush >> fillBrush [
 	visited at: self currentMatrixIndex y at: self currentMatrixIndex x put: true.
 
 	self fillDfsWithVisited: visited andIndex: self currentMatrixIndex andOriginTile: startTile andCollection: collection.
+	self outputSet: collection asSet.
 
-	^ collection
-
+    ^ self outputSet.
 ]
 
 {
@@ -117,6 +119,16 @@ GMTEBrush >> firstMatrixIndex: anObject [
 	firstMatrixIndex := anObject
 ]
 
+{
+	#category : #forms,
+	#'squeak_changestamp' : 'Valentin Teutschbein 7/9/2024 21:33'
+}
+GMTEBrush >> initialize [
+
+	super initialize.
+	self resetOutputSet.
+]
+
 {
 	#category : #accessing,
 	#'squeak_changestamp' : 'Valentin Teutschbein 7/6/2024 14:51'
@@ -133,6 +145,22 @@ GMTEBrush >> layer: anObject [
 	layer := anObject
 ]
 
+{
+	#category : #accessing,
+	#'squeak_changestamp' : 'Valentin Teutschbein 7/9/2024 21:18'
+}
+GMTEBrush >> outputSet [
+	^ outputSet
+]
+
+{
+	#category : #accessing,
+	#'squeak_changestamp' : 'Valentin Teutschbein 7/9/2024 21:18'
+}
+GMTEBrush >> outputSet: anObject [
+	outputSet := anObject
+]
+
 {
 	#category : #accessing,
 	#'squeak_changestamp' : 'Valentin Teutschbein 7/6/2024 12:48'
@@ -143,27 +171,27 @@ GMTEBrush >> radius [
 
 {
 	#category : #accessing,
-	#'squeak_changestamp' : 'Valentin Teutschbein 7/6/2024 12:48'
+	#'squeak_changestamp' : 'Valentin Teutschbein 7/9/2024 22:08'
 }
 GMTEBrush >> radius: anObject [
 	radius := anObject
 ]
 
 {
 	#category : #forms,
-	#'squeak_changestamp' : 'Valentin Teutschbein 7/9/2024 09:01'
+	#'squeak_changestamp' : 'Valentin Teutschbein 7/9/2024 22:11'
 }
 GMTEBrush >> radiusBrush [
 
     | collection xMin xMax yMin yMax |
     self currentMatrixIndex ifNil: [^nil].
 
     collection := OrderedCollection new.
-
-    xMin :=  self currentMatrixIndex x - self radius.
-    xMax :=  self currentMatrixIndex x + self radius.
-    yMin :=  self currentMatrixIndex y - self radius.
-    yMax :=  self currentMatrixIndex y + self radius.
+	self flag: 'radius offset is bad'.
+    xMin :=  self currentMatrixIndex x - (self radius - 1).
+    xMax :=  self currentMatrixIndex x + (self radius - 1).
+    yMin :=  self currentMatrixIndex y - (self radius - 1).
+    yMax :=  self currentMatrixIndex y + (self radius - 1).
 
     (xMin to: xMax) do: [:x |
         (yMin to: yMax) do: [:y |
@@ -173,17 +201,20 @@ GMTEBrush >> radiusBrush [
         ].
     ].
 
-    ^collection
+	collection do: [:i | self outputSet add: i].
+
+    ^ self outputSet.
 
 ]
 
 {
 	#category : #forms,
-	#'squeak_changestamp' : 'Valentin Teutschbein 7/9/2024 09:09'
+	#'squeak_changestamp' : 'Valentin Teutschbein 7/9/2024 22:04'
 }
 GMTEBrush >> rectangleBrush [
 
     | collection startRow endRow startCol endCol |
+	self resetOutputSet.
     (self currentMatrixIndex isNil or: [self firstMatrixIndex isNil]) ifTrue: [^nil].
     collection := OrderedCollection new.
 
@@ -200,9 +231,19 @@ GMTEBrush >> rectangleBrush [
             collection add: (row@col)
         ].
     ].
+	self outputSet: collection asSet.
 
-    ^ collection
+    ^ self outputSet.
+
+]
+
+{
+	#category : #select,
+	#'squeak_changestamp' : 'Valentin Teutschbein 7/9/2024 21:26'
+}
+GMTEBrush >> resetOutputSet [
 
+	self outputSet: Set new.
 ]
 
 {

source/GM-TE/GMTEEditorTileMap.class.st

@@ -113,7 +113,7 @@ GMTEEditorTileMap >> model: anObject [
 
 {
 	#category : #'event handling',
-	#'squeak_changestamp' : 'Valentin Teutschbein 7/9/2024 09:26'
+	#'squeak_changestamp' : 'Valentin Teutschbein 7/9/2024 21:46'
 }
 GMTEEditorTileMap >> mouseDown: anEvent [
 	"Implements placement of tiles"
@@ -125,14 +125,14 @@ GMTEEditorTileMap >> mouseDown: anEvent [
 	selectedIndex := self tileIndexFromPosition: anEvent position.
 	self model brush firstMatrixIndex: selectedIndex.
 	selectedCoordinates := self model brush executeWithMatrixIndex: selectedIndex andLayer: (self tileMatrixStack layer: activeLayer).
-	self updateTiles: selectedCoordinates inLayer: activeLayer FromEvent: anEvent.
+	"self updateTiles: selectedCoordinates inLayer: activeLayer FromEvent: anEvent."
 
 	^ true
 ]
 
 {
 	#category : #'event handling',
-	#'squeak_changestamp' : 'Valentin Teutschbein 7/6/2024 15:22'
+	#'squeak_changestamp' : 'Valentin Teutschbein 7/9/2024 22:02'
 }
 GMTEEditorTileMap >> mouseMove: anEvent [
 	"Implements highlighting of tiles when hovering"
@@ -142,7 +142,7 @@ GMTEEditorTileMap >> mouseMove: anEvent [
 
 	activeLayer := self model selectedLayers anyOne.
 	selectedCoordinates := self model brush executeWithMatrixIndex: (self tileIndexFromPosition: anEvent position) andLayer: (self tileMatrixStack layer: activeLayer).
-	
+	(anEvent redButtonPressed or: [anEvent yellowButtonPressed]) ifFalse: [self model brush resetOutputSet].
 	self tileSelectionSet clearAllHighlightings.
 
 	selectedCoordinates ifNil: [
@@ -151,18 +151,21 @@ GMTEEditorTileMap >> mouseMove: anEvent [
 	(selectedCoordinates select: [:c | (self tileMatrixStack layer: activeLayer) inBounds: c]) do: [:c|
 		hoveredTileHighlighting := self highlightingTileFromIndex: c.
 		hoveredTileHighlighting ifNotNil: [self tileSelectionSet highlightTile: hoveredTileHighlighting]].
-	
-	self updateTiles: selectedCoordinates inLayer: activeLayer FromEvent: anEvent.
 ]
 
 {
 	#category : #'event handling',
-	#'squeak_changestamp' : 'Valentin Teutschbein 7/9/2024 09:04'
+	#'squeak_changestamp' : 'Valentin Teutschbein 7/9/2024 21:58'
 }
 GMTEEditorTileMap >> mouseUp: anEvent [
 
+	| indicesToAdd activeLayer |
 	(self previousTileStates size > 0) ifTrue: [self saveTileEditChanges].
 	self model brush firstMatrixIndex: nil.
+	indicesToAdd := self model brush outputSet.
+	activeLayer := self model selectedLayers anyOne.
+	self updateTiles: (indicesToAdd asCollection) inLayer: activeLayer FromEvent: anEvent.
+	self model brush resetOutputSet.
 ]
 
 {
@@ -320,15 +323,14 @@ GMTEEditorTileMap >> updateTileSprite: aTile [
 
 {
 	#category : #updating,
-	#'squeak_changestamp' : 'Valentin Teutschbein 7/6/2024 12:00'
+	#'squeak_changestamp' : 'Valentin Teutschbein 7/9/2024 22:07'
 }
 GMTEEditorTileMap >> updateTiles: aCoordinateCollection inLayer: aLayer FromEvent: anEvent [
 	"Add currently selected tile (model) to editable matrix stack at mouse position"
 	| tile |
-	
-	(self tileIndexFromPosition: anEvent position) ifNil: [^ nil].
 	self flag: 'saveNewImage confict with alex fix?'.
-	(anEvent redButtonPressed and: [self model selectedTile notNil]) 
+	(self tileIndexFromPosition: anEvent position) ifNil: [^ nil].
+	(anEvent redButtonChanged and: [self model selectedTile notNil]) 
 		ifTrue: [
 			aCoordinateCollection do: [:c |
 				self savePreviousImageFromMatrixCoordinate: c inLayer: aLayer.
@@ -340,7 +342,7 @@ GMTEEditorTileMap >> updateTiles: aCoordinateCollection inLayer: aLayer FromEven
 					self saveNewImageFromPosition: tile position inLayer: aLayer]
 				].
 			self model savedSinceModified: false].
-	(anEvent yellowButtonPressed) 
+	(anEvent yellowButtonChanged) 
 		ifTrue: [
 			aCoordinateCollection do: [:c |
 				| tilePos |