From 699b85f2fc6a16d5f3253237b8979ec59f6e2ef5 Mon Sep 17 00:00:00 2001 From: rpolzer Date: Mon, 27 Oct 2008 12:07:39 +0000 Subject: [PATCH] q3map2 -convert -format ase -shadersasbitmap option to write shader names in the *BITMAP, to make prefabs that one can easily import as misc_model git-svn-id: svn://svn.icculus.org/netradiant/trunk@120 61c419a2-8eb2-4b30-bcec-8cead039b335 --- tools/quake3/q3map2/convert_ase.c | 5 ++++- tools/quake3/q3map2/main.c | 2 ++ tools/quake3/q3map2/q3map2.h | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/quake3/q3map2/convert_ase.c b/tools/quake3/q3map2/convert_ase.c index 2be25a4..fab0ebe 100644 --- a/tools/quake3/q3map2/convert_ase.c +++ b/tools/quake3/q3map2/convert_ase.c @@ -271,7 +271,10 @@ static void ConvertShader( FILE *f, bspShader_t *shader, int shaderNum ) 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\"\r\n", filename ); + if(...) + fprintf( f, "\t\t\t*BITMAP\t\"..\\%s\"\r\n", filename ); + else + fprintf( f, "\t\t\t*BITMAP\t\"%s\"\r\n", shader->shader ); fprintf( f, "\t\t\t*BITMAP_FILTER\tPyramidal\r\n" ); fprintf( f, "\t\t}\r\n" ); diff --git a/tools/quake3/q3map2/main.c b/tools/quake3/q3map2/main.c index b9fb7d8..9e4f365 100644 --- a/tools/quake3/q3map2/main.c +++ b/tools/quake3/q3map2/main.c @@ -540,6 +540,8 @@ int ConvertBSPMain( int argc, char **argv ) i++; Sys_Printf( "Distance epsilon set to %f\n", distanceEpsilon ); } + else if( !strcmp( argv[ i ], "-shadersasbitmap" ) ) + shadersAsBitmap = qtrue; } /* clean up map name */ diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h index caf32df..f26caf2 100644 --- a/tools/quake3/q3map2/q3map2.h +++ b/tools/quake3/q3map2/q3map2.h @@ -2162,6 +2162,9 @@ Q_EXTERN qboolean exactPointToPolygon Q_ASSIGN( qtrue ); Q_EXTERN float formFactorValueScale Q_ASSIGN( 3.0f ); Q_EXTERN float linearScale Q_ASSIGN( 1.0f / 8000.0f ); +// for .ase conversion +Q_EXTERN qboolean shadersAsBitmap Q_ASSIGN( qfalse ); + Q_EXTERN light_t *lights; Q_EXTERN int numPointLights; Q_EXTERN int numSpotLights; @@ -2356,6 +2359,5 @@ Q_EXTERN bspFog_t bspFogs[ MAX_MAP_FOGS ]; Q_EXTERN int numBSPAds Q_ASSIGN( 0 ); Q_EXTERN bspAdvertisement_t bspAds[ MAX_MAP_ADVERTISEMENTS ]; - /* end marker */ #endif -- 2.39.2