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

remove -metaMaxBBoxDistance

Browse Source 
with current 'pre weld' strategy it's not optimization anymore, also wont work as option to merge non welded triangles with adjusted meta score
This commit is contained in:
Garux 2021-09-05 14:45:01 +03:00
parent 191d489d62
commit 43b5148447
4 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -838,16 +838,6 @@ int BSPMain( int argc, char **argv ){
Sys_Printf( "Setting GOOD meta score to %d (see surface_meta.c)\n", metaGoodScore ); Sys_Printf( "Setting GOOD meta score to %d (see surface_meta.c)\n", metaGoodScore );
} }
} }
else if ( striEqual( argv[ i ], "-metamaxbboxdistance" ) ) {
metaMaxBBoxDistance = atof( argv[ i + 1 ] );
if ( metaMaxBBoxDistance < 0 ) {
metaMaxBBoxDistance = -1;
}
i++;
if ( metaMaxBBoxDistance >= 0 ) {
Sys_Printf( "Setting meta maximum bounding box distance to %f\n", metaMaxBBoxDistance );
}
}
else if ( striEqual( argv[ i ], "-patchmeta" ) ) { else if ( striEqual( argv[ i ], "-patchmeta" ) ) {
Sys_Printf( "Creating meta surfaces from patches\n" ); Sys_Printf( "Creating meta surfaces from patches\n" );
patchMeta = true; patchMeta = true;

1
tools/quake3/q3map2/help.cpp
View File

@ -107,7 +107,6 @@ void HelpBsp()
{"-meta", "Combine adjacent triangles of the same texture to surfaces (ALWAYS USE THIS)"}, {"-meta", "Combine adjacent triangles of the same texture to surfaces (ALWAYS USE THIS)"},
{"-metaadequatescore <N>", "Adequate score for adding triangles to meta surfaces"}, {"-metaadequatescore <N>", "Adequate score for adding triangles to meta surfaces"},
{"-metagoodscore <N>", "Good score for adding triangles to meta surfaces"}, {"-metagoodscore <N>", "Good score for adding triangles to meta surfaces"},
{"-metamaxbboxdistance <F>", "Maximum bounding box distance for meta surfaces"},
{"-minsamplesize <N>", "Sets minimum lightmap resolution in luxels/qu"}, {"-minsamplesize <N>", "Sets minimum lightmap resolution in luxels/qu"},
{"-mi <N>", "Sets the maximum number of indexes per surface"}, {"-mi <N>", "Sets the maximum number of indexes per surface"},
{"-mv <N>", "Sets the maximum number of vertices of a lightmapped surface"}, {"-mv <N>", "Sets the maximum number of vertices of a lightmapped surface"},

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

@ -2018,7 +2018,6 @@ Q_EXTERN bool lightmapFill Q_ASSIGN( false );
Q_EXTERN bool lightmapPink Q_ASSIGN( false ); Q_EXTERN bool lightmapPink Q_ASSIGN( false );
Q_EXTERN int metaAdequateScore Q_ASSIGN( -1 ); Q_EXTERN int metaAdequateScore Q_ASSIGN( -1 );
Q_EXTERN int metaGoodScore Q_ASSIGN( -1 ); Q_EXTERN int metaGoodScore Q_ASSIGN( -1 );
Q_EXTERN float metaMaxBBoxDistance Q_ASSIGN( -1 );
Q_EXTERN bool noob Q_ASSIGN( false ); Q_EXTERN bool noob Q_ASSIGN( false );
#if Q3MAP2_EXPERIMENTAL_SNAP_NORMAL_FIX #if Q3MAP2_EXPERIMENTAL_SNAP_NORMAL_FIX

9
tools/quake3/q3map2/surface_meta.cpp
View File

@ -1382,15 +1382,6 @@ static int AddMetaTriangleToSurface( mapDrawSurface_t *ds, const metaTriangle_t&
} }
} }
if ( metaMaxBBoxDistance >= 0 && ds->numIndexes > 0 ) {
if( !ds->minmax.test( tri.m_vertices[ 0 ]->xyz, metaMaxBBoxDistance )
&& !ds->minmax.test( tri.m_vertices[ 1 ]->xyz, metaMaxBBoxDistance )
&& !ds->minmax.test( tri.m_vertices[ 2 ]->xyz, metaMaxBBoxDistance ) )
return 0;
}
/* set initial score */ /* set initial score */
score = tri.surfaceNum == ds->surfaceNum ? SURFACE_SCORE : 0; score = tri.surfaceNum == ds->surfaceNum ? SURFACE_SCORE : 0;