remove -tmpin & -tmpout switches, as at best they were prepending tmp/ to absolute path

This commit is contained in:
Garux 2021-01-20 12:48:10 +03:00
parent 3b39a5754d
commit fe5c0879b4
5 changed files with 2 additions and 21 deletions

View File

@ -157,7 +157,6 @@ td.formatted_questions ol { margin-top: 0px; margin-bottom: 0px; }
<li><strong><code>-snap</code> N:</strong> Snap brush bevel planes to the given number of units</li>
<li><strong><code>-tempname</code> filename.map:</strong> Read the MAP file from the given file name</li>
<li><strong><code>-texrange</code> N:</strong> Limit per-surface texture range to the given number of units, and subdivide surfaces like with <code>q3map_tessSize</code> if this is not met</li>
<li><strong><code>-tmpout</code>:</strong> Write the BSP file to /tmp</li>
<li><strong><code>-verboseentities</code>:</strong> Enable <code>-v</code> only for map entities, not for the world</li>
</ul>
@ -174,8 +173,6 @@ td.formatted_questions ol { margin-top: 0px; margin-bottom: 0px; }
<li><strong><code>-nosort</code>:</strong> Do not sort the portals before calculating vis (usually slower)</li>
<li><strong><code>-passageOnly</code>:</strong> Just use PassageFlow vis (usually less fps)</li>
<li><strong><code>-saveprt</code>:</strong> Keep the PRT file after running vis (so you can run vis again)</li>
<li><strong><code>-tmpin</code>:</strong> Use /tmp folder for input</li>
<li><strong><code>-tmpout</code>:</strong> Use /tmp folder for output</li>
</ul>

View File

@ -738,9 +738,6 @@ int BSPMain( int argc, char **argv ){
else if ( strEqual( argv[ i ], "-tempname" ) ) {
strcpy( tempSource, argv[ ++i ] );
}
else if ( strEqual( argv[ i ], "-tmpout" ) ) {
strcpy( outbase, "/tmp" );
}
else if ( strEqual( argv[ i ], "-nowater" ) ) {
Sys_Printf( "Disabling water\n" );
nowater = true;

View File

@ -136,7 +136,6 @@ void HelpBsp()
{"-sRGBtex", "Treat textures as sRGB colorspace"},
{"-tempname <filename.map>", "Read the MAP file from the given file name"},
{"-texrange <N>", "Limit per-surface texture range to the given number of units, and subdivide surfaces like with `q3map_tessSize` if this is not met"},
{"-tmpout", "Write the BSP file to /tmp"},
{"-verboseentities", "Enable `-v` only for map entities, not for the world"},
};
HelpOptions("BSP Stage", 0, 80, bsp, sizeof(bsp)/sizeof(struct HelpOption));
@ -154,8 +153,6 @@ void HelpVis()
{"-passageOnly", "Just use PassageFlow vis (usually less fps)"},
{"-prtfile <filename.prt>", "Portal file to read"},
{"-saveprt", "Keep the Portal file after running vis (so you can run vis again)"},
{"-tmpin", "Use /tmp folder for input"},
{"-tmpout", "Use /tmp folder for output"},
{"-v -v", "Extra verbose mode for cluster debug"}, // q3map2 common takes first -v
};
HelpOptions("VIS Stage", 0, 80, vis, sizeof(vis)/sizeof(struct HelpOption));

View File

@ -2124,7 +2124,6 @@ Q_EXTERN char EnginePath[ 1024 ];
Q_EXTERN char name[ 1024 ];
Q_EXTERN char source[ 1024 ];
Q_EXTERN char outbase[ 32 ];
Q_EXTERN int sampleSize Q_ASSIGN( DEFAULT_LIGHTMAP_SAMPLE_SIZE ); /* lightmap sample size in units */
Q_EXTERN int minSampleSize Q_ASSIGN( DEFAULT_LIGHTMAP_MIN_SAMPLE_SIZE ); /* minimum sample size to use at all */
@ -2209,7 +2208,6 @@ Q_EXTERN bool mergevisportals;
Q_EXTERN bool nosort;
Q_EXTERN bool saveprt;
Q_EXTERN bool hint; /* ydnar */
Q_EXTERN char inbase[ MAX_QPATH ];
Q_EXTERN String64 globalCelShader;
Q_EXTERN float farPlaneDist Q_ASSIGN( 0.0f ); /* rr2do2, rf, mre, ydnar all contributed to this one... */

View File

@ -1123,14 +1123,6 @@ int VisMain( int argc, char **argv ){
debugCluster = true;
Sys_Printf( "Extra verbose mode enabled\n" );
}
else if ( strEqual( argv[i], "-tmpin" ) ) {
strcpy( inbase, "/tmp" );
}
else if ( strEqual( argv[i], "-tmpout" ) ) {
strcpy( outbase, "/tmp" );
}
/* ydnar: -hint to merge all but hint portals */
else if ( strEqual( argv[ i ], "-hint" ) ) {
Sys_Printf( "hint = true\n" );
@ -1150,13 +1142,13 @@ int VisMain( int argc, char **argv ){
/* load the bsp */
sprintf( source, "%s%s", inbase, ExpandArg( argv[ i ] ) );
strcpy( source, ExpandArg( argv[ i ] ) );
path_set_extension( source, ".bsp" );
Sys_Printf( "Loading %s\n", source );
LoadBSPFile( source );
/* load the portal file */
sprintf( portalfile, "%s%s", inbase, ExpandArg( argv[ i ] ) );
strcpy( portalfile, ExpandArg( argv[ i ] ) );
path_set_extension( portalfile, ".prt" );
Sys_Printf( "Loading %s\n", portalfile );
LoadPortals( portalfile );