Add actual compression to compressed tilemap demo

Author: mateoconlechuga

examples/gfx_tilemap_compress/src/main.c

@@ -12,12 +12,13 @@
 
 /* Include the graphics */
 #include "gfx/tiles_gfx.h"
+#include "tilemap/tilemapdata.h"
 
 /* Tilemap defines */
 #define TILE_WIDTH          (16)
 #define TILE_HEIGHT         (16)
-
 #define TILE_SIZE           ((TILE_WIDTH * TILE_HEIGHT) + 2) // +2 for width and height bytes
+
 #define TILEMAP_WIDTH       (32)
 #define TILEMAP_HEIGHT      (25)
 
@@ -27,8 +28,8 @@
 #define Y_OFFSET            (16)
 #define X_OFFSET            (0)
 
-/* This is where the tilemap data is stored */
-extern uint8_t tilemap_map[];
+/* This is where the decompressed tilemap data is to be stored */
+uint8_t tilemap_map[TILEMAP_WIDTH * TILEMAP_HEIGHT];
 
 /* Place to hold decompressed tile pointers */
 gfx_sprite_t *tileset_tiles[128];
@@ -41,16 +42,14 @@ void main(void) {
     unsigned int y_offset = 0;
     gfx_sprite_t *tmp_ptr;
     gfx_tilemap_t tilemap;
-
-    /* For linking purposes */
-    malloc(0);
 
     /* Decompress the tiles */
-    for (i = 0; i < 128; i++) {
+    for (i = 0; i < sizeof(tileset_tiles)/sizeof(gfx_sprite_t*) ; i++) {
         tmp_ptr = gfx_MallocSprite(TILE_WIDTH, TILE_HEIGHT);
         dzx7_Turbo(tileset_tiles_compressed[i], tmp_ptr); // or dzx7_Standard, but in this case we have a lot of tiles
         tileset_tiles[i] = tmp_ptr;
     }
+    dzx7_Turbo(tilemap_compressed, tilemap_map);
 
     /* Initialize the tilemap structure */
     tilemap.map         = tilemap_map;
@@ -66,8 +65,8 @@ void main(void) {
     tilemap.y_loc       = Y_OFFSET;
     tilemap.x_loc       = X_OFFSET;
 
-    /* Initialize the 8bpp graphics */
-    gfx_Begin(gfx_8bpp);
+    /* Initialize the graphics scene */
+    gfx_Begin();
 
     /* Set up the palette */
     gfx_SetPalette(tiles_gfx_pal, sizeof tiles_gfx_pal, 0);

examples/gfx_tilemap_compress/src/tilemap/tilemap.csv

@@ -0,0 +1,25 @@
+4,5,2,0,1,2,3,2,3,0,1,2,3,2,0,1,2,3,0,0,0,0,1,2,3,4,5,0,1,2,4,5
+20,21,2,3,0,1,16,16,2,3,1,2,3,1,0,1,2,3,3,0,1,0,1,2,3,20,21,80,81,82,20,21
+4,5,80,81,82,1,16,16,1,2,3,1,16,16,16,16,16,16,16,0,1,2,0,1,2,36,37,96,97,98,4,5
+20,21,96,97,98,0,1,2,3,1,2,3,2,16,16,16,16,16,16,16,16,16,16,1,2,3,2,112,113,114,20,21
+4,5,112,113,114,0,1,2,3,3,1,2,3,3,0,1,2,3,0,1,2,3,0,0,1,2,3,2,3,0,4,5
+20,21,3,3,3,0,1,2,3,2,3,1,2,3,0,1,2,0,1,2,3,3,3,0,1,2,16,16,16,3,20,21
+4,5,3,3,2,0,1,2,3,2,3,0,1,2,0,1,2,0,1,2,3,2,3,0,1,2,16,2,3,3,4,5
+20,21,3,3,2,0,1,2,3,16,16,16,16,16,16,1,0,1,2,3,0,1,2,0,1,2,16,2,3,2,20,21
+4,5,3,3,2,16,16,16,16,16,16,16,16,16,16,16,0,1,2,3,2,80,81,82,1,2,3,1,2,3,4,5
+20,21,3,2,3,0,1,2,3,1,2,3,2,0,0,0,1,2,3,1,2,96,97,100,1,2,3,1,2,0,20,21
+4,5,3,1,2,3,1,2,3,1,2,0,1,2,0,0,1,2,3,1,2,112,115,116,0,1,2,3,2,0,4,5
+20,21,3,0,1,2,3,2,3,0,1,0,0,0,1,0,1,2,3,1,2,3,96,98,0,1,0,1,2,0,20,21
+4,5,3,0,32,33,33,34,3,0,16,16,16,16,16,16,16,2,3,3,1,2,96,98,3,0,0,1,2,2,4,5
+20,21,3,1,48,49,49,50,3,0,1,16,16,16,16,16,16,16,16,16,1,2,96,98,3,0,0,16,2,0,20,21
+4,5,3,1,64,83,84,66,3,0,0,1,16,16,16,16,16,16,16,16,16,2,96,98,0,0,16,16,2,2,4,5
+20,21,3,1,2,48,50,2,3,0,0,1,2,3,3,2,3,0,2,3,1,2,96,98,16,16,16,16,2,3,20,21
+4,5,3,0,1,48,50,2,3,0,0,1,2,3,2,3,3,0,2,3,1,2,96,98,16,16,16,16,2,3,4,5
+20,21,3,0,1,48,50,2,3,3,2,0,1,2,3,3,3,80,82,2,3,2,96,98,16,16,16,16,2,3,20,21
+4,5,3,0,0,48,50,3,2,3,0,0,0,1,2,3,3,96,100,81,81,81,99,98,3,3,16,16,2,2,4,5
+20,21,0,1,0,48,50,16,16,16,16,1,0,1,2,3,80,99,116,113,113,113,113,114,2,3,0,16,2,3,20,21
+4,5,0,0,1,48,50,0,16,16,16,16,0,1,2,3,96,97,98,16,2,3,2,3,2,3,0,1,2,3,4,5
+20,21,1,0,1,48,50,0,1,2,3,0,0,1,2,3,112,113,114,3,2,3,2,3,2,3,0,1,2,3,20,21
+36,37,0,1,2,48,50,0,0,0,0,0,0,0,0,0,1,2,3,1,2,3,2,3,16,3,0,1,2,3,4,5
+33,33,33,33,33,67,68,33,33,33,33,33,34,0,1,2,3,0,0,1,2,3,2,16,16,3,0,0,1,2,20,21
+65,65,65,65,65,65,65,65,65,65,65,65,66,0,1,2,3,0,1,0,1,16,16,16,16,3,1,2,3,0,36,37

examples/gfx_tilemap_compress/src/tilemap/tilemapdata.c

@@ -0,0 +1,16 @@
+// Converted using ConvTile
+#include <stdint.h>
+
+uint8_t tilemap_compressed[339] = {
+ 0x04,0x03,0x05,0x02,0x00,0x01,0x02,0x03,0x01,0xBB,0x05,0x0A,0xFB,0x08,0x00,0x06,0xEB,0x18,0x05,0x04,0x2C,0x14,0x15,0x1A,0x10,0x10,0xFE,0x05,0x0D,0x02,0xEA,0x18,
+ 0x0E,0xF1,0x06,0x18,0x50,0x51,0x52,0xF5,0x04,0x21,0x06,0x56,0x1F,0x1D,0x10,0x97,0x00,0x1D,0xB0,0x47,0x24,0x25,0x60,0x61,0x5D,0x62,0x3F,0x5D,0x06,0x2F,0xF3,0x5E,
+ 0x1B,0xD8,0x00,0x0D,0x70,0x71,0x72,0xBA,0x3F,0x06,0x92,0x56,0x54,0x5A,0x02,0xB3,0x03,0x05,0x93,0xA5,0x3F,0x03,0x16,0x92,0x41,0x59,0x5A,0x69,0x11,0x45,0x03,0x7C,
+ 0x3F,0x0C,0x93,0x13,0xCF,0x1C,0x0B,0xD5,0x1F,0x27,0xCD,0x3F,0x1F,0x34,0x77,0xD2,0x61,0xA6,0x1F,0x02,0x3F,0x44,0x10,0xC9,0x00,0x3E,0x61,0xD2,0x72,0x6F,0xF3,0x3F,
+ 0x06,0x84,0xBF,0xA3,0x99,0xE0,0x02,0xD2,0x64,0xBE,0x07,0x0F,0x49,0x3F,0x65,0x1C,0x7C,0x94,0x1F,0x70,0x73,0x4A,0x74,0xCE,0x32,0x4E,0x3F,0x91,0x17,0x3D,0x31,0x49,
+ 0x60,0x62,0x73,0x0A,0x03,0x3F,0x00,0x20,0x21,0x21,0x22,0x05,0x98,0x80,0x24,0x89,0x1E,0x1F,0x41,0x82,0x90,0xFF,0x70,0x0E,0x30,0x31,0x31,0x32,0xB2,0x84,0x9E,0x00,
+ 0x64,0x1F,0x10,0xE1,0x7F,0x40,0x53,0x54,0x42,0xC5,0x0F,0x57,0x20,0x1F,0x0E,0xCE,0x06,0x3F,0x02,0x26,0x30,0x32,0xD2,0x1B,0x87,0x0E,0x02,0xE5,0x3F,0x6A,0x97,0x7F,
+ 0x60,0x9F,0x1F,0x01,0x8D,0x1F,0xB9,0x3F,0x93,0x1F,0x03,0x09,0xF9,0x50,0x52,0xC7,0x05,0x3B,0x3F,0x00,0x1F,0x58,0x94,0x61,0x60,0x64,0x67,0x51,0x00,0x63,0x62,0x08,
+ 0x3F,0x7F,0x15,0x53,0x1F,0x8E,0xFB,0x3E,0x63,0x29,0x74,0x71,0x00,0x72,0x53,0x2F,0x2D,0x3F,0x00,0x5F,0x00,0x38,0xFB,0xD1,0xAD,0xD4,0x17,0xE9,0x90,0x7D,0x3F,0x36,
+ 0xCE,0x1F,0x94,0x74,0xAD,0x68,0x03,0x9F,0x1F,0x1D,0xE6,0x3A,0x07,0xA9,0x1F,0xE6,0x00,0xA9,0x2E,0x7D,0x65,0x3F,0x21,0x92,0x00,0x43,0x44,0x22,0x06,0x22,0x4F,0xDA,
+ 0x6C,0x93,0x08,0x3F,0x45,0x41,0x25,0x00,0x42,0x9C,0x39,0x46,0xC8,0x43,0xEE,0xE0,0x5D,0x00,0x10
+};

examples/gfx_tilemap_compress/src/tilemap/tilemapdata.h

@@ -0,0 +1,9 @@
+// Converted using ConvTile
+// This file contains all the tilemap sources for easier inclusion in a project
+#ifndef tilemapdata_header
+#define tilemapdata_header
+#include <stdint.h>
+
+extern uint8_t tilemap_compressed[339];
+
+#endif

examples/gfx_tilemap_compress/src/tilemapdata.c

@@ -46,19 +46,21 @@ SRCDIR     := $(call NATIVEPATH,$(CURDIR)/src)
 SPASMDIR   := $(call NATIVEPATH,$(TOOLSDIR)/spasm-ng)
 CONVHEXDIR := $(call NATIVEPATH,$(TOOLSDIR)/convhex)
 CONVPNGDIR := $(call NATIVEPATH,$(TOOLSDIR)/convpng)
+CONVTILDIR := $(call NATIVEPATH,$(TOOLSDIR)/convtile)
 CEDIR      := $(call NATIVEPATH,$(SRCDIR)/ce)
 STDDIR     := $(call NATIVEPATH,$(SRCDIR)/std)
 STARTDIR   := $(call NATIVEPATH,$(SRCDIR)/startup)
 
 SPASM      := $(call NATIVEPATH,$(SPASMDIR)/spasm)
 CONVHEX    := $(call NATIVEPATH,$(CONVHEXDIR)/convhex)
 CONVPNG    := $(call NATIVEPATH,$(CONVPNGDIR)/convpng)
-
+CONVTILE   := $(call NATIVEPATH,$(CONVTILDIR)/convtile)
 
 ifeq ($(OS),Windows_NT)
 SPASM      := $(call NATIVEPATH,$(SPASMDIR)/spasm.exe)
 CONVHEX    := $(call NATIVEPATH,$(CONVHEXDIR)/convhex.exe)
 CONVPNG    := $(call NATIVEPATH,$(CONVPNGDIR)/convpng.exe)
+CONVTILE   := $(call NATIVEPATH,$(CONVTILDIR)/convtile.exe)
 endif
 
 BIN        := $(call NATIVEPATH,$(TOOLSDIR)/zds)
@@ -74,7 +76,7 @@ INSTALLLIB := $(call NATIVEPATH,$(INSTALLLOC)/$(RELEASE_NAME)/lib)
 DIRS       := $(INSTALLINC) $(INSTALLINC)/compat $(INSTALLBIN) $(INSTALLLIB)
 DIRS       := $(call NATIVEPATH,$(DIRS))
 
-all: $(SPASM) $(CONVHEX) $(CONVPNG) graphx fileioc keypadc libload ce std startup
+all: $(SPASM) $(CONVHEX) $(CONVPNG) $(CONVTILE) graphx fileioc keypadc libload ce std startup
 
 clean: clean-graphx clean-fileioc clean-keypadc clean-ce clean-std clean-libload clean-startup
 	$(MAKE) -C $(SPASMDIR) clean
@@ -92,6 +94,8 @@ $(CONVHEX):
 	$(MAKE) -C $(CONVHEXDIR)
 $(CONVPNG):
 	$(MAKE) -C $(CONVPNGDIR)
+$(CONVTILE):
+	$(MAKE) -C $(CONVTILDIR)
 #----------------------------
 
 #----------------------------
@@ -174,6 +178,7 @@ install: $(DIRS) chmod
 	$(CP) $(SPASM) $(INSTALLBIN)
 	$(CP) $(CONVHEX) $(INSTALLBIN)
 	$(CP) $(CONVPNG) $(INSTALLBIN)
+	$(CP) $(CONVTILE) $(INSTALLBIN)
 	$(CP) $(call NATIVEPATH,$(BIN)/*) $(INSTALLBIN)
 	$(MAKE) -C $(GRAPHXDIR) install PREFIX=$(PREFIX) DESTDIR=$(DESTDIR)
 	$(MAKE) -C $(KEYPADCDIR) install PREFIX=$(PREFIX) DESTDIR=$(DESTDIR)

makefile

@@ -233,17 +233,31 @@ $(OBJDIR)/$(ICON_OBJ): $(ICONPNG)
 	$(CD) $(OBJDIR) && \
 	$(AS) $(ASM_FLAGS) $(ICON_ASM)
 
+$(OBJDIR)/%.obj: $(GFXDIR)/%.c $(USERHEADERS)
+	@$(CD) $(OBJDIR) && \
+	$(CC) $(CFLAGS) $(call WINPATH,$(addprefix $(CURDIR)/,$<))
+
+$(OBJDIR)/%.obj: $(GFXDIR)/%.asm $(USERHEADERS)
+	@$(CD) $(OBJDIR) && \
+	$(AS) $(ASM_FLAGS) $(call WINPATH,$(addprefix $(CURDIR)/,$<))
+
 # this rule builds the assembly files and places them in the object directory
 $(OBJDIR)/%.obj: $(SRCDIR)/%.asm $(USERHEADERS)
 	@$(CD) $(OBJDIR) && \
 	$(AS) $(ASM_FLAGS) $(call WINPATH,$(addprefix $(CURDIR)/,$<))
 
+# this rule builds the assembly files and places them in the object directory
+$(OBJDIR)/%.obj: $(SRCDIR)/*/%.asm $(USERHEADERS)
+	@$(CD) $(OBJDIR) && \
+	$(AS) $(ASM_FLAGS) $(call WINPATH,$(addprefix $(CURDIR)/,$<))
+
 # these rules compile the source files into object files
 $(OBJDIR)/%.obj: $(SRCDIR)/%.c $(USERHEADERS)
 	@$(CD) $(OBJDIR) && \
 	$(CC) $(CFLAGS) $(call WINPATH,$(addprefix $(CURDIR)/,$<))
 
-$(OBJDIR)/%.obj: $(GFXDIR)/%.c $(USERHEADERS)
+# these rules compile the source files into object files
+$(OBJDIR)/%.obj: $(SRCDIR)/*/%.c $(USERHEADERS)
 	@$(CD) $(OBJDIR) && \
 	$(CC) $(CFLAGS) $(call WINPATH,$(addprefix $(CURDIR)/,$<))
 

src/core_makefile

@@ -97,6 +97,11 @@ gfx_sprite_t *name = (gfx_sprite_t *)name##_data
  * @see gfx_mode_t
  */
 int gfx_Begin(gfx_mode_t mode);
+    
+/**
+ * Helper macro to easily initialize the graphics library setup
+ */
+#define gfx_Begin() gfx_Begin(0x27)
 
 /**
  * Closes the graphics setup