quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use EXTERNAL_LIGHTMAP macro, shorten code

Browse Source
This commit is contained in:
Garux 2019-12-04 22:18:44 +03:00
parent 74a5d6cf8d
commit 661e8b00de
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/quake3/q3map2/convert_ase.c
View File

@ -315,7 +315,7 @@ static void ConvertLightmap( FILE *f, const char *base, int lightmapNum ){
fprintf( f, "\t\t\t*MAP_SUBNO\t1\r\n" );
fprintf( f, "\t\t\t*MAP_AMOUNT\t1.0\r\n" );
fprintf( f, "\t\t\t*MAP_TYPE\tScreen\r\n" );
fprintf( f, "\t\t\t*BITMAP\t\"%s\\lm_%04d.tga\"\r\n", base, lightmapNum );
fprintf( f, "\t\t\t*BITMAP\t\"%s\\" EXTERNAL_LIGHTMAP "\"\r\n", base, lightmapNum );
fprintf( f, "\t\t\t*BITMAP_FILTER\tPyramidal\r\n" );
fprintf( f, "\t\t}\r\n" );
}
@ -382,14 +382,11 @@ int ConvertBSPToASE( char *bspName ){
for ( ; ; lightmapCount++ )
{
char buf[1024];
FILE *tmp;
snprintf( buf, sizeof( buf ), "%s/lm_%04d.tga", dirname, lightmapCount );
snprintf( buf, sizeof( buf ), "%s/" EXTERNAL_LIGHTMAP, dirname, lightmapCount );
buf[sizeof( buf ) - 1] = 0;
tmp = fopen( buf, "rb" );
if ( !tmp ) {
if ( !FileExists( buf ) ) {
break;
}
fclose( tmp );
}
fprintf( f, "\t*MATERIAL_COUNT\t%d\r\n", lightmapCount );
for ( i = 0; i < lightmapCount; i++ )

11
tools/quake3/q3map2/convert_obj.c
View File

@ -198,9 +198,9 @@ static void ConvertLightmapToMTL( FILE *f, const char *base, int lightmapNum ){
fprintf( f, "newmtl lm_%04d\r\n", lightmapNum );
if ( lightmapNum >= 0 ) {
/* blender hates this, so let's not do it
fprintf( f, "map_Kd %s\\lm_%04d.tga\r\n", base, lightmapNum );
fprintf( f, "map_Kd %s\\" EXTERNAL_LIGHTMAP "\r\n", base, lightmapNum );
*/
fprintf( f, "map_Kd %s/lm_%04d.tga\r\n", base, lightmapNum );
fprintf( f, "map_Kd %s/" EXTERNAL_LIGHTMAP "\r\n", base, lightmapNum );
}
}
@ -263,14 +263,11 @@ int ConvertBSPToOBJ( char *bspName ){
for ( ; ; lightmapCount++ )
{
char buf[1024];
FILE *tmp;
snprintf( buf, sizeof( buf ), "%s/lm_%04d.tga", dirname, lightmapCount );
snprintf( buf, sizeof( buf ), "%s/" EXTERNAL_LIGHTMAP, dirname, lightmapCount );
buf[sizeof( buf ) - 1] = 0;
tmp = fopen( buf, "rb" );
if ( !tmp ) {
if ( !FileExists( buf ) ) {
break;
}
fclose( tmp );
}
lastLightmap = lightmapCount - 1;
}