From 5a032a991acdb0fac129a446a23f1301beb1816e Mon Sep 17 00:00:00 2001 From: Garux Date: Sat, 29 Feb 2020 02:05:38 +0300 Subject: [PATCH] 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) --- tools/mbspc/mbspc.html | 20 ++++++----------- tools/mbspc/mbspc/bspc.c | 46 ++++++++++++++++++++++------------------ 2 files changed, 31 insertions(+), 35 deletions(-) diff --git a/tools/mbspc/mbspc.html b/tools/mbspc/mbspc.html index a2a9577e..c8b0df25 100644 --- a/tools/mbspc/mbspc.html +++ b/tools/mbspc/mbspc.html @@ -39,9 +39,6 @@ with MBSPC:
  • convert BSP files to editable MAP format
    • -
  • - update the entity list in a BSP file -
  • extract the entity list from a BSP file to a text file (new)
    • @@ -95,15 +92,15 @@ List of options recognized by MBSPC: 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 bsp2map220 file.bsp create Valve 220 MAP from BSP file.map bsp2aas file.bsp create AAS from BSP file.aas reach file.bsp compute reachability and clusters file.aas cluster file.aas compute clusters 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 threads N set number of threads to N @@ -112,20 +109,16 @@ List of options recognized by MBSPC: --------------------------------------------------------------------------------------- optimize enable optimization breadthfirst breadth first bsp building + capsule use spherical collision model nobrushmerge don't merge brushes freetree free the bsp tree nocsg disables brush chopping noliquids don't write liquids to map forcesidesvisible force all sides to be visible + grapplereach calculate grapple reachabilities -

    -(*) 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. -

    Several metacharacter may be used in the paths of the input file: @@ -158,8 +151,7 @@ with the name 'maps' outside the .pk3 file.

    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 -'-onlyents' option) then you only have to recalculate the reachabilities. +the entities inside this BSP file then you only have to recalculate the reachabilities. 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. You can recalculate the reachabilities as follows: diff --git a/tools/mbspc/mbspc/bspc.c b/tools/mbspc/mbspc/bspc.c index ee7b9ed1..d4fb1456 100644 --- a/tools/mbspc/mbspc/bspc.c +++ b/tools/mbspc/mbspc/bspc.c @@ -640,13 +640,11 @@ int main (int argc, char **argv) freetree = true; Log_Print("freetree = true\n"); } //end else if -#if 0 else if (!stricmp(argv[i], "-grapplereach")) { calcgrapplereach = true; Log_Print("grapplereach = true\n"); } //end else if -#endif else if (!stricmp(argv[i], "-nobrushmerge")) { nobrushmerge = true; @@ -719,11 +717,13 @@ int main (int argc, char **argv) comp = COMP_BSP2AAS; qfiles = GetArgumentFiles(argc, argv, &i, "bsp"); } //end else if +#if 0 // is not functioning else if (!stricmp(argv[i], "-aasall")) { if (i + 1 >= argc) {i = 0; break;} CreateAASFilesForAllBSPFiles(argv[++i]); } //end else if +#endif else if (!stricmp(argv[i], "-reach")) { if (i + 1 >= argc) {i = 0; break;} @@ -1063,25 +1063,29 @@ int main (int argc, char **argv) #endif "\n" "Switches:\n" - " bsp2map <[pakfilter/]filter.bsp> = convert BSP to MAP\n" - //" aasall = create AAS files for all BSPs\n" - " bsp2aas <[pakfilter/]filter.bsp> = convert BSP to AAS\n" - " reach = compute reachability & clusters\n" - " cluster = compute clusters\n" - " aasopt = optimize aas file\n" - " aasinfo = show AAS file info\n" - " output = set output path\n" - " threads = set number of threads to X\n" - " cfg = use this cfg file\n" - " optimize = enable optimization\n" - " noverbose = disable verbose output\n" - " breadthfirst = breadth first bsp building\n" - " nobrushmerge = don't merge brushes\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" + " bsp2map <[pakfilter/]filter.bsp> = convert BSP to MAP\n" + " bsp2map220 <[pakfilter/]filter.bsp> = convert BSP to Valve 220 MAP\n" + //" aasall = create AAS files for all BSPs\n" + " bsp2aas <[pakfilter/]filter.bsp> = convert BSP to AAS\n" + " reach = compute reachability & clusters\n" + " cluster = compute clusters\n" + " aasopt = optimize aas file\n" + " aasinfo = show AAS file info\n" + " entlist <[pakfilter/]filter.bsp> = extract entity list\n" + " texinfo <[pakfilter/]filter.bsp> = extract texture list\n" + " output = set output path\n" + " threads = set number of threads to X\n" + " cfg = use this cfg file\n" + " optimize = enable optimization\n" + " noverbose = disable verbose output\n" + " breadthfirst = breadth first bsp building\n" + " capsule = use spherical collision model\n" + " nobrushmerge = don't merge brushes\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" " draw = enables drawing\n"