Merge pull request #148 from hpi-swa-teaching/tmm-dev

Merge Tile Tool
hpi-swa-teaching · Sep 13, 2024 · 2ba35a8 · 2ba35a8
2 parents 3e8ce49 + 22fbce2
commit 2ba35a8
Show file tree

Hide file tree

Showing 143 changed files with 20,100 additions and 56 deletions.
diff --git a/.squot-materialize b/.squot-materialize
@@ -1,23 +1,10 @@
 [
-	SquotSoundMapper {
-		#path : FSAbsolutePath [
-			'testingResources',
-			'squeak.wav'
-		],
-		#encoding : 'WAV'
-	},
-	SquotPlaintextMapper {
-		#path : FSAbsolutePath [
-			'LICENSE'
-		],
-		#encoding : 'TXT'
-	},
 	SquotImageMapper {
 		#path : FSAbsolutePath [
-			'testingResources',
-			'squeak2.gif'
+			'GMTEIcons',
+			'rectangle.png'
 		],
-		#encoding : Class [ #GIFReadWriter ]
+		#encoding : Class [ #PNGReadWriter ]
 	},
 	SquotCypressMapper {
 		#package : MCPackage {
@@ -27,28 +14,35 @@
 			'source'
 		]
 	},
-	SquotPlaintextMapper {
+	SquotBlobMapper {
 		#path : FSAbsolutePath [
-			'testingResources',
-			'test.txt'
+			'testMapFile.morph'
 		],
-		#encoding : 'TXT'
+		#encoding : 'bin'
 	},
-	SquotImageMapper {
+	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
 			'testingResources',
-			'squeak.png'
+			'test.txt'
 		],
-		#encoding : Class [ #PNGReadWriter ]
+		#encoding : 'TXT'
 	},
-	SquotCypressMapper {
+	SquotTonelMapper {
 		#package : MCPackage {
-			#name : 'BaselineOfGM'
+			#name : 'GM-ToolBuilder'
 		},
 		#path : FSAbsolutePath [
 			'source'
 		]
 	},
+	SquotPlaintextMapper {
+		#path : FSAbsolutePath [
+			'.github',
+			'workflows',
+			'main.yml'
+		],
+		#encoding : 'TXT'
+	},
 	SquotCypressMapper {
 		#package : MCPackage {
 			#name : 'GM-AcceptanceTest'
@@ -59,28 +53,61 @@
 	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
-			'testingResources',
-			'test'
+			'LICENSE'
 		],
 		#encoding : 'TXT'
 	},
-	SquotCypressMapper {
+	SquotImageMapper {
+		#path : FSAbsolutePath [
+			'GMTEIcons',
+			'down.png'
+		],
+		#encoding : @4
+	},
+	SquotImageMapper {
+		#path : FSAbsolutePath [
+			'GMTEIcons',
+			'add.png'
+		],
+		#encoding : @4
+	},
+	SquotImageMapper {
+		#path : FSAbsolutePath [
+			'GMTEIcons',
+			'redo.png'
+		],
+		#encoding : @4
+	},
+	SquotTonelMapper {
 		#package : MCPackage {
-			#name : 'GM-Core'
+			#name : 'GM-TilemapMakerGui'
 		},
 		#path : FSAbsolutePath [
 			'source'
 		]
 	},
-	SquotPlaintextMapper {
+	SquotBlobMapper {
 		#path : FSAbsolutePath [
-			'.gitignore'
+			'map.morph'
 		],
-		#encoding : 'TXT'
+		#encoding : 'bin'
+	},
+	SquotImageMapper {
+		#path : FSAbsolutePath [
+			'GMTEIcons',
+			'fill.png'
+		],
+		#encoding : @4
+	},
+	SquotTonelMapper {
+		#package : MCPackage {
+			#name : 'ToolBuilder-Kernel'
+		},
+		#path : @30
 	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
-			'.squot'
+			'README.md'
 		],
 		#encoding : 'TXT'
 	},
@@ -90,20 +117,99 @@
 		],
 		#encoding : 'TXT'
 	},
-	SquotCypressMapper {
+	SquotImageMapper {
+		#path : FSAbsolutePath [
+			'GMTEIcons',
+			'merge.png'
+		],
+		#encoding : @4
+	},
+	SquotTonelMapper {
 		#package : MCPackage {
-			#name : 'GM-TestFixtures'
+			#name : 'GM-TilemapMakerCore'
 		},
+		#path : @30
+	},
+	SquotImageMapper {
 		#path : FSAbsolutePath [
-			'source'
-		]
+			'GMTEIcons',
+			'line.png'
+		],
+		#encoding : @4
 	},
 	SquotSoundMapper {
 		#path : FSAbsolutePath [
 			'testingResources',
-			'squeak.aiff'
+			'squeak.wav'
 		],
-		#encoding : 'AIFF'
+		#encoding : 'WAV'
+	},
+	SquotImageMapper {
+		#path : FSAbsolutePath [
+			'GMTEIcons',
+			'up.png'
+		],
+		#encoding : @4
+	},
+	SquotImageMapper {
+		#path : FSAbsolutePath [
+			'GMTEIcons',
+			'trash.png'
+		],
+		#encoding : @4
+	},
+	SquotImageMapper {
+		#path : FSAbsolutePath [
+			'GMTEIcons',
+			'eye.png'
+		],
+		#encoding : @4
+	},
+	SquotTonelMapper {
+		#package : MCPackage {
+			#name : 'ToolBuilder-Morphic'
+		},
+		#path : @30
+	},
+	SquotPlaintextMapper {
+		#path : FSAbsolutePath [
+			'.squot'
+		],
+		#encoding : 'TXT'
+	},
+	SquotImageMapper {
+		#path : FSAbsolutePath [
+			'testingResources',
+			'squeak.png'
+		],
+		#encoding : @4
+	},
+	SquotPlaintextMapper {
+		#path : FSAbsolutePath [
+			'.gitignore'
+		],
+		#encoding : 'TXT'
+	},
+	SquotImageMapper {
+		#path : FSAbsolutePath [
+			'GMTEIcons',
+			'rename.png'
+		],
+		#encoding : @4
+	},
+	SquotImageMapper {
+		#path : FSAbsolutePath [
+			'testingResources',
+			'squeak2.gif'
+		],
+		#encoding : Class [ #GIFReadWriter ]
+	},
+	SquotPlaintextMapper {
+		#path : FSAbsolutePath [
+			'testingResources',
+			'test'
+		],
+		#encoding : 'TXT'
 	},
 	SquotCypressMapper {
 		#package : MCPackage {
@@ -113,34 +219,76 @@
 			'source'
 		]
 	},
-	SquotPlaintextMapper {
+	SquotCypressMapper {
+		#package : MCPackage {
+			#name : 'GM-Core'
+		},
 		#path : FSAbsolutePath [
-			'README.md'
+			'source'
+		]
+	},
+	SquotCypressMapper {
+		#package : MCPackage {
+			#name : 'GM-Test'
+		},
+		#path : @30
+	},
+	SquotImageMapper {
+		#path : FSAbsolutePath [
+			'GMTEIcons',
+			'broom.png'
 		],
-		#encoding : 'TXT'
+		#encoding : @4
 	},
 	SquotCypressMapper {
 		#package : MCPackage {
-			#name : 'GM-UtilitiesTest'
+			#name : 'GM-TestFixtures'
 		},
 		#path : FSAbsolutePath [
 			'source'
 		]
 	},
-	SquotPlaintextMapper {
+	SquotCypressMapper {
+		#package : MCPackage {
+			#name : 'BaselineOfGM'
+		},
 		#path : FSAbsolutePath [
-			'.github',
-			'workflows',
-			'main.yml'
+			'source'
+		]
+	},
+	SquotSoundMapper {
+		#path : FSAbsolutePath [
+			'testingResources',
+			'squeak.aiff'
 		],
-		#encoding : 'TXT'
+		#encoding : 'AIFF'
 	},
-	SquotCypressMapper {
+	SquotImageMapper {
+		#path : FSAbsolutePath [
+			'GMTEIcons',
+			'undo.png'
+		],
+		#encoding : @4
+	},
+	SquotTonelMapper {
 		#package : MCPackage {
-			#name : 'GM-Test'
+			#name : 'GM-TE'
 		},
 		#path : FSAbsolutePath [
 			'source'
 		]
+	},
+	SquotCypressMapper {
+		#package : MCPackage {
+			#name : 'GM-UtilitiesTest'
+		},
+		#path : @92
+	},
+	SquotImageMapper {
+		#path : FSAbsolutePath [
+			'GMTEIcons',
+			'brush.png'
+		],
+		#encoding : @4
 	}
 ]
diff --git a/GMTEIcons/add.png b/GMTEIcons/add.png
diff --git a/GMTEIcons/broom.png b/GMTEIcons/broom.png
diff --git a/GMTEIcons/brush.png b/GMTEIcons/brush.png
diff --git a/GMTEIcons/down.png b/GMTEIcons/down.png
diff --git a/GMTEIcons/eye.png b/GMTEIcons/eye.png
diff --git a/GMTEIcons/fill.png b/GMTEIcons/fill.png
diff --git a/GMTEIcons/line.png b/GMTEIcons/line.png
diff --git a/GMTEIcons/merge.png b/GMTEIcons/merge.png
diff --git a/GMTEIcons/rectangle.png b/GMTEIcons/rectangle.png
diff --git a/GMTEIcons/redo.png b/GMTEIcons/redo.png
diff --git a/GMTEIcons/rename.png b/GMTEIcons/rename.png
diff --git a/GMTEIcons/trash.png b/GMTEIcons/trash.png
diff --git a/GMTEIcons/undo.png b/GMTEIcons/undo.png
diff --git a/GMTEIcons/up.png b/GMTEIcons/up.png
diff --git a/map.morph b/map.morph
diff --git a/source/GM-TE/GMTEAddLayerCommand.class.st b/source/GM-TE/GMTEAddLayerCommand.class.st
@@ -0,0 +1,58 @@
+"
+Command that adds a new layer
+"
+Class {
+	#name : #GMTEAddLayerCommand,
+	#superclass : #GMTECommand,
+	#instVars : [
+		'editor'
+	],
+	#category : 'GM-TE-Editor'
+}
+
+{
+	#category : #'as yet unclassified',
+	#'squeak_changestamp' : 'Alex M 7/4/2024 01:30'
+}
+GMTEAddLayerCommand class >> withEditor: anEditor [
+
+	^ (self new)
+		editor: anEditor;
+		yourself
+]
+
+{
+	#category : #execution,
+	#'squeak_changestamp' : 'Alex M 7/6/2024 23:13'
+}
+GMTEAddLayerCommand >> do [
+
+	self editor addTilemapLayer
+]
+
+{
+	#category : #accessing,
+	#'squeak_changestamp' : 'Alex M 7/12/2024 21:37'
+}
+GMTEAddLayerCommand >> editor [
+
+	^ editor
+]
+
+{
+	#category : #accessing,
+	#'squeak_changestamp' : 'Alex M 7/12/2024 21:37'
+}
+GMTEAddLayerCommand >> editor: anObject [
+
+	editor := anObject
+]
+
+{
+	#category : #execution,
+	#'squeak_changestamp' : 'Alex M 7/7/2024 00:53'
+}
+GMTEAddLayerCommand >> undo [
+
+	self editor deleteTilemapLayers: {self editor getLayerList size}
+]