example/q3bsp: rename to example/bsp/20kdm2

Makefile

@@ -12,6 +12,7 @@ LIB ?= $(MAKEFILE_PATH)
 include ip.mk
 
 include example/example.mk
+include example/bsp/bsp.mk
 include chess/chess.mk
 include text_editor/text_editor.mk
 

bsp/20kdm2/gen.sh

@@ -0,0 +1,11 @@
+while read line; do
+    filename=$(ls "$line".{tga,jpg} 2>/dev/null)
+    if [ -z $filename ]; then
+       continue;
+    fi
+    name="${filename%.*}"
+    data_name="${name}.data"
+    echo $data_name
+    python ~/model_generator/color_convert.py $filename rgb565 twiddled $data_name
+    (cd .. ; make pk/${data_name}.h)
+done < textures.txt

bsp/20kdm2/maps/20kdm2.bsp.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_bsp_20kdm2_maps_20kdm2_bsp_start __asm("_binary_bsp_20kdm2_maps_20kdm2_bsp_start");
+extern uint32_t _binary_bsp_20kdm2_maps_20kdm2_bsp_end __asm("_binary_bsp_20kdm2_maps_20kdm2_bsp_end");
+extern uint32_t _binary_bsp_20kdm2_maps_20kdm2_bsp_size __asm("_binary_bsp_20kdm2_maps_20kdm2_bsp_size");
+
+#ifdef __cplusplus
+}
+#endif

bsp/20kdm2/models/mapobjects/gratelamp/gratetorch2.data.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_bsp_20kdm2_models_mapobjects_gratelamp_gratetorch2_data_start __asm("_binary_bsp_20kdm2_models_mapobjects_gratelamp_gratetorch2_data_start");
+extern uint32_t _binary_bsp_20kdm2_models_mapobjects_gratelamp_gratetorch2_data_end __asm("_binary_bsp_20kdm2_models_mapobjects_gratelamp_gratetorch2_data_end");
+extern uint32_t _binary_bsp_20kdm2_models_mapobjects_gratelamp_gratetorch2_data_size __asm("_binary_bsp_20kdm2_models_mapobjects_gratelamp_gratetorch2_data_size");
+
+#ifdef __cplusplus
+}
+#endif

bsp/20kdm2/models/mapobjects/gratelamp/gratetorch2b.data.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_bsp_20kdm2_models_mapobjects_gratelamp_gratetorch2b_data_start __asm("_binary_bsp_20kdm2_models_mapobjects_gratelamp_gratetorch2b_data_start");
+extern uint32_t _binary_bsp_20kdm2_models_mapobjects_gratelamp_gratetorch2b_data_end __asm("_binary_bsp_20kdm2_models_mapobjects_gratelamp_gratetorch2b_data_end");
+extern uint32_t _binary_bsp_20kdm2_models_mapobjects_gratelamp_gratetorch2b_data_size __asm("_binary_bsp_20kdm2_models_mapobjects_gratelamp_gratetorch2b_data_size");
+
+#ifdef __cplusplus
+}
+#endif

bsp/20kdm2/models/mapobjects/timlamp/timlamp.data.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_bsp_20kdm2_models_mapobjects_timlamp_timlamp_data_start __asm("_binary_bsp_20kdm2_models_mapobjects_timlamp_timlamp_data_start");
+extern uint32_t _binary_bsp_20kdm2_models_mapobjects_timlamp_timlamp_data_end __asm("_binary_bsp_20kdm2_models_mapobjects_timlamp_timlamp_data_end");
+extern uint32_t _binary_bsp_20kdm2_models_mapobjects_timlamp_timlamp_data_size __asm("_binary_bsp_20kdm2_models_mapobjects_timlamp_timlamp_data_size");
+
+#ifdef __cplusplus
+}
+#endif

bsp/20kdm2/texture.inc

@@ -0,0 +1,216 @@
+{
+  .start = (void *)0,
+  .size = (uint32_t)0,
+  .offset = 0,
+  .width = 0,
+  .height = 0,
+  .v_mul = 0, // 0
+},
+{
+  .start = (void *)&_binary_bsp_20kdm2_textures_e7_e7walldesign01b_data_start,
+  .size = (uint32_t)&_binary_bsp_20kdm2_textures_e7_e7walldesign01b_data_size,
+  .offset = 0,
+  .width = 256,
+  .height = 1024,
+  .v_mul = 0.625, // 640
+},
+{
+  .start = (void *)&_binary_bsp_20kdm2_textures_e7_e7steptop2_data_start,
+  .size = (uint32_t)&_binary_bsp_20kdm2_textures_e7_e7steptop2_data_size,
+  .offset = 163840,
+  .width = 256,
+  .height = 32,
+  .v_mul = 1.0, // 32
+},
+{
+  .start = (void *)0,
+  .size = (uint32_t)0,
+  .offset = 172032,
+  .width = 0,
+  .height = 0,
+  .v_mul = 0, // 0
+},
+{
+  .start = (void *)&_binary_bsp_20kdm2_textures_e7_e7dimfloor_data_start,
+  .size = (uint32_t)&_binary_bsp_20kdm2_textures_e7_e7dimfloor_data_size,
+  .offset = 172032,
+  .width = 128,
+  .height = 128,
+  .v_mul = 1.0, // 128
+},
+{
+  .start = (void *)&_binary_bsp_20kdm2_textures_e7_e7brickfloor01_data_start,
+  .size = (uint32_t)&_binary_bsp_20kdm2_textures_e7_e7brickfloor01_data_size,
+  .offset = 188416,
+  .width = 256,
+  .height = 256,
+  .v_mul = 1.0, // 256
+},
+{
+  .start = (void *)&_binary_bsp_20kdm2_textures_e7_e7bmtrim_data_start,
+  .size = (uint32_t)&_binary_bsp_20kdm2_textures_e7_e7bmtrim_data_size,
+  .offset = 253952,
+  .width = 256,
+  .height = 64,
+  .v_mul = 1.0, // 64
+},
+{
+  .start = (void *)&_binary_bsp_20kdm2_textures_e7_e7sbrickfloor_data_start,
+  .size = (uint32_t)&_binary_bsp_20kdm2_textures_e7_e7sbrickfloor_data_size,
+  .offset = 270336,
+  .width = 256,
+  .height = 256,
+  .v_mul = 1.0, // 256
+},
+{
+  .start = (void *)&_binary_bsp_20kdm2_textures_e7_e7brnmetal_data_start,
+  .size = (uint32_t)&_binary_bsp_20kdm2_textures_e7_e7brnmetal_data_size,
+  .offset = 335872,
+  .width = 256,
+  .height = 256,
+  .v_mul = 1.0, // 256
+},
+{
+  .start = (void *)0,
+  .size = (uint32_t)0,
+  .offset = 401408,
+  .width = 0,
+  .height = 0,
+  .v_mul = 0, // 0
+},
+{
+  .start = (void *)&_binary_bsp_20kdm2_textures_e7_e7beam02_red_data_start,
+  .size = (uint32_t)&_binary_bsp_20kdm2_textures_e7_e7beam02_red_data_size,
+  .offset = 401408,
+  .width = 64,
+  .height = 128,
+  .v_mul = 1.0, // 128
+},
+{
+  .start = (void *)&_binary_bsp_20kdm2_textures_e7_e7swindow_data_start,
+  .size = (uint32_t)&_binary_bsp_20kdm2_textures_e7_e7swindow_data_size,
+  .offset = 409600,
+  .width = 256,
+  .height = 256,
+  .v_mul = 1.0, // 256
+},
+{
+  .start = (void *)&_binary_bsp_20kdm2_textures_e7_e7bigwall_data_start,
+  .size = (uint32_t)&_binary_bsp_20kdm2_textures_e7_e7bigwall_data_size,
+  .offset = 475136,
+  .width = 256,
+  .height = 1024,
+  .v_mul = 0.75, // 768
+},
+{
+  .start = (void *)&_binary_bsp_20kdm2_textures_e7_e7panelwood_data_start,
+  .size = (uint32_t)&_binary_bsp_20kdm2_textures_e7_e7panelwood_data_size,
+  .offset = 671744,
+  .width = 256,
+  .height = 256,
+  .v_mul = 1.0, // 256
+},
+{
+  .start = (void *)&_binary_bsp_20kdm2_textures_e7_e7beam01_data_start,
+  .size = (uint32_t)&_binary_bsp_20kdm2_textures_e7_e7beam01_data_size,
+  .offset = 737280,
+  .width = 64,
+  .height = 256,
+  .v_mul = 1.0, // 256
+},
+{
+  .start = (void *)&_binary_bsp_20kdm2_textures_gothic_floor_xstepborder5_data_start,
+  .size = (uint32_t)&_binary_bsp_20kdm2_textures_gothic_floor_xstepborder5_data_size,
+  .offset = 753664,
+  .width = 256,
+  .height = 64,
+  .v_mul = 0.78125, // 50
+},
+{
+  .start = (void *)&_binary_bsp_20kdm2_textures_liquids_lavahell_data_start,
+  .size = (uint32_t)&_binary_bsp_20kdm2_textures_liquids_lavahell_data_size,
+  .offset = 766464,
+  .width = 128,
+  .height = 128,
+  .v_mul = 1.0, // 128
+},
+{
+  .start = (void *)&_binary_bsp_20kdm2_textures_e7_e7steptop_data_start,
+  .size = (uint32_t)&_binary_bsp_20kdm2_textures_e7_e7steptop_data_size,
+  .offset = 782848,
+  .width = 256,
+  .height = 32,
+  .v_mul = 1.0, // 32
+},
+{
+  .start = (void *)&_binary_bsp_20kdm2_textures_gothic_trim_metalblackwave01_data_start,
+  .size = (uint32_t)&_binary_bsp_20kdm2_textures_gothic_trim_metalblackwave01_data_size,
+  .offset = 791040,
+  .width = 256,
+  .height = 256,
+  .v_mul = 1.0, // 256
+},
+{
+  .start = (void *)&_binary_bsp_20kdm2_textures_stone_pjrock1_data_start,
+  .size = (uint32_t)&_binary_bsp_20kdm2_textures_stone_pjrock1_data_size,
+  .offset = 856576,
+  .width = 256,
+  .height = 256,
+  .v_mul = 1.0, // 256
+},
+{
+  .start = (void *)0,
+  .size = (uint32_t)0,
+  .offset = 922112,
+  .width = 0,
+  .height = 0,
+  .v_mul = 0, // 0
+},
+{
+  .start = (void *)0,
+  .size = (uint32_t)0,
+  .offset = 922112,
+  .width = 0,
+  .height = 0,
+  .v_mul = 0, // 0
+},
+{
+  .start = (void *)&_binary_bsp_20kdm2_models_mapobjects_timlamp_timlamp_data_start,
+  .size = (uint32_t)&_binary_bsp_20kdm2_models_mapobjects_timlamp_timlamp_data_size,
+  .offset = 922112,
+  .width = 128,
+  .height = 128,
+  .v_mul = 1.0, // 128
+},
+{
+  .start = (void *)0,
+  .size = (uint32_t)0,
+  .offset = 938496,
+  .width = 0,
+  .height = 0,
+  .v_mul = 0, // 0
+},
+{
+  .start = (void *)&_binary_bsp_20kdm2_textures_sfx_flame2_data_start,
+  .size = (uint32_t)&_binary_bsp_20kdm2_textures_sfx_flame2_data_size,
+  .offset = 938496,
+  .width = 128,
+  .height = 256,
+  .v_mul = 1.0, // 256
+},
+{
+  .start = (void *)&_binary_bsp_20kdm2_models_mapobjects_gratelamp_gratetorch2_data_start,
+  .size = (uint32_t)&_binary_bsp_20kdm2_models_mapobjects_gratelamp_gratetorch2_data_size,
+  .offset = 971264,
+  .width = 32,
+  .height = 64,
+  .v_mul = 1.0, // 64
+},
+{
+  .start = (void *)&_binary_bsp_20kdm2_models_mapobjects_gratelamp_gratetorch2b_data_start,
+  .size = (uint32_t)&_binary_bsp_20kdm2_models_mapobjects_gratelamp_gratetorch2b_data_size,
+  .offset = 973312,
+  .width = 32,
+  .height = 64,
+  .v_mul = 1.0, // 64
+},

bsp/20kdm2/textures/e7/e7beam01.data.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7beam01_data_start __asm("_binary_bsp_20kdm2_textures_e7_e7beam01_data_start");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7beam01_data_end __asm("_binary_bsp_20kdm2_textures_e7_e7beam01_data_end");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7beam01_data_size __asm("_binary_bsp_20kdm2_textures_e7_e7beam01_data_size");
+
+#ifdef __cplusplus
+}
+#endif

bsp/20kdm2/textures/e7/e7beam02_red.data.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7beam02_red_data_start __asm("_binary_bsp_20kdm2_textures_e7_e7beam02_red_data_start");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7beam02_red_data_end __asm("_binary_bsp_20kdm2_textures_e7_e7beam02_red_data_end");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7beam02_red_data_size __asm("_binary_bsp_20kdm2_textures_e7_e7beam02_red_data_size");
+
+#ifdef __cplusplus
+}
+#endif

bsp/20kdm2/textures/e7/e7bigwall.data.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7bigwall_data_start __asm("_binary_bsp_20kdm2_textures_e7_e7bigwall_data_start");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7bigwall_data_end __asm("_binary_bsp_20kdm2_textures_e7_e7bigwall_data_end");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7bigwall_data_size __asm("_binary_bsp_20kdm2_textures_e7_e7bigwall_data_size");
+
+#ifdef __cplusplus
+}
+#endif

bsp/20kdm2/textures/e7/e7bmtrim.data.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7bmtrim_data_start __asm("_binary_bsp_20kdm2_textures_e7_e7bmtrim_data_start");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7bmtrim_data_end __asm("_binary_bsp_20kdm2_textures_e7_e7bmtrim_data_end");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7bmtrim_data_size __asm("_binary_bsp_20kdm2_textures_e7_e7bmtrim_data_size");
+
+#ifdef __cplusplus
+}
+#endif

bsp/20kdm2/textures/e7/e7brickfloor01.data.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7brickfloor01_data_start __asm("_binary_bsp_20kdm2_textures_e7_e7brickfloor01_data_start");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7brickfloor01_data_end __asm("_binary_bsp_20kdm2_textures_e7_e7brickfloor01_data_end");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7brickfloor01_data_size __asm("_binary_bsp_20kdm2_textures_e7_e7brickfloor01_data_size");
+
+#ifdef __cplusplus
+}
+#endif

bsp/20kdm2/textures/e7/e7brnmetal.data.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7brnmetal_data_start __asm("_binary_bsp_20kdm2_textures_e7_e7brnmetal_data_start");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7brnmetal_data_end __asm("_binary_bsp_20kdm2_textures_e7_e7brnmetal_data_end");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7brnmetal_data_size __asm("_binary_bsp_20kdm2_textures_e7_e7brnmetal_data_size");
+
+#ifdef __cplusplus
+}
+#endif

bsp/20kdm2/textures/e7/e7dimfloor.data.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7dimfloor_data_start __asm("_binary_bsp_20kdm2_textures_e7_e7dimfloor_data_start");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7dimfloor_data_end __asm("_binary_bsp_20kdm2_textures_e7_e7dimfloor_data_end");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7dimfloor_data_size __asm("_binary_bsp_20kdm2_textures_e7_e7dimfloor_data_size");
+
+#ifdef __cplusplus
+}
+#endif

bsp/20kdm2/textures/e7/e7panelwood.data.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7panelwood_data_start __asm("_binary_bsp_20kdm2_textures_e7_e7panelwood_data_start");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7panelwood_data_end __asm("_binary_bsp_20kdm2_textures_e7_e7panelwood_data_end");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7panelwood_data_size __asm("_binary_bsp_20kdm2_textures_e7_e7panelwood_data_size");
+
+#ifdef __cplusplus
+}
+#endif

bsp/20kdm2/textures/e7/e7sbrickfloor.data.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7sbrickfloor_data_start __asm("_binary_bsp_20kdm2_textures_e7_e7sbrickfloor_data_start");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7sbrickfloor_data_end __asm("_binary_bsp_20kdm2_textures_e7_e7sbrickfloor_data_end");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7sbrickfloor_data_size __asm("_binary_bsp_20kdm2_textures_e7_e7sbrickfloor_data_size");
+
+#ifdef __cplusplus
+}
+#endif

bsp/20kdm2/textures/e7/e7steptop.data.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7steptop_data_start __asm("_binary_bsp_20kdm2_textures_e7_e7steptop_data_start");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7steptop_data_end __asm("_binary_bsp_20kdm2_textures_e7_e7steptop_data_end");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7steptop_data_size __asm("_binary_bsp_20kdm2_textures_e7_e7steptop_data_size");
+
+#ifdef __cplusplus
+}
+#endif

bsp/20kdm2/textures/e7/e7steptop2.data.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7steptop2_data_start __asm("_binary_bsp_20kdm2_textures_e7_e7steptop2_data_start");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7steptop2_data_end __asm("_binary_bsp_20kdm2_textures_e7_e7steptop2_data_end");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7steptop2_data_size __asm("_binary_bsp_20kdm2_textures_e7_e7steptop2_data_size");
+
+#ifdef __cplusplus
+}
+#endif

bsp/20kdm2/textures/e7/e7swindow.data.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7swindow_data_start __asm("_binary_bsp_20kdm2_textures_e7_e7swindow_data_start");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7swindow_data_end __asm("_binary_bsp_20kdm2_textures_e7_e7swindow_data_end");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7swindow_data_size __asm("_binary_bsp_20kdm2_textures_e7_e7swindow_data_size");
+
+#ifdef __cplusplus
+}
+#endif

bsp/20kdm2/textures/e7/e7walldesign01b.data.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7walldesign01b_data_start __asm("_binary_bsp_20kdm2_textures_e7_e7walldesign01b_data_start");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7walldesign01b_data_end __asm("_binary_bsp_20kdm2_textures_e7_e7walldesign01b_data_end");
+extern uint32_t _binary_bsp_20kdm2_textures_e7_e7walldesign01b_data_size __asm("_binary_bsp_20kdm2_textures_e7_e7walldesign01b_data_size");
+
+#ifdef __cplusplus
+}
+#endif

bsp/20kdm2/textures/gothic_floor/xstepborder5.data.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_bsp_20kdm2_textures_gothic_floor_xstepborder5_data_start __asm("_binary_bsp_20kdm2_textures_gothic_floor_xstepborder5_data_start");
+extern uint32_t _binary_bsp_20kdm2_textures_gothic_floor_xstepborder5_data_end __asm("_binary_bsp_20kdm2_textures_gothic_floor_xstepborder5_data_end");
+extern uint32_t _binary_bsp_20kdm2_textures_gothic_floor_xstepborder5_data_size __asm("_binary_bsp_20kdm2_textures_gothic_floor_xstepborder5_data_size");
+
+#ifdef __cplusplus
+}
+#endif

bsp/20kdm2/textures/gothic_trim/metalblackwave01.data.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_bsp_20kdm2_textures_gothic_trim_metalblackwave01_data_start __asm("_binary_bsp_20kdm2_textures_gothic_trim_metalblackwave01_data_start");
+extern uint32_t _binary_bsp_20kdm2_textures_gothic_trim_metalblackwave01_data_end __asm("_binary_bsp_20kdm2_textures_gothic_trim_metalblackwave01_data_end");
+extern uint32_t _binary_bsp_20kdm2_textures_gothic_trim_metalblackwave01_data_size __asm("_binary_bsp_20kdm2_textures_gothic_trim_metalblackwave01_data_size");
+
+#ifdef __cplusplus
+}
+#endif

bsp/20kdm2/textures/liquids/lavahell.data.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_bsp_20kdm2_textures_liquids_lavahell_data_start __asm("_binary_bsp_20kdm2_textures_liquids_lavahell_data_start");
+extern uint32_t _binary_bsp_20kdm2_textures_liquids_lavahell_data_end __asm("_binary_bsp_20kdm2_textures_liquids_lavahell_data_end");
+extern uint32_t _binary_bsp_20kdm2_textures_liquids_lavahell_data_size __asm("_binary_bsp_20kdm2_textures_liquids_lavahell_data_size");
+
+#ifdef __cplusplus
+}
+#endif

bsp/20kdm2/textures/sfx/flame2.data.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_bsp_20kdm2_textures_sfx_flame2_data_start __asm("_binary_bsp_20kdm2_textures_sfx_flame2_data_start");
+extern uint32_t _binary_bsp_20kdm2_textures_sfx_flame2_data_end __asm("_binary_bsp_20kdm2_textures_sfx_flame2_data_end");
+extern uint32_t _binary_bsp_20kdm2_textures_sfx_flame2_data_size __asm("_binary_bsp_20kdm2_textures_sfx_flame2_data_size");
+
+#ifdef __cplusplus
+}
+#endif

bsp/20kdm2/textures/stone/pjrock1.data.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint32_t _binary_bsp_20kdm2_textures_stone_pjrock1_data_start __asm("_binary_bsp_20kdm2_textures_stone_pjrock1_data_start");
+extern uint32_t _binary_bsp_20kdm2_textures_stone_pjrock1_data_end __asm("_binary_bsp_20kdm2_textures_stone_pjrock1_data_end");
+extern uint32_t _binary_bsp_20kdm2_textures_stone_pjrock1_data_size __asm("_binary_bsp_20kdm2_textures_stone_pjrock1_data_size");
+
+#ifdef __cplusplus
+}
+#endif

example/bsp/20kdm2.cpp

@@ -30,9 +30,6 @@
 #include "sh7091/serial.hpp"
 #include "printf/printf.h"
 
-#include "q3bsp/q3bsp.h"
-#include "pk/maps/20kdm2.bsp.h"
-
 #include "math/vec2.hpp"
 #include "math/vec3.hpp"
 #include "math/vec4.hpp"
@@ -43,27 +40,31 @@
 
 #include "interrupt.hpp"
 
-#include "pk/textures/e7/e7walldesign01b.data.h"
+#include "bsp/20kdm2/textures/e7/e7walldesign01b.data.h"
-#include "pk/textures/e7/e7steptop2.data.h"
+#include "bsp/20kdm2/textures/e7/e7steptop2.data.h"
-#include "pk/textures/e7/e7dimfloor.data.h"
+#include "bsp/20kdm2/textures/e7/e7dimfloor.data.h"
-#include "pk/textures/e7/e7brickfloor01.data.h"
+#include "bsp/20kdm2/textures/e7/e7brickfloor01.data.h"
-#include "pk/textures/e7/e7bmtrim.data.h"
+#include "bsp/20kdm2/textures/e7/e7bmtrim.data.h"
-#include "pk/textures/e7/e7sbrickfloor.data.h"
+#include "bsp/20kdm2/textures/e7/e7sbrickfloor.data.h"
-#include "pk/textures/e7/e7brnmetal.data.h"
+#include "bsp/20kdm2/textures/e7/e7brnmetal.data.h"
-#include "pk/textures/e7/e7beam02_red.data.h"
+#include "bsp/20kdm2/textures/e7/e7beam02_red.data.h"
-#include "pk/textures/e7/e7swindow.data.h"
+#include "bsp/20kdm2/textures/e7/e7swindow.data.h"
-#include "pk/textures/e7/e7bigwall.data.h"
+#include "bsp/20kdm2/textures/e7/e7bigwall.data.h"
-#include "pk/textures/e7/e7panelwood.data.h"
+#include "bsp/20kdm2/textures/e7/e7panelwood.data.h"
-#include "pk/textures/e7/e7beam01.data.h"
+#include "bsp/20kdm2/textures/e7/e7beam01.data.h"
-#include "pk/textures/gothic_floor/xstepborder5.data.h"
+#include "bsp/20kdm2/textures/gothic_floor/xstepborder5.data.h"
-#include "pk/textures/liquids/lavahell.data.h"
+#include "bsp/20kdm2/textures/liquids/lavahell.data.h"
-#include "pk/textures/e7/e7steptop.data.h"
+#include "bsp/20kdm2/textures/e7/e7steptop.data.h"
-#include "pk/textures/gothic_trim/metalblackwave01.data.h"
+#include "bsp/20kdm2/textures/gothic_trim/metalblackwave01.data.h"
-#include "pk/textures/stone/pjrock1.data.h"
+#include "bsp/20kdm2/textures/stone/pjrock1.data.h"
-#include "pk/models/mapobjects/timlamp/timlamp.data.h"
+#include "bsp/20kdm2/models/mapobjects/timlamp/timlamp.data.h"
-#include "pk/textures/sfx/flame2.data.h"
+#include "bsp/20kdm2/textures/sfx/flame2.data.h"
-#include "pk/models/mapobjects/gratelamp/gratetorch2.data.h"
+#include "bsp/20kdm2/models/mapobjects/gratelamp/gratetorch2.data.h"
-#include "pk/models/mapobjects/gratelamp/gratetorch2b.data.h"
+#include "bsp/20kdm2/models/mapobjects/gratelamp/gratetorch2b.data.h"
+
+#include "q3bsp/q3bsp.h"
+#include "bsp/20kdm2/maps/20kdm2.bsp.h"
+#include "bsp/20kdm2/texture.h"
 
 #include "model/model.h"
 #include "model/icosphere/model.h"
@@ -75,8 +76,6 @@
 
 #include "assert.h"
 
-#include "pk/texture.h"
-
 constexpr int font_offset = ((0x7f - 0x20) + 1) * 8 * 16 / 2;
 
 using vec2 = vec<2, float>;
@@ -414,7 +413,7 @@ static vec3 light_vec = {20, -20, -20};
 
 static inline void transfer_face(ta_parameter_writer& writer, q3bsp_face_t * face, int * last_texture)
 {
-  uint8_t * buf = reinterpret_cast<uint8_t *>(&_binary_pk_maps_20kdm2_bsp_start);
+  uint8_t * buf = reinterpret_cast<uint8_t *>(&_binary_bsp_20kdm2_maps_20kdm2_bsp_start);
   q3bsp_header_t * header = reinterpret_cast<q3bsp_header_t *>(buf);
 
   q3bsp_direntry * ve = &header->direntries[LUMP_VERTEXES];
@@ -508,7 +507,7 @@ static inline void transfer_face(ta_parameter_writer& writer, q3bsp_face_t * fac
 
 void transfer_faces(ta_parameter_writer& writer)
 {
-  uint8_t * buf = reinterpret_cast<uint8_t *>(&_binary_pk_maps_20kdm2_bsp_start);
+  uint8_t * buf = reinterpret_cast<uint8_t *>(&_binary_bsp_20kdm2_maps_20kdm2_bsp_start);
   q3bsp_header_t * header = reinterpret_cast<q3bsp_header_t *>(buf);
 
   q3bsp_direntry * fe = &header->direntries[LUMP_FACES];
@@ -525,7 +524,7 @@ void transfer_faces(ta_parameter_writer& writer)
 
 int count_face_triangles()
 {
-  uint8_t * buf = reinterpret_cast<uint8_t *>(&_binary_pk_maps_20kdm2_bsp_start);
+  uint8_t * buf = reinterpret_cast<uint8_t *>(&_binary_bsp_20kdm2_maps_20kdm2_bsp_start);
   q3bsp_header_t * header = reinterpret_cast<q3bsp_header_t *>(buf);
 
   q3bsp_direntry * fe = &header->direntries[LUMP_FACES];
@@ -807,7 +806,7 @@ void render_ix(ta_parameter_writer& writer, int row, char * s, int ix)
 
 void render_leaf_ix(ta_parameter_writer& writer)
 {
-  uint8_t * buf = reinterpret_cast<uint8_t *>(&_binary_pk_maps_20kdm2_bsp_start);
+  uint8_t * buf = reinterpret_cast<uint8_t *>(&_binary_bsp_20kdm2_maps_20kdm2_bsp_start);
   q3bsp_header_t * header = reinterpret_cast<q3bsp_header_t *>(buf);
   q3bsp_direntry * ne = &header->direntries[LUMP_NODES];
   q3bsp_node_t * nodes = reinterpret_cast<q3bsp_node_t *>(&buf[ne->offset]);
@@ -874,7 +873,7 @@ void render_bounding_box_mm(ta_parameter_writer& writer, const mat4x4& trans, in
 
 void render_bounding_boxes(ta_parameter_writer& writer, const mat4x4& trans)
 {
-  uint8_t * buf = reinterpret_cast<uint8_t *>(&_binary_pk_maps_20kdm2_bsp_start);
+  uint8_t * buf = reinterpret_cast<uint8_t *>(&_binary_bsp_20kdm2_maps_20kdm2_bsp_start);
   q3bsp_header_t * header = reinterpret_cast<q3bsp_header_t *>(buf);
 
   q3bsp_direntry * le = &header->direntries[LUMP_LEAFS];
@@ -922,7 +921,7 @@ bool vec3_in_bb(vec3 v, int mins[3], int maxs[3])
 
 void render_leaf_faces(ta_parameter_writer& writer, const mat4x4& trans, q3bsp_leaf_t * leaf)
 {
-  uint8_t * buf = reinterpret_cast<uint8_t *>(&_binary_pk_maps_20kdm2_bsp_start);
+  uint8_t * buf = reinterpret_cast<uint8_t *>(&_binary_bsp_20kdm2_maps_20kdm2_bsp_start);
   q3bsp_header_t * header = reinterpret_cast<q3bsp_header_t *>(buf);
 
   //int leafface 	First leafface for leaf.
@@ -949,7 +948,7 @@ void render_leaf_faces(ta_parameter_writer& writer, const mat4x4& trans, q3bsp_l
 
 void render_visible_faces(ta_parameter_writer& writer, const mat4x4& trans, const vec3 pos)
 {
-  uint8_t * buf = reinterpret_cast<uint8_t *>(&_binary_pk_maps_20kdm2_bsp_start);
+  uint8_t * buf = reinterpret_cast<uint8_t *>(&_binary_bsp_20kdm2_maps_20kdm2_bsp_start);
   q3bsp_header_t * header = reinterpret_cast<q3bsp_header_t *>(buf);
 
   q3bsp_direntry * le = &header->direntries[LUMP_LEAFS];
@@ -1038,7 +1037,7 @@ void render_visible_faces(ta_parameter_writer& writer, const mat4x4& trans, cons
 
 void transfer_scene(ta_parameter_writer& writer, const mat4x4& screen_trans, const mat4x4& screen_trans_inv)
 {
-  uint8_t * buf = reinterpret_cast<uint8_t *>(&_binary_pk_maps_20kdm2_bsp_start);
+  uint8_t * buf = reinterpret_cast<uint8_t *>(&_binary_bsp_20kdm2_maps_20kdm2_bsp_start);
   q3bsp_header_t * header = reinterpret_cast<q3bsp_header_t *>(buf);
 
   const mat4x4 trans = screen_trans;
@@ -1214,7 +1213,7 @@ mat4x4 update_analog(const mat4x4& screen)
     0, 0, 0, 1,
   };
 
-  uint8_t * buf = reinterpret_cast<uint8_t *>(&_binary_pk_maps_20kdm2_bsp_start);
+  uint8_t * buf = reinterpret_cast<uint8_t *>(&_binary_bsp_20kdm2_maps_20kdm2_bsp_start);
   q3bsp_header_t * header = reinterpret_cast<q3bsp_header_t *>(buf);
   //q3bsp_direntry * le = &header->direntries[LUMP_LEAFS];
   //int num_leaves = le->length / (sizeof (struct q3bsp_leaf));

example/bsp/bsp.mk

@@ -0,0 +1,42 @@
+BSP_20KDM2_OBJ = \
+	example/bsp/20kdm2.o \
+	holly/core.o \
+	holly/region_array.o \
+	holly/background.o \
+	holly/ta_fifo_polygon_converter.o \
+	holly/video_output.o \
+	sh7091/serial.o \
+	sh7091/c_serial.o \
+	printf/printf.o \
+	printf/unparse.o \
+	printf/parse.o \
+	interrupt.o \
+	maple/maple.o \
+	font/font_bitmap.o \
+	font/verite_8x16/verite_8x16.data.o \
+	bsp/20kdm2/maps/20kdm2.bsp.o \
+	bsp/20kdm2/textures/e7/e7walldesign01b.data.o \
+	bsp/20kdm2/textures/e7/e7steptop2.data.o \
+	bsp/20kdm2/textures/e7/e7dimfloor.data.o \
+	bsp/20kdm2/textures/e7/e7brickfloor01.data.o \
+	bsp/20kdm2/textures/e7/e7bmtrim.data.o \
+	bsp/20kdm2/textures/e7/e7sbrickfloor.data.o \
+	bsp/20kdm2/textures/e7/e7brnmetal.data.o \
+	bsp/20kdm2/textures/e7/e7beam02_red.data.o \
+	bsp/20kdm2/textures/e7/e7swindow.data.o \
+	bsp/20kdm2/textures/e7/e7bigwall.data.o \
+	bsp/20kdm2/textures/e7/e7panelwood.data.o \
+	bsp/20kdm2/textures/e7/e7beam01.data.o \
+	bsp/20kdm2/textures/gothic_floor/xstepborder5.data.o \
+	bsp/20kdm2/textures/liquids/lavahell.data.o \
+	bsp/20kdm2/textures/e7/e7steptop.data.o \
+	bsp/20kdm2/textures/gothic_trim/metalblackwave01.data.o \
+	bsp/20kdm2/textures/stone/pjrock1.data.o \
+	bsp/20kdm2/models/mapobjects/timlamp/timlamp.data.o \
+	bsp/20kdm2/textures/sfx/flame2.data.o \
+	bsp/20kdm2/models/mapobjects/gratelamp/gratetorch2.data.o \
+	bsp/20kdm2/models/mapobjects/gratelamp/gratetorch2b.data.o \
+	$(LIBGCC)
+
+example/bsp/20kdm2.elf: LDSCRIPT = $(LIB)/main.lds
+example/bsp/20kdm2.elf: $(START_OBJ) $(BSP_20KDM2_OBJ)

example/example.mk

@@ -561,7 +561,8 @@ TEXTURE_FILTERING_OBJ = \
 	texture/bbb/bbb128.data.o \
 	texture/bbb/bbb256.data.o \
 	texture/bbb/bbb512.data.o \
-	texture/bbb/bbb1024.data.o
+	texture/bbb/bbb1024.data.o \
+	sh7091/serial.o
 
 example/texture_filtering.elf: LDSCRIPT = $(LIB)/main.lds
 example/texture_filtering.elf: $(START_OBJ) $(TEXTURE_FILTERING_OBJ)
@@ -1004,46 +1005,3 @@ MOD_OBJ = \
 
 example/mod.elf: LDSCRIPT = $(LIB)/main.lds
 example/mod.elf: $(START_OBJ) $(MOD_OBJ)
-
-Q3BSP_OBJ = \
-	example/q3bsp.o \
-	holly/core.o \
-	holly/region_array.o \
-	holly/background.o \
-	holly/ta_fifo_polygon_converter.o \
-	holly/video_output.o \
-	sh7091/serial.o \
-	sh7091/c_serial.o \
-	printf/printf.o \
-	printf/unparse.o \
-	printf/parse.o \
-	pk/maps/20kdm2.bsp.o \
-	interrupt.o \
-	maple/maple.o \
-	font/font_bitmap.o \
-	font/verite_8x16/verite_8x16.data.o \
-	pk/textures/e7/e7walldesign01b.data.o \
-	pk/textures/e7/e7steptop2.data.o \
-	pk/textures/e7/e7dimfloor.data.o \
-	pk/textures/e7/e7brickfloor01.data.o \
-	pk/textures/e7/e7bmtrim.data.o \
-	pk/textures/e7/e7sbrickfloor.data.o \
-	pk/textures/e7/e7brnmetal.data.o \
-	pk/textures/e7/e7beam02_red.data.o \
-	pk/textures/e7/e7swindow.data.o \
-	pk/textures/e7/e7bigwall.data.o \
-	pk/textures/e7/e7panelwood.data.o \
-	pk/textures/e7/e7beam01.data.o \
-	pk/textures/gothic_floor/xstepborder5.data.o \
-	pk/textures/liquids/lavahell.data.o \
-	pk/textures/e7/e7steptop.data.o \
-	pk/textures/gothic_trim/metalblackwave01.data.o \
-	pk/textures/stone/pjrock1.data.o \
-	pk/models/mapobjects/timlamp/timlamp.data.o \
-	pk/textures/sfx/flame2.data.o \
-	pk/models/mapobjects/gratelamp/gratetorch2.data.o \
-	pk/models/mapobjects/gratelamp/gratetorch2b.data.o \
-	$(LIBGCC)
-
-example/q3bsp.elf: LDSCRIPT = $(LIB)/main.lds
-example/q3bsp.elf: $(START_OBJ) $(Q3BSP_OBJ)

pk/gen.sh

@@ -1,42 +0,0 @@
-declare -a textures=(
-    "textures/common/caulk"
-    "textures/e7/e7walldesign01b"
-    "textures/e7/e7steptop2"
-    "noshader"
-    "textures/e7/e7dimfloor"
-    "textures/e7/e7brickfloor01"
-    "textures/e7/e7bmtrim"
-    "textures/e7/e7sbrickfloor"
-    "textures/e7/e7brnmetal"
-    "textures/common/clip"
-    "textures/e7/e7beam02_red"
-    "textures/e7/e7swindow"
-    "textures/e7/e7bigwall"
-    "textures/e7/e7panelwood"
-    "textures/e7/e7beam01"
-    "textures/gothic_floor/xstepborder5"
-    "textures/liquids/lavahell"
-    "textures/e7/e7steptop"
-    "textures/gothic_trim/metalblackwave01"
-    "textures/stone/pjrock1"
-    "textures/skies/tim_hell"
-    "textures/common/hint"
-    "models/mapobjects/timlamp/timlamp"
-    "textures/sfx/flame1side"
-    "textures/sfx/flame2"
-    "models/mapobjects/gratelamp/gratetorch2"
-    "models/mapobjects/gratelamp/gratetorch2b"
-)
-
-for t in "${textures[@]}"
-do
-    filename=$(ls "$t".{tga,jpg} 2>/dev/null)
-    if [ -z $filename ]; then
-       continue;
-    fi
-    name="${filename%.*}"
-    data_name="${name}.data"
-    echo $data_name
-    python ~/model_generator/color_convert.py $filename rgb565 non_twiddled $data_name
-    (cd .. ; make pk/${data_name}.h)
-done

pk/maps/20kdm2.bsp.h

@@ -1,15 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern uint32_t _binary_pk_maps_20kdm2_bsp_start __asm("_binary_pk_maps_20kdm2_bsp_start");
-extern uint32_t _binary_pk_maps_20kdm2_bsp_end __asm("_binary_pk_maps_20kdm2_bsp_end");
-extern uint32_t _binary_pk_maps_20kdm2_bsp_size __asm("_binary_pk_maps_20kdm2_bsp_size");
-
-#ifdef __cplusplus
-}
-#endif

pk/models/mapobjects/gratelamp/gratetorch2.data.h

@@ -1,15 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern uint32_t _binary_pk_models_mapobjects_gratelamp_gratetorch2_data_start __asm("_binary_pk_models_mapobjects_gratelamp_gratetorch2_data_start");
-extern uint32_t _binary_pk_models_mapobjects_gratelamp_gratetorch2_data_end __asm("_binary_pk_models_mapobjects_gratelamp_gratetorch2_data_end");
-extern uint32_t _binary_pk_models_mapobjects_gratelamp_gratetorch2_data_size __asm("_binary_pk_models_mapobjects_gratelamp_gratetorch2_data_size");
-
-#ifdef __cplusplus
-}
-#endif