Restructure data

Concatenate tileset
Add an optional header generator in python
Add some CMake status messages

CMakeLists.txt

@@ -126,39 +126,57 @@ function(create_zip output_file input_files working_dir)
 	)
 endfunction()
 
-set(_data ${CMAKE_CURRENT_SOURCE_DIR}/data)
-set(_maps ${CMAKE_CURRENT_SOURCE_DIR}/maps)
-set(_sfx ${CMAKE_CURRENT_SOURCE_DIR}/sfx_22)
-file(GLOB DATAFILES CONFIGURE_DEPENDS ${_data}/*)
-file(GLOB MAPFILES CONFIGURE_DEPENDS ${_maps}/*)
-file(GLOB SFXFILES CONFIGURE_DEPENDS ${_sfx}/*)
-create_zip(${CMAKE_CURRENT_BINARY_DIR}/data.zip "${DATAFILES}" ${_data})
-create_zip(${CMAKE_CURRENT_BINARY_DIR}/maps.zip "${MAPFILES}" ${_maps})
-create_zip(${CMAKE_CURRENT_BINARY_DIR}/sfx_22.zip "${SFXFILES}" ${_sfx})
-unset(_data)
-unset(_maps)
-unset(_sfx)
-
-set(zip_files
-	${CMAKE_CURRENT_BINARY_DIR}/data.zip
-	${CMAKE_CURRENT_BINARY_DIR}/maps.zip
-	${CMAKE_CURRENT_BINARY_DIR}/sfx_22.zip
+file(GLOB DATAFILES CONFIGURE_DEPENDS
+	${CMAKE_CURRENT_SOURCE_DIR}/data/font/*
+	${CMAKE_CURRENT_SOURCE_DIR}/data/images/*
+	${CMAKE_CURRENT_SOURCE_DIR}/data/maps/*
+	${CMAKE_CURRENT_SOURCE_DIR}/data/music/*
+	${CMAKE_CURRENT_SOURCE_DIR}/data/scripts/*
+	${CMAKE_CURRENT_SOURCE_DIR}/data/sfx_22/*
 )
+create_zip(${CMAKE_CURRENT_BINARY_DIR}/data.zip "${DATAFILES}"
+	${CMAKE_CURRENT_SOURCE_DIR}/data
+)
+set(zip_files ${CMAKE_CURRENT_BINARY_DIR}/data.zip)
 
 if(ENABLE_SHOOTER)
-	set(_shooter ${CMAKE_CURRENT_SOURCE_DIR}/shooter)
-	file(GLOB SHOOTERFILES CONFIGURE_DEPENDS ${_shooter}/*)
-	create_zip(${CMAKE_CURRENT_BINARY_DIR}/shooter.zip "${SHOOTERFILES}" ${_shooter})
-	unset(_shooter)
+	file(GLOB_RECURSE SHOOTERFILES
+		LIST_DIRECTORIES false
+		CONFIGURE_DEPENDS
+		${CMAKE_CURRENT_SOURCE_DIR}/shooter/*
+	)
+	create_zip(${CMAKE_CURRENT_BINARY_DIR}/shooter.zip "${SHOOTERFILES}"
+		${CMAKE_CURRENT_SOURCE_DIR}/shooter
+	)
 	list(APPEND zip_files ${CMAKE_CURRENT_BINARY_DIR}/shooter.zip)
 endif()
 
 add_custom_target(alex4-data ALL DEPENDS ${zip_files})
 
+find_package(Python3 COMPONENTS Interpreter QUIET)
+if(Python3_FOUND)
+	add_custom_command(
+		COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/data/make_header.py
+			${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_BINARY_DIR}/data_files.h
+		OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/data_files.h
+		DEPENDS ${zip_files} data/make_header.py
+		COMMENT "(Re-)generating datafile header."
+	)
+	target_include_directories(alex4 PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+	target_sources(alex4 PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/data_files.h)
+else()
+	message(STATUS "Using pre-generated datafile header.")
+	target_include_directories(alex4 data)
+	target_sources(alex4 PRIVATE data/data_files.h)
+endif()
+
 # libs
 
-find_package(SDL2 REQUIRED VERBOSE)
-find_package(SDL2_mixer REQUIRED VERBOSE)
+find_package(SDL2 REQUIRED)
+find_package(SDL2_mixer REQUIRED)
+if(SDL2_FOUND AND SDL2_mixer_FOUND)
+	message(STATUS "Using SDL2 ${SDL2_VERSION} and SDL2_mixer ${SDL2_mixer_VERSION}.")
+endif()
 
 target_link_libraries(alex4 miniz iniparser SDL2::SDL2 SDL2_mixer::SDL2_mixer)
 

data/data_files.h

@@ -0,0 +1,136 @@
+
+/*****************************************
+ * data_files.h - Part of alex4 project. *
+ *                                       *
+ * GENERATED header, do not edit!        *
+ *****************************************/
+
+#ifndef DATA_FILES_H
+#define DATA_FILES_H
+
+// PUBLIC enums
+
+enum _images {
+	I_ALEX = 0, I_ALEX_BG, I_ALEX_LOGO, I_ALL100, I_BG0, I_BG1, I_BG2,
+	I_BULB_BL, I_BULB_BR, I_BULB_TL, I_BULB_TR, I_BULBA_BL, I_BULBA_BR,
+	I_BULBA_TL, I_BULBA_TR, I_BULLET_1, I_BULLET_2, I_CAGE_BIG, I_CAGE_SML1,
+	I_CAGE_SML2, I_CHAIN, I_CHERRY, I_CHOPPER1, I_CHOPPER2, I_CHOPPER3,
+	I_CHOPPER4, I_DRUMCAN, I_EGG, I_EGG2, I_ENEMY1_01, I_ENEMY1_02,
+	I_ENEMY1_03, I_ENEMY1_04, I_ENEMY1_05, I_ENEMY2_01, I_ENEMY2_02,
+	I_ENEMY2_03, I_ENEMY2_04, I_ENEMY2_05, I_ENEMY3, I_ENEMY4, I_ENEMY5_01,
+	I_ENEMY5_02, I_ENEMY6, I_FLD_HEAD, I_FLD_LOGO, I_GAME_OVER, I_GUARD1_1,
+	I_GUARD1_2, I_GUARD1_3, I_GUARD1_4, I_GUARD1_5, I_GUARD1_6, I_GUARD1_7,
+	I_GUARD1_8, I_GUARD2_1A, I_GUARD2_1B, I_GUARD2_2, I_GUARD2_3, I_GUARD2_4,
+	I_GUARD2_5, I_GUARD2_6, I_HEART, I_HEART2, I_HERO000, I_HERO001, I_HERO002,
+	I_HERO003, I_HERO_BALL, I_HERO_EAT, I_HERO_FULL, I_HERO_JUMP, I_HERO_NORM,
+	I_HERO_SPIT, I_INTRO_BG, I_LETSGO, I_LEVELCOMPLETE, I_LOLA, I_ONEUP,
+	I_PARTICLE_BOPP, I_PARTICLE_DUST, I_POINTER, I_SHIP0, I_SHIP1, I_SHIP100,
+	I_SMOKE1, I_SMOKE2, I_SMOKE3, I_SMOKE4, I_SMOKE5, I_SMOKE6, I_SMOKE7,
+	I_SMOKE8, I_SPIN1, I_SPIN2, I_SPIN3, I_SPIN4, I_STAR, I_TILESET, I_UFO0,
+	I_UFO1, I_UFO_BIG, I_UFOBEAM, I_WATER, I_WATER_SURFACE, 
+	// end marker
+	I_MAX
+};
+
+enum _sounds {
+	S_CHERRY = 0, S_CHOPPER, S_CRUSH, S_DIE, S_EAT, S_ENERGY, S_ENGINE,
+	S_HEART, S_HIT, S_HURT, S_IMPACT, S_JUMP, S_KILL, S_MENU, S_PAUSE, S_POINT,
+	S_SHIP, S_SHOOT, S_SPIT, S_STAR, S_STARTUP, S_STOMP, S_TALK, S_TURN,
+	S_XTRALIFE, 
+	// end marker
+	S_MAX
+};
+
+enum _music {
+	MSC_GAME = 0, 
+	// end marker
+	MSC_MAX
+};
+
+enum _maps {
+	MAP_01_LEVEL1 = 0, MAP_02_LEVEL2, MAP_03_LEVEL3, MAP_04_LEVEL4,
+	MAP_05_GUARDIAN1, MAP_06_LEVEL5, MAP_07_LEVEL6, MAP_08_LEVEL7,
+	MAP_09_LEVEL8, MAP_10_LEVEL9, MAP_11_LEVEL10, MAP_12_GUARDIAN2, 
+	// end marker
+	MAP_MAX
+};
+
+enum _fonts {
+	F_GAME = 0, 
+	// end marker
+	F_MAX
+};
+
+// PRIVATE mappings
+
+#ifdef INSIDE_DATA
+
+const char *_image_mapping[I_MAX] = {
+	"images/alex.bmp", "images/alex_bg.bmp", "images/alex_logo.bmp",
+	"images/all100.bmp", "images/bg0.bmp", "images/bg1.bmp", "images/bg2.bmp",
+	"images/bulb_bl.bmp", "images/bulb_br.bmp", "images/bulb_tl.bmp",
+	"images/bulb_tr.bmp", "images/bulba_bl.bmp", "images/bulba_br.bmp",
+	"images/bulba_tl.bmp", "images/bulba_tr.bmp", "images/bullet_1.bmp",
+	"images/bullet_2.bmp", "images/cage_big.bmp", "images/cage_sml1.bmp",
+	"images/cage_sml2.bmp", "images/chain.bmp", "images/cherry.bmp",
+	"images/chopper1.bmp", "images/chopper2.bmp", "images/chopper3.bmp",
+	"images/chopper4.bmp", "images/drumcan.bmp", "images/egg.bmp",
+	"images/egg2.bmp", "images/enemy1_01.bmp", "images/enemy1_02.bmp",
+	"images/enemy1_03.bmp", "images/enemy1_04.bmp", "images/enemy1_05.bmp",
+	"images/enemy2_01.bmp", "images/enemy2_02.bmp", "images/enemy2_03.bmp",
+	"images/enemy2_04.bmp", "images/enemy2_05.bmp", "images/enemy3.bmp",
+	"images/enemy4.bmp", "images/enemy5_01.bmp", "images/enemy5_02.bmp",
+	"images/enemy6.bmp", "images/fld_head.bmp", "images/fld_logo.bmp",
+	"images/game_over.bmp", "images/guard1_1.bmp", "images/guard1_2.bmp",
+	"images/guard1_3.bmp", "images/guard1_4.bmp", "images/guard1_5.bmp",
+	"images/guard1_6.bmp", "images/guard1_7.bmp", "images/guard1_8.bmp",
+	"images/guard2_1a.bmp", "images/guard2_1b.bmp", "images/guard2_2.bmp",
+	"images/guard2_3.bmp", "images/guard2_4.bmp", "images/guard2_5.bmp",
+	"images/guard2_6.bmp", "images/heart.bmp", "images/heart2.bmp",
+	"images/hero000.bmp", "images/hero001.bmp", "images/hero002.bmp",
+	"images/hero003.bmp", "images/hero_ball.bmp", "images/hero_eat.bmp",
+	"images/hero_full.bmp", "images/hero_jump.bmp", "images/hero_norm.bmp",
+	"images/hero_spit.bmp", "images/intro_bg.bmp", "images/letsgo.bmp",
+	"images/levelcomplete.bmp", "images/lola.bmp", "images/oneup.bmp",
+	"images/particle_bopp.bmp", "images/particle_dust.bmp",
+	"images/pointer.bmp", "images/ship0.bmp", "images/ship1.bmp",
+	"images/ship100.bmp", "images/smoke1.bmp", "images/smoke2.bmp",
+	"images/smoke3.bmp", "images/smoke4.bmp", "images/smoke5.bmp",
+	"images/smoke6.bmp", "images/smoke7.bmp", "images/smoke8.bmp",
+	"images/spin1.bmp", "images/spin2.bmp", "images/spin3.bmp",
+	"images/spin4.bmp", "images/star.bmp", "images/tileset.bmp",
+	"images/ufo0.bmp", "images/ufo1.bmp", "images/ufo_big.bmp",
+	"images/ufobeam.bmp", "images/water.bmp", "images/water_surface.bmp"
+};
+
+const char *_sound_mapping[S_MAX] = {
+	"sfx_22/cherry.wav", "sfx_22/chopper.wav", "sfx_22/crush.wav",
+	"sfx_22/die.wav", "sfx_22/eat.wav", "sfx_22/energy.wav",
+	"sfx_22/engine.wav", "sfx_22/heart.wav", "sfx_22/hit.wav",
+	"sfx_22/hurt.wav", "sfx_22/impact.wav", "sfx_22/jump.wav",
+	"sfx_22/kill.wav", "sfx_22/menu.wav", "sfx_22/pause.wav",
+	"sfx_22/point.wav", "sfx_22/ship.wav", "sfx_22/shoot.wav",
+	"sfx_22/spit.wav", "sfx_22/star.wav", "sfx_22/startup.wav",
+	"sfx_22/stomp.wav", "sfx_22/talk.wav", "sfx_22/turn.wav",
+	"sfx_22/xtralife.wav"
+};
+
+const char *_music_mapping[MSC_MAX] = {
+	"music/GAME.MOD"
+};
+
+const char *_map_mapping[MAP_MAX] = {
+	"maps/01_level1.map", "maps/02_level2.map", "maps/03_level3.map",
+	"maps/04_level4.map", "maps/05_guardian1.map", "maps/06_level5.map",
+	"maps/07_level6.map", "maps/08_level7.map", "maps/09_level8.map",
+	"maps/10_level9.map", "maps/11_level10.map", "maps/12_guardian2.map"
+};
+
+const char *_font_mapping[F_MAX] = {
+	"font/GAME.bmp"
+};
+
+#endif // INSIDE_DATA
+
+#endif // DATA_FILES_H
+

data/make_header.py

@@ -0,0 +1,121 @@
+#!/bin/env/python3
+
+import sys
+import os
+from os.path import basename, join, splitext
+
+##############################################################################
+# helpers
+##############################################################################
+
+# gets all files in a dict with enum key
+def list_files(dir):
+	dict_files = dict()
+	for root, dirs, files in os.walk(dir):
+		for name in files:
+			ID = splitext(name)[0].upper()
+			dict_files[ID] = join(basename(dir), name)
+	return dict_files
+
+def print_enum(dic, name, prefix, file):
+	print("enum " + name + " {", file=file)
+	line = "\t"
+	for i, ID in enumerate(sorted(dic, key=dic.get)):
+		add = prefix + ID
+		if i == 0:
+			add += " = 0, "
+		else:
+			add += ", "
+
+		if len(line) + len(add) > 77:
+			print(line[:-1], file=file)
+			line = ""
+			line += "\t" + add
+		else:	
+			line += add
+	print(line + "\n\t// end marker\n\t" + prefix + "MAX\n};\n", file=file)
+
+def print_mapping(dic, name, prefix, file):
+	print("const char *" + name + "[" + prefix + "MAX] = {", file=file)
+	size = len(dic)
+	line = "\t"
+	for i, ID in enumerate(sorted(dic, key=dic.get)):
+		add = "\"" + dic[ID] + "\""
+		if i != size-1:
+			add += ", "
+
+		if len(line) + len(add) > 77:
+			print(line[:-1], file=file)
+			line = ""
+			line += "\t" + add
+		else:	
+			line += add
+	print(line + "\n};\n", file=file)
+
+header = """
+/*****************************************
+ * data_files.h - Part of alex4 project. *
+ *                                       *
+ * GENERATED header, do not edit!        *
+ *****************************************/
+
+#ifndef DATA_FILES_H
+#define DATA_FILES_H
+
+// PUBLIC enums
+"""
+split = """// PRIVATE mappings
+
+#ifdef INSIDE_DATA
+"""
+footer = """#endif // INSIDE_DATA
+
+#endif // DATA_FILES_H
+"""
+
+##############################################################################
+# main
+##############################################################################
+
+# check params
+args = len(sys.argv)
+if args < 2 or args > 3:
+	print("ERROR: provide data directory and optionally a header file!", file=sys.stderr)
+	exit(1)
+
+data_dir = sys.argv[1]
+
+# to stdout or file
+out = sys.stdout
+if args == 3:
+	out = open(sys.argv[2], 'w')
+
+# get files
+images = list_files(join(data_dir, "images"))
+sounds = list_files(join(data_dir, "sfx_22"))
+music = list_files(join(data_dir, "music"))
+maps = list_files(join(data_dir, "maps"))
+fonts = list_files(join(data_dir, "font"))
+
+if not (images or sounds or music or maps or fonts):
+	print("ERROR: Could not find data files!", file=sys.stderr)
+	exit(1)
+
+# generate header file
+print(header, file=out)
+print_enum(images, "_images", "I_", file=out)
+print_enum(sounds, "_sounds", "S_", file=out)
+print_enum(music, "_music", "MSC_", file=out)
+print_enum(maps, "_maps", "MAP_", file=out)
+print_enum(fonts, "_fonts", "F_", file=out)
+print(split, file=out)
+print_mapping(images, "_image_mapping", "I_", file=out)
+print_mapping(sounds, "_sound_mapping", "S_", file=out)
+print_mapping(music, "_music_mapping", "MSC_", file=out)
+print_mapping(maps, "_map_mapping", "MAP_", file=out)
+print_mapping(fonts, "_font_mapping", "F_", file=out)
+print(footer, file=out)
+
+# close file
+if args == 3:
+	out.close()