Tweak models location and makefile so that it builds .mdl files

Makefile

@@ -5,12 +5,14 @@ MAP16SRC  := $(shell ls ./assets/levels/**/map16.json)
 COL16SRC  := $(shell ls ./assets/levels/**/tiles16.tsx)
 MAP128SRC := $(shell ls ./assets/levels/**/tilemap128.tmx)
 LVLSRC    := $(shell ls ./assets/levels/**/Z*.tmx)
+MDLSRC    := $(shell ls ./assets/models/**/*.rsd)
 
 MAP16OUT  := $(addsuffix MAP16.MAP,$(dir $(MAP16SRC)))
 COL16OUT  := $(addsuffix MAP16.COL,$(dir $(COL16SRC)))
 MAP128OUT := $(addsuffix MAP128.MAP,$(dir $(COL16SRC)))
 LVLOUT    := $(addsuffix .LVL,$(basename $(LVLSRC)))
 OMPOUT    := $(addsuffix .OMP,$(basename $(LVLSRC)))
+MDLOUT    := $(addsuffix .mdl,$(basename $(MDLSRC)))
 
 .PHONY: clean ./build/engine.cue run configure chd cook iso elf debug cooktest purge
 
@@ -77,15 +79,17 @@ purge: clean cleancook
 #         ASSET COOKING TARGETS
 # =======================================
 
+mdls:   $(MDLOUT)
 map16:  $(MAP16OUT) $(COL16OUT)
 map128: $(MAP128OUT)
 lvl:    $(LVLOUT)
 objs:   $(OMPOUT)
 
-cook: map16 map128 lvl objs
+cook: mdls map16 map128 lvl objs
 
 cleancook:
-	rm -rf assets/levels/**/*.COL \
+	rm -rf assets/models/**/*.mdl \
+	       assets/levels/**/*.COL \
 	       assets/levels/**/*.MAP \
 	       assets/levels/**/*.LVL \
 	       assets/levels/**/*.OMP \
@@ -95,6 +99,10 @@ cleancook:
 	       assets/levels/**/tilemap128_solid.csv \
 	       assets/levels/**/tilemap128_oneway.csv
 
+# Object models
+%.mdl: %.rsd %.ply %.mat
+	./tools/convrsd/convrsd.py $<
+
 # 16x16 tile mapping
 # (Depends on mapping generated on Aseprite)
 %/MAP16.MAP: %/map16.json

assets/models/.gitignore

@@ -0,0 +1,2 @@
+*.mdl
+

iso.xml

@@ -121,16 +121,16 @@
 
       </dir> <!-- LEVELS -->
 
-      <dir name="OBJS">
+      <dir name="MODELS">
 	<dir name="COMMON">
 	  <file name="RING.MDL"
 		type="data"
-		source="${PROJECT_SOURCE_DIR}/assets/objs/common/ring.mdl" />
+		source="${PROJECT_SOURCE_DIR}/assets/models/common/ring.mdl" />
-	  <file name="PLANET.MDL"
+	  <!-- <file name="PLANET.MDL" -->
-		type="data"
+	  <!-- 	type="data" -->
-		source="${PROJECT_SOURCE_DIR}/assets/objs/common/planet.mdl" />
+	  <!-- 	source="${PROJECT_SOURCE_DIR}/assets/models/common/planet.mdl" /> -->
 	</dir> <!-- COMMON -->
-      </dir> <!-- OBJS -->
+      </dir> <!-- MODELS -->
 
       <dir name="MISC">
 	<file name="DISK.TIM"

src/screen_level.c

@@ -83,7 +83,7 @@ void
 screen_level_load()
 {
     screen_level_data *data = screen_alloc(sizeof(screen_level_data));
-    /* load_model(&data->ring, "\\OBJS\\COMMON\\RING.MDL"); */
+    /* load_model(&data->ring, "\\MODELS\\COMMON\\RING.MDL"); */
 
     /* data->ring.pos.vz = 0x12c0; */
     /* data->ring.rot.vx = 0x478; */

src/screen_modeltest.c

@@ -18,7 +18,7 @@ screen_modeltest_load()
     screen_modeltest_data *data = screen_alloc(sizeof(screen_modeltest_data));
 
     data->ring = screen_alloc(sizeof(Model));
-    load_model(data->ring, "\\OBJS\\COMMON\\RING.MDL");
+    load_model(data->ring, "\\MODELS\\COMMON\\RING.MDL");
     data->ring->pos.vz = 4800;
     data->ring->rot.vx = ONE >> 2;
 

src/screen_title.c

@@ -113,7 +113,7 @@ screen_title_load()
     data->prl_pos[0] = 32 << 12; // Island center
 
     // Planet model
-    /* load_model(&data->planet, "\\OBJS\\COMMON\\RING.MDL;1"); */
+    /* load_model(&data->planet, "\\MODELS\\COMMON\\RING.MDL;1"); */
     /* data->planet.rot.vx = 0x478; */
     /* data->planet.pos.vz = 4288; */
     /* data->planet.pos.vx = 2048; */