Merge origin/tmm-dev into tmm-dev

Author: RedToxyl

source/GM-TE/GMTEBrush.class.st

@@ -12,6 +12,21 @@ Class {
 	#category : #'GM-TE-UI'
 }
 
+{
+	#category : #forms,
+	#'squeak_changestamp' : 'JS 7/11/2024 15:40'
+}
+GMTEBrush >> calculateOffsetsForRadius: aRadius [
+    	
+	|offsets|
+	offsets := OrderedCollection new.
+    	(0-radius to: radius) do: [:dx |
+        	(0-radius to: radius) do: [:dy |
+            	((dx squared + dy squared) <= aRadius squared) ifTrue: [offsets add: dx @ dy]]].
+
+	^offsets
+]
+
 {
 	#category : #accessing,
 	#'squeak_changestamp' : 'Valentin Teutschbein 7/6/2024 12:48'
@@ -129,15 +144,6 @@ GMTEBrush >> initialize [
 	self resetOutputSet
 ]
 
-{
-	#category : #forms,
-	#'squeak_changestamp' : 'JS 7/11/2024 14:04'
-}
-GMTEBrush >> isPointInRadius: aPoint [
-	self flag: 'to long? - refactor with lineBrush in mind'.
-	^(( self currentMatrixIndex x - aPoint x) squared + ( self currentMatrixIndex y - aPoint y) squared <= (self radius - 1) squared)
-]
-
 {
 	#category : #accessing,
 	#'squeak_changestamp' : 'Valentin Teutschbein 7/6/2024 14:51'
@@ -156,51 +162,32 @@ GMTEBrush >> layer: anObject [
 
 {
 	#category : #forms,
-	#'squeak_changestamp' : 'JS 7/11/2024 14:09'
+	#'squeak_changestamp' : 'JS 7/11/2024 16:16'
 }
 GMTEBrush >> lineBrush [
-    	| radius collection start end deltaX deltaY stepX stepY error error2 x y offsets |
-	self flag: 'refactor - do instead of collect or select'.
-	radius := self radius - 1.
-	self resetOutputSet.
-	self flag: 'todo: method extraction'.
-    	"Helper method to generate radius offsets"
-    	offsets := OrderedCollection new.
-    	(0-radius to: radius) do: [:dx |
-        	(0-radius to: radius) do: [:dy |
-            	((dx * dx) + (dy * dy) <= (radius * radius)) ifTrue: [offsets add: dx @ dy]]].
 
+    	| offsets |
 	self resetOutputSet.
 	(self currentMatrixIndex isNil or: [self firstMatrixIndex isNil]) ifTrue: [^nil].
+	
+    	offsets := self calculateOffsetsForRadius: self offsetCorrectedRadius.
+	
+	(self rasterizeLineBetweenAStart: self firstMatrixIndex andAnEnd: self currentMatrixIndex) do: [:point |
+		offsets do: [:offset | 
+			self outputSet add: (point + offset)]].
 
-	start := self firstMatrixIndex.
-   	end := self currentMatrixIndex.
-    	deltaX := (end x - start x) abs.
-    	deltaY := (end y - start y) abs.
-    	stepX := (start x < end x) ifTrue: [1] ifFalse: [-1].
-    	stepY := (start y < end y) ifTrue: [1] ifFalse: [-1].
-    	error := deltaX - deltaY.
-    	x := start x.
-    	y := start y.
+	^(self outputSet)
 
-    	collection := OrderedCollection new.
+]
 
-    	[
-        	| point |
-        	point := x @ y.
-        	offsets do: [:offset | collection add: (point + offset)].
-        	(x = end x and: [y = end y]) ifTrue: [
-			self outputSet: collection asSet.
-			^ self outputSet].
-        	error2 := 2 * error.
-        	(error2 > (0 - deltaY)) ifTrue: [
-            	error := error - deltaY.
-            	x := x + stepX].
-        	(error2 < deltaX) ifTrue: [
-            	error := error + deltaX.
-            	y := y + stepY]
-    	] repeat
+{
+	#category : #accessing,
+	#'squeak_changestamp' : 'JS 7/11/2024 16:16'
+}
+GMTEBrush >> offsetCorrectedRadius [
+	"In order to display a more intuitive radius for the user, we need to offset it by 1 for the calculations"
 
+	^ self radius - 1
 ]
 
 {
@@ -237,56 +224,73 @@ GMTEBrush >> radius: anObject [
 
 {
 	#category : #forms,
-	#'squeak_changestamp' : 'JS 7/11/2024 14:06'
+	#'squeak_changestamp' : 'JS 7/11/2024 16:14'
 }
 GMTEBrush >> radiusBrush [
 
-    	| collection xMin xMax yMin yMax |
+    	| offsets |
     	self currentMatrixIndex ifNil: [^nil].
 
-    	collection := OrderedCollection new.
-	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).
-
-	self flag: 'select instead of do?'.
-    	(xMin to: xMax) do: [:x |
-        	(yMin to: yMax) do: [:y | 
-			(self isPointInRadius: x @ y) ifTrue: [collection add: x @ y]]].
+	offsets := self calculateOffsetsForRadius: self offsetCorrectedRadius.
 
-	collection do: [:i | 
-		self outputSet add: i].
+	offsets do: [:i | 
+		self outputSet add: (self currentMatrixIndex + i)].
 
     ^ self outputSet
 
 ]
 
 {
 	#category : #forms,
-	#'squeak_changestamp' : 'JS 7/11/2024 13:49'
+	#'squeak_changestamp' : 'JS 7/11/2024 16:16'
+}
+GMTEBrush >> rasterizeLineBetweenAStart: aStartPoint andAnEnd: anEndPoint [
+	"implementation of Bresenhams Line Algorithm"
+	
+	| collection deltaX deltaY stepX stepY error error2 x y |
+	
+	self flag: 'todo: method extraction? - Ich glaube geht schlecht'.
+	
+    	deltaX := (anEndPoint x - aStartPoint x) abs.
+    	deltaY := (anEndPoint y - aStartPoint y) abs.
+    	stepX := (aStartPoint x < anEndPoint x) ifTrue: [1] ifFalse: [-1].
+    	stepY := (aStartPoint y < anEndPoint y) ifTrue: [1] ifFalse: [-1].
+    	error := deltaX - deltaY.
+    	x := aStartPoint x.
+    	y := aStartPoint y.
+
+    	collection := OrderedCollection new.
+
+    	[
+        	| point |
+        	point := x @ y.
+		collection add: point.
+        	(x = anEndPoint x and: [y = anEndPoint y]) ifTrue: [
+			^collection].
+        	error2 := 2 * error.
+        	(error2 > (0 - deltaY)) ifTrue: [
+            	error := error - deltaY.
+            	x := x + stepX].
+        	(error2 < deltaX) ifTrue: [
+            	error := error + deltaX.
+            	y := y + stepY]
+    	] repeat
+
+]
+
+{
+	#category : #forms,
+	#'squeak_changestamp' : 'JS 7/11/2024 16:29'
 }
 GMTEBrush >> rectangleBrush [
 
-    	| collection startRow endRow startCol endCol |
 	self resetOutputSet.
     	(self currentMatrixIndex isNil or: [self firstMatrixIndex isNil]) ifTrue: [^nil].
-    	collection := OrderedCollection new.
 
-    	"Determine the starting and ending rows and columns"
-	self flag: 'method extraction'.	
-    	startRow := (self currentMatrixIndex x min: self firstMatrixIndex x).
-    	endRow := (self currentMatrixIndex x max: self firstMatrixIndex x).
-    	startCol := (self currentMatrixIndex y min: self firstMatrixIndex y).
-    	endCol := (self currentMatrixIndex y max: self firstMatrixIndex y).
-
-    	"Fill the collection with all indices within the rectangle"
-    	startRow to: endRow do: [:row |
-        	startCol to: endCol do: [:col | 
-			collection add: (row @ col)]].
-	
-	self outputSet: collection asSet.
+	self flag: 'besser machen?'.
+    	(self currentMatrixIndex x min: self firstMatrixIndex x) to: (self currentMatrixIndex x max: self firstMatrixIndex x) do: [:row |
+        	(self currentMatrixIndex y min: self firstMatrixIndex y) to: (self currentMatrixIndex y max: self firstMatrixIndex y) do: [:col | 
+			self outputSet add: (row @ col)]].
 
     ^ self outputSet