diff --git a/assets/map/entities.png b/assets/map/entities.png
new file mode 100644
index 00000000..071af2ac
Binary files /dev/null and b/assets/map/entities.png differ
diff --git a/assets/map/entities.tsx b/assets/map/entities.tsx
new file mode 100644
index 00000000..a48b47ee
--- /dev/null
+++ b/assets/map/entities.tsx
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/assets/map/testmap.tmx b/assets/map/testmap.tmx
new file mode 100644
index 00000000..6236bad3
--- /dev/null
+++ b/assets/map/testmap.tmx
@@ -0,0 +1,32 @@
+
+
diff --git a/assets/map/tiled_project.tiled-project b/assets/map/tiled_project.tiled-project
new file mode 100644
index 00000000..d0eb5920
--- /dev/null
+++ b/assets/map/tiled_project.tiled-project
@@ -0,0 +1,14 @@
+{
+ "automappingRulesFile": "",
+ "commands": [
+ ],
+ "compatibilityVersion": 1100,
+ "extensionsPath": "extensions",
+ "folders": [
+ "."
+ ],
+ "properties": [
+ ],
+ "propertyTypes": [
+ ]
+}
diff --git a/assets/map/tiled_project.tiled-session b/assets/map/tiled_project.tiled-session
new file mode 100644
index 00000000..f458716f
--- /dev/null
+++ b/assets/map/tiled_project.tiled-session
@@ -0,0 +1,58 @@
+{
+ "Map/SizeTest": {
+ "height": 4300,
+ "width": 2
+ },
+ "activeFile": "",
+ "expandedProjectPaths": [
+ ],
+ "fileStates": {
+ "": {
+ "scaleInDock": 1
+ },
+ "entities.tsx": {
+ "scaleInDock": 1,
+ "scaleInEditor": 1
+ },
+ "testmap.tmx": {
+ "scale": 3.281458333333333,
+ "selectedLayer": 1,
+ "viewCenter": {
+ "x": 97.36524665100629,
+ "y": 58.20582820138405
+ }
+ },
+ "testmap2.tmx": {
+ "scale": 3.281458333333333,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 119.91619579709226,
+ "y": 80.14729223541363
+ }
+ },
+ "tilemap.tsx": {
+ "scaleInDock": 1,
+ "scaleInEditor": 4
+ }
+ },
+ "last.externalTilesetPath": "/home/yourwishes/htdocs/Dawn/assets/map",
+ "last.imagePath": "/home/yourwishes/htdocs/Dawn/assets/map",
+ "map.lastUsedFormat": "tmx",
+ "map.tileHeight": 8,
+ "map.tileWidth": 8,
+ "openFiles": [
+ ],
+ "project": "tiled_project.tiled-project",
+ "recentFiles": [
+ "testmap.tmx",
+ "tilemap.tsx",
+ "entities.tsx",
+ "testmap2.tmx"
+ ],
+ "tileset.lastUsedFilter": "All Files (*)",
+ "tileset.lastUsedFormat": "tsx",
+ "tileset.tileSize": {
+ "height": 8,
+ "width": 8
+ }
+}
diff --git a/assets/map/tilemap.png b/assets/map/tilemap.png
new file mode 100644
index 00000000..504b06de
Binary files /dev/null and b/assets/map/tilemap.png differ
diff --git a/assets/map/tilemap.tsx b/assets/map/tilemap.tsx
new file mode 100644
index 00000000..fe79b205
--- /dev/null
+++ b/assets/map/tilemap.tsx
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/assets/testmap.json b/assets/testmap.json
deleted file mode 100644
index be3ce3f9..00000000
--- a/assets/testmap.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "width": 16,
- "height": 16,
- "layers": [
- {
- "tiles": [
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 1,
- 1, 1, 1, 1, 5, 5, 5, 5, 5, 1, 1, 1, 2, 2, 2, 1,
- 1, 1, 1, 1, 5, 5, 5, 5, 5, 1, 1, 2, 2, 2, 1, 1,
- 1, 1, 1, 1, 4, 4, 4, 4, 4, 1, 1, 1, 2, 2, 1, 1,
- 1, 1, 1, 1, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
- ]
- }
- ],
- "entities": [
- {
- "type": 1,
- "x": 0,
- "y": 0
- },
- {
- "type": 2,
- "x": 9,
- "y": 9,
- "name": "entities.bob.name",
- "text": "maps.testmap.bob"
- },
- {
- "type": 3,
- "x": 3,
- "y": 8,
- "text": "maps.testmap.sign"
- },
- {
- "type": 3,
- "x": 2,
- "y": 2,
- "texts": [
- "maps.testmap.sign2.1",
- "maps.testmap.sign2.2"
- ]
- },
- {
- "type": 4,
- "x": 6,
- "y": 8,
- "door": {
- "x": 0,
- "y": 0,
- "direction": 3
- }
- }
- ]
-}
\ No newline at end of file
diff --git a/gentileset.py b/gentileset.py
new file mode 100644
index 00000000..1c18d163
--- /dev/null
+++ b/gentileset.py
@@ -0,0 +1,223 @@
+# font is a 2D array of 8x8 pixel characters where each bit is a pixel on the
+# row.
+font8x8_basic = [
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+0000 (nul)
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+0001
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+0002
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+0003
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+0004
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+0005
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+0006
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+0007
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+0008
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+0009
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+000A
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+000B
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+000C
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+000D
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+000E
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+000F
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+0010
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+0011
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+0012
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+0013
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+0014
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+0015
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+0016
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+0017
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+0018
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+0019
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+001A
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+001B
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+001C
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+001D
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+001E
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+001F
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+0020 (space)
+ [0x18, 0x3C, 0x3C, 0x18, 0x18, 0x00, 0x18, 0x00], # U+0021 (!)
+ [0x36, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+0022 (")
+ [0x36, 0x36, 0x7F, 0x36, 0x7F, 0x36, 0x36, 0x00], # U+0023 (#)
+ [0x0C, 0x3E, 0x03, 0x1E, 0x30, 0x1F, 0x0C, 0x00], # U+0024 ($)
+ [0x00, 0x63, 0x33, 0x18, 0x0C, 0x66, 0x63, 0x00], # U+0025 (%)
+ [0x1C, 0x36, 0x1C, 0x6E, 0x3B, 0x33, 0x6E, 0x00], # U+0026 (&)
+ [0x06, 0x06, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00], # U+0027 (')
+ [0x18, 0x0C, 0x06, 0x06, 0x06, 0x0C, 0x18, 0x00], # U+0028 (()
+ [0x06, 0x0C, 0x18, 0x18, 0x18, 0x0C, 0x06, 0x00], # U+0029 ())
+ [0x00, 0x66, 0x3C, 0xFF, 0x3C, 0x66, 0x00, 0x00], # U+002A (*)
+ [0x00, 0x0C, 0x0C, 0x3F, 0x0C, 0x0C, 0x00, 0x00], # U+002B (+)
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x0C, 0x06], # U+002C (,)
+ [0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00], # U+002D (-)
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x0C, 0x00], # U+002E (.)
+ [0x60, 0x30, 0x18, 0x0C, 0x06, 0x03, 0x01, 0x00], # U+002F (/)
+ [0x3E, 0x63, 0x73, 0x7B, 0x6F, 0x67, 0x3E, 0x00], # U+0030 (0)
+ [0x0C, 0x0E, 0x0C, 0x0C, 0x0C, 0x0C, 0x3F, 0x00], # U+0031 (1)
+ [0x1E, 0x33, 0x30, 0x1C, 0x06, 0x33, 0x3F, 0x00], # U+0032 (2)
+ [0x1E, 0x33, 0x30, 0x1C, 0x30, 0x33, 0x1E, 0x00], # U+0033 (3)
+ [0x38, 0x3C, 0x36, 0x33, 0x7F, 0x30, 0x78, 0x00], # U+0034 (4)
+ [0x3F, 0x03, 0x1F, 0x30, 0x30, 0x33, 0x1E, 0x00], # U+0035 (5)
+ [0x1C, 0x06, 0x03, 0x1F, 0x33, 0x33, 0x1E, 0x00], # U+0036 (6)
+ [0x3F, 0x33, 0x30, 0x18, 0x0C, 0x0C, 0x0C, 0x00], # U+0037 (7)
+ [0x1E, 0x33, 0x33, 0x1E, 0x33, 0x33, 0x1E, 0x00], # U+0038 (8)
+ [0x1E, 0x33, 0x33, 0x3E, 0x30, 0x18, 0x0E, 0x00], # U+0039 (9)
+ [0x00, 0x0C, 0x0C, 0x00, 0x00, 0x0C, 0x0C, 0x00], # U+003A (:)
+ [0x00, 0x0C, 0x0C, 0x00, 0x00, 0x0C, 0x0C, 0x06], # U+003B (;)
+ [0x18, 0x0C, 0x06, 0x03, 0x06, 0x0C, 0x18, 0x00], # U+003C (<)
+ [0x00, 0x00, 0x3F, 0x00, 0x00, 0x3F, 0x00, 0x00], # U+003D (=)
+ [0x06, 0x0C, 0x18, 0x30, 0x18, 0x0C, 0x06, 0x00], # U+003E (>)
+ [0x1E, 0x33, 0x30, 0x18, 0x0C, 0x00, 0x0C, 0x00], # U+003F (?)
+ [0x3E, 0x63, 0x7B, 0x7B, 0x7B, 0x03, 0x1E, 0x00], # U+0040 (@)
+ [0x0C, 0x1E, 0x33, 0x33, 0x3F, 0x33, 0x33, 0x00], # U+0041 (A)
+ [0x3F, 0x66, 0x66, 0x3E, 0x66, 0x66, 0x3F, 0x00], # U+0042 (B)
+ [0x3C, 0x66, 0x03, 0x03, 0x03, 0x66, 0x3C, 0x00], # U+0043 (C)
+ [0x1F, 0x36, 0x66, 0x66, 0x66, 0x36, 0x1F, 0x00], # U+0044 (D)
+ [0x7F, 0x46, 0x16, 0x1E, 0x16, 0x46, 0x7F, 0x00], # U+0045 (E)
+ [0x7F, 0x46, 0x16, 0x1E, 0x16, 0x06, 0x0F, 0x00], # U+0046 (F)
+ [0x3C, 0x66, 0x03, 0x03, 0x73, 0x66, 0x7C, 0x00], # U+0047 (G)
+ [0x33, 0x33, 0x33, 0x3F, 0x33, 0x33, 0x33, 0x00], # U+0048 (H)
+ [0x1E, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x1E, 0x00], # U+0049 (I)
+ [0x78, 0x30, 0x30, 0x30, 0x33, 0x33, 0x1E, 0x00], # U+004A (J)
+ [0x67, 0x66, 0x36, 0x1E, 0x36, 0x66, 0x67, 0x00], # U+004B (K)
+ [0x0F, 0x06, 0x06, 0x06, 0x46, 0x66, 0x7F, 0x00], # U+004C (L)
+ [0x63, 0x77, 0x7F, 0x7F, 0x6B, 0x63, 0x63, 0x00], # U+004D (M)
+ [0x63, 0x67, 0x6F, 0x7B, 0x73, 0x63, 0x63, 0x00], # U+004E (N)
+ [0x1C, 0x36, 0x63, 0x63, 0x63, 0x36, 0x1C, 0x00], # U+004F (O)
+ [0x3F, 0x66, 0x66, 0x3E, 0x06, 0x06, 0x0F, 0x00], # U+0050 (P)
+ [0x1E, 0x33, 0x33, 0x33, 0x3B, 0x1E, 0x38, 0x00], # U+0051 (Q)
+ [0x3F, 0x66, 0x66, 0x3E, 0x36, 0x66, 0x67, 0x00], # U+0052 (R)
+ [0x1E, 0x33, 0x07, 0x1E, 0x38, 0x33, 0x1E, 0x00], # U+0053 (S)
+ [0x3F, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x00], # U+0054 (T)
+ [0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x3F, 0x00], # U+0055 (U)
+ [0x33, 0x33, 0x33, 0x33, 0x33, 0x1E, 0x0C, 0x00], # U+0056 (V)
+ [0x63, 0x63, 0x63, 0x6B, 0x7F, 0x77, 0x63, 0x00], # U+0057 (W)
+ [0x63, 0x63, 0x36, 0x1C, 0x1C, 0x36, 0x63, 0x00], # U+0058 (X)
+ [0x33, 0x33, 0x33, 0x1E, 0x0C, 0x0C, 0x0C, 0x00], # U+0059 (Y)
+ [0x3F, 0x33, 0x19, 0x0C, 0x26, 0x33, 0x3F, 0x00], # U+005A (Z)
+ [0x1E, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x1E, 0x00], # U+005B ([)
+ [0x03, 0x06, 0x0C, 0x18, 0x30, 0x60, 0xC0, 0x00], # U+005C (\)
+ [0x1E, 0x30, 0x30, 0x30, 0x30, 0x30, 0x1E, 0x00], # U+005D (])
+ [0x08, 0x1C, 0x36, 0x63, 0x00, 0x00, 0x00, 0x00], # U+005E (^)
+ [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF], # U+005F (_)
+ [0x0C, 0x0C, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00], # U+0060 (`)
+ [0x00, 0x00, 0x1E, 0x30, 0x3E, 0x33, 0x6E, 0x00], # U+0061 (a)
+ [0x07, 0x06, 0x06, 0x3E, 0x66, 0x66, 0x3B, 0x00], # U+0062 (b)
+ [0x00, 0x00, 0x1E, 0x33, 0x03, 0x33, 0x1E, 0x00], # U+0063 (c)
+ [0x38, 0x30, 0x30, 0x3E, 0x33, 0x33, 0x6E, 0x00], # U+0064 (d)
+ [0x00, 0x00, 0x1E, 0x33, 0x3F, 0x03, 0x1E, 0x00], # U+0065 (e)
+ [0x1C, 0x36, 0x06, 0x0F, 0x06, 0x06, 0x0F, 0x00], # U+0066 (f)
+ [0x00, 0x00, 0x6E, 0x33, 0x33, 0x3E, 0x30, 0x1E], # U+0067 (g)
+ [0x07, 0x06, 0x36, 0x6E, 0x66, 0x66, 0x67, 0x00], # U+0068 (h)
+ [0x0C, 0x00, 0x0E, 0x0C, 0x0C, 0x0C, 0x1E, 0x00], # U+0069 (i)
+ [0x30, 0x00, 0x30, 0x30, 0x30, 0x33, 0x33, 0x1E], # U+006A (j)
+ [0x07, 0x06, 0x66, 0x36, 0x1E, 0x36, 0x67, 0x00], # U+006B (k)
+ [0x0E, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x1E, 0x00], # U+006C (l)
+ [0x00, 0x00, 0x33, 0x7F, 0x7F, 0x6B, 0x63, 0x00], # U+006D (m)
+ [0x00, 0x00, 0x1B, 0x37, 0x33, 0x33, 0x33, 0x00], # U+006E (n)
+ [0x00, 0x00, 0x1E, 0x33, 0x33, 0x33, 0x1E, 0x00], # U+006F (o)
+ [0x00, 0x00, 0x3B, 0x66, 0x66, 0x3E, 0x06, 0x0F], # U+0070 (p)
+ [0x00, 0x00, 0x6E, 0x33, 0x33, 0x3E, 0x30, 0x78], # U+0071 (q)
+ [0x00, 0x00, 0x1B, 0x36, 0x36, 0x06, 0x0F, 0x00], # U+0072 (r)
+ [0x00, 0x00, 0x3E, 0x03, 0x1E, 0x30, 0x1F, 0x00], # U+0073 (s)
+ [0x08, 0x0C, 0x3E, 0x0C, 0x0C, 0x2C, 0x18, 0x00], # U+0074 (t)
+ [0x00, 0x00, 0x33, 0x33, 0x33, 0x33, 0x6E, 0x00], # U+0075 (u)
+ [0x00, 0x00, 0x33, 0x33, 0x33, 0x1E, 0x0C, 0x00], # U+0076 (v)
+ [0x00, 0x00, 0x63, 0x6B, 0x7F, 0x7F, 0x36, 0x00], # U+0077 (w)
+ [0x00, 0x00, 0x63, 0x36, 0x1C, 0x36, 0x63, 0x00], # U+0078 (x)
+ [0x00, 0x00, 0x33, 0x33, 0x33, 0x3E, 0x30, 0x1E], # U+0079 (y)
+ [0x00, 0x00, 0x3F, 0x19, 0x0C, 0x26, 0x3F, 0x00], # U+007A (z)
+ [0x38, 0x0C, 0x0C, 0x07, 0x0C, 0x0C, 0x38, 0x00], # U+007B ({)
+ [0x0C, 0x0C, 0x0C, 0x00, 0x0C, 0x0C, 0x0C, 0x00], # U+007C (|)
+ [0x07, 0x0C, 0x0C, 0x38, 0x0C, 0x0C, 0x07, 0x00], # U+007D (})
+ [0x6E, 0x3B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], # U+007E (~)
+]
+
+
+# COLOR4F(0.0f, 0.0f, 0.0f, 1.0f), # Black
+# COLOR4F(1.0f, 1.0f, 1.0f, 1.0f), # White
+# COLOR4F(0.8f, 0.0f, 0.0f, 1.0f), # Red
+# COLOR4F(0.0f, 0.5f, 0.0f, 1.0f), # Green
+# COLOR4F(0.0f, 0.0f, 0.8f, 1.0f), # Blue
+# COLOR4F(0.8f, 0.8f, 0.0f, 1.0f), # Yellow
+# COLOR4F(0.8f, 0.0f, 0.8f, 1.0f), # Magenta
+# COLOR4F(0.0f, 0.8f, 0.8f, 1.0f), # Cyan
+# COLOR4F(0.5f, 0.5f, 0.5f, 1.0f), # Gray
+# COLOR4F(0.5f, 0.25f, 0.0f, 1.0f) # Brown
+
+# Tilemap
+COLORS = {
+ "BLACK": [ 0, 0, 0 ],
+ "WHITE": [ 255, 255, 255 ],
+ "RED": [ 204, 0, 0 ],
+ "GREEN": [ 0, 128, 0 ],
+ "BLUE": [ 0, 0, 204 ],
+ "YELLOW": [ 204, 204, 0 ],
+ "MAGENTA": [ 204, 0, 204 ],
+ "CYAN": [ 0, 204, 204 ],
+ "GRAY": [ 128, 128, 128 ],
+ "BROWN": [ 128, 64, 0 ]
+}
+
+TILES = {
+ # NAME: [ id, symbol, color ]
+ "NULL": [ 0, 'N', COLORS["RED"] ],
+ "GRASS": [ 1, '#', COLORS["GREEN"] ],
+ "WATER": [ 2, '\\', COLORS["BLUE"] ],
+ "DOOR": [ 3, 'D', COLORS["BROWN"] ],
+ "BUILDING_WALL": [ 4, '-', COLORS["GRAY"] ],
+ "ROOF": [ 5, '/', COLORS["BROWN"] ],
+ "WALKABLE_NULL": [ 6, ' ', COLORS["BLACK"] ],
+}
+
+ENTITIES = {
+ "NULL": [ 0, 'N', COLORS["RED"] ],
+ "PLAYER": [ 1, 'v', COLORS["RED"] ],
+}
+
+# Create 64 x 64 RGB pixel buffer.
+import png
+
+WIDTH = 64
+HEIGHT = 64
+
+def genTileset(filename, tileset, background):
+ # Create 64x64 pixel buffer with black
+ PIXEL_BUFFER = []
+ for y in range(HEIGHT):
+ row = []
+ for x in range(WIDTH):
+ row.append(background)
+ PIXEL_BUFFER.append(row)
+
+ # For each TILES
+ for tile in tileset:
+ # Get the tile data
+ tile_data = tileset[tile]
+ tile_id = tile_data[0]
+ tile_char = tile_data[1]
+ tile_color = tile_data[2]
+ # Get char pixels
+ char_pixels = font8x8_basic[ord(tile_char)]
+ tile_color_rgba = [ tile_color[0], tile_color[1], tile_color[2], 255 ]
+
+ # Write char pixels to output buffer, using tile_id to determine pixels with
+ # each row holding 8 characters of 8 pixels
+ for y in range(8):
+ row = char_pixels[y]
+ for x in range(8):
+ if row & (1 << x):
+ PIXEL_BUFFER[(tile_id // 8) * 8 + y][(tile_id % 8) * 8 + x] = tile_color_rgba
+
+ # Convert from [ [ [ r, g, b ], [ r, g, b] ], [ [ r, g, b ], [ r, g, b ] ] ] to
+ # [ [R, G, B, A, R, G, B, A] ] (Flatten level 2 and add alpha channel)
+ FLATTENED_PIXEL_BUFFER = [ [ 0 for i in range(WIDTH * 4) ] for j in range(HEIGHT) ]
+ for y in range(HEIGHT):
+ for x in range(WIDTH):
+ FLATTENED_PIXEL_BUFFER[y][x * 4 + 0] = PIXEL_BUFFER[y][x][0]
+ FLATTENED_PIXEL_BUFFER[y][x * 4 + 1] = PIXEL_BUFFER[y][x][1]
+ FLATTENED_PIXEL_BUFFER[y][x * 4 + 2] = PIXEL_BUFFER[y][x][2]
+ FLATTENED_PIXEL_BUFFER[y][x * 4 + 3] = PIXEL_BUFFER[y][x][3]
+
+ # Now write PIXEL_BUFFER to png
+ png.from_array(FLATTENED_PIXEL_BUFFER, 'RGBA').save(filename)
+
+genTileset("./assets/map/tilemap.png", TILES, [ 0, 0, 0, 255 ])
+genTileset("./assets/map/entities.png", ENTITIES, [ 0, 0, 0, 100 ])
\ No newline at end of file
diff --git a/src/dawn/CMakeLists.txt b/src/dawn/CMakeLists.txt
index 27341882..4b5e4daf 100644
--- a/src/dawn/CMakeLists.txt
+++ b/src/dawn/CMakeLists.txt
@@ -32,7 +32,7 @@ target_sources(${DAWN_TARGET_NAME}
)
# Assets
-tool_copy(testmap testmap.json)
+tool_map(testmap map/testmap.tmx)
tool_copy(en en.json)
add_dependencies(${DAWN_TARGET_NAME} dawnassets)
diff --git a/src/dawn/display/symbol.c b/src/dawn/display/symbol.c
index 86ad3370..6506bd83 100644
--- a/src/dawn/display/symbol.c
+++ b/src/dawn/display/symbol.c
@@ -37,6 +37,7 @@ char_t symbolGetCharByEntity(const entity_t *ent) {
char_t symbolGetCharByTile(const tile_t tile) {
switch(tile) {
case TILE_NULL:
+ case TILE_WALKABLE_NULL:
return ' ';
case TILE_GRASS:
@@ -85,6 +86,7 @@ uint8_t symbolGetColorByEntity(const entity_t *ent) {
uint8_t symbolGetColorByTile(const tile_t tile) {
switch(tile) {
case TILE_NULL:
+ case TILE_WALKABLE_NULL:
return COLOR_BLACK;
case TILE_GRASS:
diff --git a/src/dawn/rpg/world/maplist.c b/src/dawn/rpg/world/maplist.c
index 2dd77e4a..a908bfb9 100644
--- a/src/dawn/rpg/world/maplist.c
+++ b/src/dawn/rpg/world/maplist.c
@@ -9,7 +9,7 @@
#include "assert/assert.h"
const char_t * MAP_LIST_PATHS[] = {
- "testmap.json"
+ "testmap.map"
};
const int32_t MAP_LIST_COUNT = sizeof(MAP_LIST_PATHS) / sizeof(char_t*);
diff --git a/src/dawn/rpg/world/tile.h b/src/dawn/rpg/world/tile.h
index 35f18e33..a73128b7 100644
--- a/src/dawn/rpg/world/tile.h
+++ b/src/dawn/rpg/world/tile.h
@@ -14,7 +14,8 @@ typedef enum {
TILE_WATER = 2,
// TILE_DOOR = 3,
TILE_BUILDING_WALL = 4,
- TILE_ROOF = 5
+ TILE_ROOF = 5,
+ TILE_WALKABLE_NULL = 6,
} tile_t;
/**
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 710b24cc..84e8655a 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -11,4 +11,5 @@ set(
# Tools
add_subdirectory(assetstool)
-add_subdirectory(copytool)
\ No newline at end of file
+add_subdirectory(copytool)
+add_subdirectory(maptool)
\ No newline at end of file
diff --git a/tools/maptool/CMakeLists.txt b/tools/maptool/CMakeLists.txt
new file mode 100644
index 00000000..96fcd133
--- /dev/null
+++ b/tools/maptool/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Copyright (c) 2023 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+
+function(tool_map target file)
+ add_custom_target(${target}
+ COMMAND
+ ${Python3_EXECUTABLE}
+ ${DAWN_TOOLS_DIR}/maptool/maptool.py
+ --input=${DAWN_ASSETS_SOURCE_DIR}/${file}
+ --output=${DAWN_ASSETS_BUILD_DIR}/${target}.map
+ COMMENT "Compiling map ${file}..."
+ USES_TERMINAL
+ DEPENDS ${DAWN_ASSETS}
+ )
+ add_dependencies(dawnassets ${target})
+endfunction()
\ No newline at end of file
diff --git a/tools/maptool/maptool.py b/tools/maptool/maptool.py
new file mode 100755
index 00000000..1f8f4bc5
--- /dev/null
+++ b/tools/maptool/maptool.py
@@ -0,0 +1,92 @@
+#!/usr/bin/env python
+# Copyright (c) 2023 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+import os
+import argparse
+
+# Args
+parser = argparse.ArgumentParser(
+ description='Bundles all assets into the internal archive format.'
+)
+parser.add_argument('-i', '--input');
+parser.add_argument('-o', '--output');
+args = parser.parse_args()
+
+# Ensure the directory for the output path exists
+if not os.path.exists(os.path.dirname(args.output)):
+ os.makedirs(os.path.dirname(args.output))
+
+# Read XML file
+import xml.etree.ElementTree as ET
+tree = ET.parse(args.input)
+root = tree.getroot()
+
+width = int(root.attrib['width'])
+height = int(root.attrib['height'])
+
+# Prep Output
+output = {
+ "width": width,
+ "height": height,
+ "layers": [
+ ],
+ "entities": [
+ ],
+ "triggers": [
+ ]
+}
+
+# for each layer element of root
+for layer in root.findall('layer'):
+ layerOut = {
+ "tiles": []
+ }
+ # Find data (CSV)
+ data = layer.find('data')
+ data = data.text.replace('\n', '').replace(' ', '').split(',')
+ # for each tile in data
+ for i in range(0, len(data)):
+ # minus 1 because tiled is 1 indexed
+ tileId = int(data[i]) - 1
+ layerOut["tiles"].append(tileId)
+
+ output["layers"].append(layerOut)
+
+# Find objectgroup elements
+for objectgroup in root.findall('objectgroup'):
+ # for each object element of objectgroup
+
+ # if layer name attribute containts "ent"
+ isEnt = objectgroup.attrib['name'].lower().find('ent') != -1
+
+ for tiledObject in objectgroup.findall('object'):
+ # /8 because tiled uses pixels for objects but we use tile indexes (8x8px)
+ obj = {
+ "x": int(round(float(tiledObject.attrib['x']) / 8)),
+ "y": int(round(float(tiledObject.attrib['y']) / 8)),
+ }
+
+ if isEnt:
+ if not 'type' in tiledObject.attrib:
+ raise Exception('Entity missing type attribute')
+ entType = tiledObject.attrib['type']
+ if entType == 'player':
+ obj['type'] = 1
+ else:
+ raise Exception('Unknown entity type: ' + entType)
+
+ output["entities"].append(obj)
+ else:
+ # trigger
+ raise Exception('Triggers not yet implemented')
+
+
+# write to args output as JSON
+import json
+with open(args.output, 'w') as f:
+ # pretty print to debug
+ f.write(json.dumps(output, indent=2))
+ # f.write(json.dumps(output))
\ No newline at end of file