Skip to content

Commit d020255

Browse files
committed
- fix MTL filename and texture paths
1 parent 5e3532a commit d020255

3 files changed

Lines changed: 20 additions & 18 deletions

File tree

DriverLevelTool/exporter/export_models.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,10 +346,12 @@ void SaveModelPagesMTL()
346346

347347
if (pMtlFile)
348348
{
349+
String justLevFilename = File::basename(g_levname_texdir, File::extension(g_levname_texdir));
350+
349351
for (int i = 0; i < g_levTextures.GetTPageCount(); i++)
350352
{
351353
fprintf(pMtlFile, "newmtl page_%d\r\n", i);
352-
fprintf(pMtlFile, "map_Kd ../../%s/PAGE_%d.tga\r\n", (char*)g_levname_texdir, i);
354+
fprintf(pMtlFile, "map_Kd ../../%s/PAGE_%d.tga\r\n", (char*)justLevFilename, i);
353355
}
354356

355357
fclose(pMtlFile);

DriverLevelTool/exporter/export_regions.cpp

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,9 +262,25 @@ void ExportRegions()
262262
}
263263
else
264264
{
265+
String justLevFilename = File::basename(g_levname, File::extension(g_levname));
266+
265267
// use file stream directly
266268
levelStream = &fileStream;
267-
levelStream->Print("mtllib %s_LEVELMODEL.mtl\r\n", (char*)g_levname);
269+
levelStream->Print("mtllib %s_LEVELMODEL.mtl\r\n", (char*)justLevFilename);
270+
271+
// create material file
272+
FILE* pMtlFile = fopen(String::fromPrintf("%s_LEVELMODEL.mtl", (char*)justLevFilename), "wb");
273+
274+
if (pMtlFile)
275+
{
276+
for (int i = 0; i < g_levTextures.GetTPageCount(); i++)
277+
{
278+
fprintf(pMtlFile, "newmtl page_%d\r\n", i);
279+
fprintf(pMtlFile, "map_Kd %s_textures/PAGE_%d.tga\r\n", (char*)justLevFilename, i);
280+
}
281+
282+
fclose(pMtlFile);
283+
}
268284
}
269285

270286
int lobj_first_v = 0;

DriverLevelTool/exporter/export_textures.cpp

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -288,22 +288,6 @@ void ExportAllTextures()
288288
{
289289
ExportTexturePage(g_levTextures.GetTPage(i));
290290
}
291-
292-
// create material file
293-
FILE* pMtlFile = fopen(String::fromPrintf("%s_LEVELMODEL.mtl", (char*)g_levname), "wb");
294-
295-
String justLevFilename = File::basename(g_levname);
296-
297-
if (pMtlFile)
298-
{
299-
for (int i = 0; i < g_levTextures.GetTPageCount(); i++)
300-
{
301-
fprintf(pMtlFile, "newmtl page_%d\r\n", i);
302-
fprintf(pMtlFile, "map_Kd %s_textures/PAGE_%d.tga\r\n", (char*)justLevFilename, i);
303-
}
304-
305-
fclose(pMtlFile);
306-
}
307291
}
308292

309293
//-------------------------------------------------------------

0 commit comments

Comments
 (0)