mbspc: make builtin, html help, command line options consistent

enable -grapplereach: bugged in vanilla engine, but is likely fixed in OpenArena
remove -onlyents doc: doesn't exist in the code (wtf)
This commit is contained in:
Garux 2020-02-29 02:05:38 +03:00
parent 097a662814
commit 5a032a991a
2 changed files with 31 additions and 35 deletions

View File

@ -39,9 +39,6 @@ with MBSPC:
<li> <li>
convert BSP files to editable MAP format convert BSP files to editable MAP format
</li> </li>
<li>
update the entity list in a BSP file
</li>
<li> <li>
extract the entity list from a BSP file to a text file (new) extract the entity list from a BSP file to a text file (new)
</li> </li>
@ -95,15 +92,15 @@ List of options recognized by MBSPC:
<tt> <tt>
option argument explanation output option argument explanation output
--------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------
entlist file.bsp extract entity list file.ent
onlyents file.bsp update entity list from file.ent(*) file.bsp
texinfo file.bsp extract texture list file.txi
bsp2map file.bsp create MAP from BSP file.map bsp2map file.bsp create MAP from BSP file.map
bsp2map220 file.bsp create Valve 220 MAP from BSP file.map bsp2map220 file.bsp create Valve 220 MAP from BSP file.map
bsp2aas file.bsp create AAS from BSP file.aas bsp2aas file.bsp create AAS from BSP file.aas
reach file.bsp compute reachability and clusters file.aas reach file.bsp compute reachability and clusters file.aas
cluster file.aas compute clusters file.aas cluster file.aas compute clusters file.aas
aasopt file.aas optimize aas file file.aas aasopt file.aas optimize aas file file.aas
aasinfo file.aas show AAS file info
entlist file.bsp extract entity list file.ent
texinfo file.bsp extract texture list file.txi
--------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------
output output-path set output path output output-path set output path
threads N set number of threads to N threads N set number of threads to N
@ -112,20 +109,16 @@ List of options recognized by MBSPC:
--------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------
optimize enable optimization optimize enable optimization
breadthfirst breadth first bsp building breadthfirst breadth first bsp building
capsule use spherical collision model
nobrushmerge don't merge brushes nobrushmerge don't merge brushes
freetree free the bsp tree freetree free the bsp tree
nocsg disables brush chopping nocsg disables brush chopping
noliquids don't write liquids to map noliquids don't write liquids to map
forcesidesvisible force all sides to be visible forcesidesvisible force all sides to be visible
grapplereach calculate grapple reachabilities
</tt> </tt>
</pre> </pre>
<p>
(*) The '.ent' file must exist! You can make one using the '-entlist'
option. The '.ent' file can be edited by using a text editor (e.g. you
may change entity types and coordinates) as long as the format of entity
specifications remains valid.
<p> <p>
Several metacharacter may be used in the paths of the input file: Several metacharacter may be used in the paths of the input file:
@ -158,8 +151,7 @@ with the name 'maps' outside the .pk3 file.
<p> <p>
If an AAS file is already available for a BSP file and you ONLY change If an AAS file is already available for a BSP file and you ONLY change
the entities inside this BSP file (using the map editor or MBSPC with the the entities inside this BSP file then you only have to recalculate the reachabilities.
'-onlyents' option) then you only have to recalculate the reachabilities.
This way you can move items, platforms etc. around without the need to This way you can move items, platforms etc. around without the need to
recalculate the whole AAS file which can save quite some compile time. recalculate the whole AAS file which can save quite some compile time.
You can recalculate the reachabilities as follows: You can recalculate the reachabilities as follows:

View File

@ -640,13 +640,11 @@ int main (int argc, char **argv)
freetree = true; freetree = true;
Log_Print("freetree = true\n"); Log_Print("freetree = true\n");
} //end else if } //end else if
#if 0
else if (!stricmp(argv[i], "-grapplereach")) else if (!stricmp(argv[i], "-grapplereach"))
{ {
calcgrapplereach = true; calcgrapplereach = true;
Log_Print("grapplereach = true\n"); Log_Print("grapplereach = true\n");
} //end else if } //end else if
#endif
else if (!stricmp(argv[i], "-nobrushmerge")) else if (!stricmp(argv[i], "-nobrushmerge"))
{ {
nobrushmerge = true; nobrushmerge = true;
@ -719,11 +717,13 @@ int main (int argc, char **argv)
comp = COMP_BSP2AAS; comp = COMP_BSP2AAS;
qfiles = GetArgumentFiles(argc, argv, &i, "bsp"); qfiles = GetArgumentFiles(argc, argv, &i, "bsp");
} //end else if } //end else if
#if 0 // is not functioning
else if (!stricmp(argv[i], "-aasall")) else if (!stricmp(argv[i], "-aasall"))
{ {
if (i + 1 >= argc) {i = 0; break;} if (i + 1 >= argc) {i = 0; break;}
CreateAASFilesForAllBSPFiles(argv[++i]); CreateAASFilesForAllBSPFiles(argv[++i]);
} //end else if } //end else if
#endif
else if (!stricmp(argv[i], "-reach")) else if (!stricmp(argv[i], "-reach"))
{ {
if (i + 1 >= argc) {i = 0; break;} if (i + 1 >= argc) {i = 0; break;}
@ -1063,25 +1063,29 @@ int main (int argc, char **argv)
#endif #endif
"\n" "\n"
"Switches:\n" "Switches:\n"
" bsp2map <[pakfilter/]filter.bsp> = convert BSP to MAP\n" " bsp2map <[pakfilter/]filter.bsp> = convert BSP to MAP\n"
//" aasall <quake3folder> = create AAS files for all BSPs\n" " bsp2map220 <[pakfilter/]filter.bsp> = convert BSP to Valve 220 MAP\n"
" bsp2aas <[pakfilter/]filter.bsp> = convert BSP to AAS\n" //" aasall <quake3folder> = create AAS files for all BSPs\n"
" reach <filter.bsp> = compute reachability & clusters\n" " bsp2aas <[pakfilter/]filter.bsp> = convert BSP to AAS\n"
" cluster <filter.aas> = compute clusters\n" " reach <filter.bsp> = compute reachability & clusters\n"
" aasopt <filter.aas> = optimize aas file\n" " cluster <filter.aas> = compute clusters\n"
" aasinfo <filter.aas> = show AAS file info\n" " aasopt <filter.aas> = optimize aas file\n"
" output <output path> = set output path\n" " aasinfo <filter.aas> = show AAS file info\n"
" threads <X> = set number of threads to X\n" " entlist <[pakfilter/]filter.bsp> = extract entity list\n"
" cfg <filename> = use this cfg file\n" " texinfo <[pakfilter/]filter.bsp> = extract texture list\n"
" optimize = enable optimization\n" " output <output path> = set output path\n"
" noverbose = disable verbose output\n" " threads <X> = set number of threads to X\n"
" breadthfirst = breadth first bsp building\n" " cfg <filename> = use this cfg file\n"
" nobrushmerge = don't merge brushes\n" " optimize = enable optimization\n"
" noliquids = don't write liquids to map\n" " noverbose = disable verbose output\n"
" freetree = free the bsp tree\n" " breadthfirst = breadth first bsp building\n"
" nocsg = disables brush chopping\n" " capsule = use spherical collision model\n"
" forcesidesvisible = force all sides to be visible\n" " nobrushmerge = don't merge brushes\n"
" grapplereach = calculate grapple reachabilities\n" " noliquids = don't write liquids to map\n"
" freetree = free the bsp tree\n"
" nocsg = disables brush chopping\n"
" forcesidesvisible = force all sides to be visible\n"
" grapplereach = calculate grapple reachabilities\n"
/* " glview = output a GL view\n" /* " glview = output a GL view\n"
" draw = enables drawing\n" " draw = enables drawing\n"