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

std::vector<int> bspLeafSurfaces

Browse Source
This commit is contained in:
Garux 2021-09-24 16:16:02 +03:00
parent b1f32e6faa
commit 6066fe2cc2
7 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/quake3/q3map2/bspfile_abstract.cpp
View File

@ -193,7 +193,7 @@ void SwapBSPFile( void ){
SwapBlock( bspLeafs ); SwapBlock( bspLeafs );
/* leaffaces */ /* leaffaces */
SwapBlock( (int*) bspLeafSurfaces, numBSPLeafSurfaces * sizeof( bspLeafSurfaces[ 0 ] ) ); SwapBlock( bspLeafSurfaces );
/* leafbrushes */ /* leafbrushes */
SwapBlock( (int*) bspLeafBrushes, numBSPLeafBrushes * sizeof( bspLeafBrushes[ 0 ] ) ); SwapBlock( (int*) bspLeafBrushes, numBSPLeafBrushes * sizeof( bspLeafBrushes[ 0 ] ) );
@ -482,8 +482,8 @@ void PrintBSPFileSizes( void ){
bspNodes.size(), bspNodes.size() * sizeof( bspNodes[0] ) ); bspNodes.size(), bspNodes.size() * sizeof( bspNodes[0] ) );
Sys_Printf( "%9zu leafs %9zu\n", Sys_Printf( "%9zu leafs %9zu\n",
bspLeafs.size(), bspLeafs.size() * sizeof( bspLeafs[0] ) ); bspLeafs.size(), bspLeafs.size() * sizeof( bspLeafs[0] ) );
Sys_Printf( "%9d leafsurfaces %9d\n", Sys_Printf( "%zu leafsurfaces %zu\n",
numBSPLeafSurfaces, (int) ( numBSPLeafSurfaces * sizeof( *bspLeafSurfaces ) ) ); bspLeafSurfaces.size(), bspLeafSurfaces.size() * sizeof( bspLeafSurfaces[0] ) );
Sys_Printf( "%9d leafbrushes %9d\n", Sys_Printf( "%9d leafbrushes %9d\n",
numBSPLeafBrushes, (int) ( numBSPLeafBrushes * sizeof( *bspLeafBrushes ) ) ); numBSPLeafBrushes, (int) ( numBSPLeafBrushes * sizeof( *bspLeafBrushes ) ) );
Sys_Printf( "\n" ); Sys_Printf( "\n" );

4
tools/quake3/q3map2/bspfile_ibsp.cpp
View File

@ -443,7 +443,7 @@ void LoadIBSPFile( const char *filename ){
CopyLump( (bspHeader_t*) header, LUMP_NODES, bspNodes ); CopyLump( (bspHeader_t*) header, LUMP_NODES, bspNodes );
numBSPLeafSurfaces = CopyLump_Allocate( (bspHeader_t*) header, LUMP_LEAFSURFACES, (void **) &bspLeafSurfaces, sizeof( bspLeafSurfaces[ 0 ] ), &allocatedBSPLeafSurfaces ); CopyLump( (bspHeader_t*) header, LUMP_LEAFSURFACES, bspLeafSurfaces );
numBSPLeafBrushes = CopyLump_Allocate( (bspHeader_t*) header, LUMP_LEAFBRUSHES, (void **) &bspLeafBrushes, sizeof( bspLeafBrushes[ 0 ] ), &allocatedBSPLeafBrushes ); numBSPLeafBrushes = CopyLump_Allocate( (bspHeader_t*) header, LUMP_LEAFBRUSHES, (void **) &bspLeafBrushes, sizeof( bspLeafBrushes[ 0 ] ), &allocatedBSPLeafBrushes );
@ -557,7 +557,7 @@ void WriteIBSPFile( const char *filename ){
AddLump( file, header->lumps[LUMP_NODES], bspNodes ); AddLump( file, header->lumps[LUMP_NODES], bspNodes );
AddLump( file, (bspHeader_t*) header, LUMP_BRUSHES, bspBrushes, numBSPBrushes * sizeof( bspBrush_t ) ); AddLump( file, (bspHeader_t*) header, LUMP_BRUSHES, bspBrushes, numBSPBrushes * sizeof( bspBrush_t ) );
AddBrushSidesLump( file, header ); AddBrushSidesLump( file, header );
AddLump( file, (bspHeader_t*) header, LUMP_LEAFSURFACES, bspLeafSurfaces, numBSPLeafSurfaces * sizeof( bspLeafSurfaces[ 0 ] ) ); AddLump( file, header->lumps[LUMP_LEAFSURFACES], bspLeafSurfaces );
AddLump( file, (bspHeader_t*) header, LUMP_LEAFBRUSHES, bspLeafBrushes, numBSPLeafBrushes * sizeof( bspLeafBrushes[ 0 ] ) ); AddLump( file, (bspHeader_t*) header, LUMP_LEAFBRUSHES, bspLeafBrushes, numBSPLeafBrushes * sizeof( bspLeafBrushes[ 0 ] ) );
AddLump( file, header->lumps[LUMP_MODELS], bspModels ); AddLump( file, header->lumps[LUMP_MODELS], bspModels );
AddDrawVertsLump( file, header ); AddDrawVertsLump( file, header );

4
tools/quake3/q3map2/bspfile_rbsp.cpp
View File

@ -234,7 +234,7 @@ void LoadRBSPFile( const char *filename ){
CopyLump( (bspHeader_t*) header, LUMP_NODES, bspNodes ); CopyLump( (bspHeader_t*) header, LUMP_NODES, bspNodes );
numBSPLeafSurfaces = CopyLump_Allocate( (bspHeader_t*) header, LUMP_LEAFSURFACES, (void **) &bspLeafSurfaces, sizeof( bspLeafSurfaces[ 0 ] ), &allocatedBSPLeafSurfaces ); CopyLump( (bspHeader_t*) header, LUMP_LEAFSURFACES, bspLeafSurfaces );
numBSPLeafBrushes = CopyLump_Allocate( (bspHeader_t*) header, LUMP_LEAFBRUSHES, (void **) &bspLeafBrushes, sizeof( bspLeafBrushes[ 0 ] ), &allocatedBSPLeafBrushes ); numBSPLeafBrushes = CopyLump_Allocate( (bspHeader_t*) header, LUMP_LEAFBRUSHES, (void **) &bspLeafBrushes, sizeof( bspLeafBrushes[ 0 ] ), &allocatedBSPLeafBrushes );
@ -310,7 +310,7 @@ void WriteRBSPFile( const char *filename ){
AddLump( file, header->lumps[LUMP_NODES], bspNodes ); AddLump( file, header->lumps[LUMP_NODES], bspNodes );
AddLump( file, (bspHeader_t*) header, LUMP_BRUSHES, bspBrushes, numBSPBrushes * sizeof( bspBrush_t ) ); AddLump( file, (bspHeader_t*) header, LUMP_BRUSHES, bspBrushes, numBSPBrushes * sizeof( bspBrush_t ) );
AddLump( file, (bspHeader_t*) header, LUMP_BRUSHSIDES, bspBrushSides, numBSPBrushSides * sizeof( bspBrushSides[ 0 ] ) ); AddLump( file, (bspHeader_t*) header, LUMP_BRUSHSIDES, bspBrushSides, numBSPBrushSides * sizeof( bspBrushSides[ 0 ] ) );
AddLump( file, (bspHeader_t*) header, LUMP_LEAFSURFACES, bspLeafSurfaces, numBSPLeafSurfaces * sizeof( bspLeafSurfaces[ 0 ] ) ); AddLump( file, header->lumps[LUMP_LEAFSURFACES], bspLeafSurfaces );
AddLump( file, (bspHeader_t*) header, LUMP_LEAFBRUSHES, bspLeafBrushes, numBSPLeafBrushes * sizeof( bspLeafBrushes[ 0 ] ) ); AddLump( file, (bspHeader_t*) header, LUMP_LEAFBRUSHES, bspLeafBrushes, numBSPLeafBrushes * sizeof( bspLeafBrushes[ 0 ] ) );
AddLump( file, header->lumps[LUMP_MODELS], bspModels ); AddLump( file, header->lumps[LUMP_MODELS], bspModels );
AddLump( file, (bspHeader_t*) header, LUMP_DRAWVERTS, bspDrawVerts, numBSPDrawVerts * sizeof( bspDrawVerts[ 0 ] ) ); AddLump( file, (bspHeader_t*) header, LUMP_DRAWVERTS, bspDrawVerts, numBSPDrawVerts * sizeof( bspDrawVerts[ 0 ] ) );

7
tools/quake3/q3map2/convert_json.cpp
View File

@ -221,7 +221,7 @@ static void write_json( const char *directory ){
} }
{ {
doc.RemoveAllMembers(); doc.RemoveAllMembers();
for_indexed( auto&& ls : Span( bspLeafSurfaces, numBSPLeafSurfaces ) ){ for_indexed( const auto& ls : bspLeafSurfaces ){
rapidjson::Value value( rapidjson::kObjectType ); rapidjson::Value value( rapidjson::kObjectType );
value.AddMember( "Num", ls, all ); value.AddMember( "Num", ls, all );
doc.AddMember( rapidjson::Value( StringOutputStream( 16 )( "LeafSurface#", i ).c_str(), all ), value, all ); doc.AddMember( rapidjson::Value( StringOutputStream( 16 )( "LeafSurface#", i ).c_str(), all ), value, all );
@ -434,13 +434,10 @@ static void read_json( const char *directory ){
} }
{ {
const auto doc = load_json( StringOutputStream( 256 )( directory, "LeafSurfaces.json" ) ); const auto doc = load_json( StringOutputStream( 256 )( directory, "LeafSurfaces.json" ) );
static std::vector<int> items;
for( auto&& obj : doc.GetObj() ){ for( auto&& obj : doc.GetObj() ){
auto&& item = items.emplace_back(); auto&& item = bspLeafSurfaces.emplace_back();
item = obj.value["Num"].GetInt(); item = obj.value["Num"].GetInt();
} }
bspLeafSurfaces = items.data();
numBSPLeafSurfaces = items.size();
} }
{ {
const auto doc = load_json( StringOutputStream( 256 )( directory, "LeafBrushes.json" ) ); const auto doc = load_json( StringOutputStream( 256 )( directory, "LeafBrushes.json" ) );

2
tools/quake3/q3map2/lightmaps_ydnar.cpp
View File

@ -947,7 +947,7 @@ void SetupSurfaceLightmaps( void ){
/* allocate a list of surface clusters */ /* allocate a list of surface clusters */
numSurfaceClusters = 0; numSurfaceClusters = 0;
maxSurfaceClusters = numBSPLeafSurfaces; maxSurfaceClusters = bspLeafSurfaces.size();
surfaceClusters = safe_calloc( maxSurfaceClusters * sizeof( *surfaceClusters ) ); surfaceClusters = safe_calloc( maxSurfaceClusters * sizeof( *surfaceClusters ) );
/* allocate a list for per-surface info */ /* allocate a list for per-surface info */

4
tools/quake3/q3map2/q3map2.h
View File

@ -2346,9 +2346,7 @@ Q_EXTERN std::vector<bspPlane_t> bspPlanes;
Q_EXTERN std::vector<bspNode_t> bspNodes; Q_EXTERN std::vector<bspNode_t> bspNodes;
Q_EXTERN int numBSPLeafSurfaces Q_ASSIGN( 0 ); Q_EXTERN std::vector<int> bspLeafSurfaces;
Q_EXTERN int allocatedBSPLeafSurfaces Q_ASSIGN( 0 );
Q_EXTERN int* bspLeafSurfaces Q_ASSIGN( NULL );
Q_EXTERN int numBSPLeafBrushes Q_ASSIGN( 0 ); Q_EXTERN int numBSPLeafBrushes Q_ASSIGN( 0 );
Q_EXTERN int allocatedBSPLeafBrushes Q_ASSIGN( 0 ); Q_EXTERN int allocatedBSPLeafBrushes Q_ASSIGN( 0 );

10
tools/quake3/q3map2/writebsp.cpp
View File

@ -153,15 +153,13 @@ void EmitLeaf( node_t *node ){
} }
/* add the drawSurfRef_t drawsurfs */ /* add the drawSurfRef_t drawsurfs */
leaf.firstBSPLeafSurface = numBSPLeafSurfaces; leaf.firstBSPLeafSurface = bspLeafSurfaces.size();
for ( const drawSurfRef_t *dsr = node->drawSurfReferences; dsr; dsr = dsr->nextRef ) for ( const drawSurfRef_t *dsr = node->drawSurfReferences; dsr; dsr = dsr->nextRef )
{ {
AUTOEXPAND_BY_REALLOC_BSP( LeafSurfaces, 1024 ); bspLeafSurfaces.push_back( dsr->outputNum );
bspLeafSurfaces[ numBSPLeafSurfaces ] = dsr->outputNum;
numBSPLeafSurfaces++;
} }
leaf.numBSPLeafSurfaces = numBSPLeafSurfaces - leaf.firstBSPLeafSurface; leaf.numBSPLeafSurfaces = bspLeafSurfaces.size() - leaf.firstBSPLeafSurface;
} }
@ -323,7 +321,7 @@ void BeginBSPFile( void ){
bspModels.clear(); bspModels.clear();
bspNodes.clear(); bspNodes.clear();
numBSPBrushSides = 0; numBSPBrushSides = 0;
numBSPLeafSurfaces = 0; bspLeafSurfaces.clear();
numBSPLeafBrushes = 0; numBSPLeafBrushes = 0;
/* leave leaf 0 as an error, because leafs are referenced as negative number nodes */ /* leave leaf 0 as an error, because leafs are referenced as negative number nodes */