diff --git a/tools/quake3/q3map2/bsp.cpp b/tools/quake3/q3map2/bsp.cpp index e4626df4..17d14f37 100644 --- a/tools/quake3/q3map2/bsp.cpp +++ b/tools/quake3/q3map2/bsp.cpp @@ -838,16 +838,6 @@ int BSPMain( int argc, char **argv ){ 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" ) ) { Sys_Printf( "Creating meta surfaces from patches\n" ); patchMeta = true; diff --git a/tools/quake3/q3map2/help.cpp b/tools/quake3/q3map2/help.cpp index 0e5844a5..08f5d544 100644 --- a/tools/quake3/q3map2/help.cpp +++ b/tools/quake3/q3map2/help.cpp @@ -107,7 +107,6 @@ void HelpBsp() {"-meta", "Combine adjacent triangles of the same texture to surfaces (ALWAYS USE THIS)"}, {"-metaadequatescore ", "Adequate score for adding triangles to meta surfaces"}, {"-metagoodscore ", "Good score for adding triangles to meta surfaces"}, - {"-metamaxbboxdistance ", "Maximum bounding box distance for meta surfaces"}, {"-minsamplesize ", "Sets minimum lightmap resolution in luxels/qu"}, {"-mi ", "Sets the maximum number of indexes per surface"}, {"-mv ", "Sets the maximum number of vertices of a lightmapped surface"}, diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h index f452e2e0..ee70f226 100644 --- a/tools/quake3/q3map2/q3map2.h +++ b/tools/quake3/q3map2/q3map2.h @@ -2018,7 +2018,6 @@ Q_EXTERN bool lightmapFill Q_ASSIGN( false ); Q_EXTERN bool lightmapPink Q_ASSIGN( false ); Q_EXTERN int metaAdequateScore Q_ASSIGN( -1 ); Q_EXTERN int metaGoodScore Q_ASSIGN( -1 ); -Q_EXTERN float metaMaxBBoxDistance Q_ASSIGN( -1 ); Q_EXTERN bool noob Q_ASSIGN( false ); #if Q3MAP2_EXPERIMENTAL_SNAP_NORMAL_FIX diff --git a/tools/quake3/q3map2/surface_meta.cpp b/tools/quake3/q3map2/surface_meta.cpp index d0f17522..e85c6f28 100644 --- a/tools/quake3/q3map2/surface_meta.cpp +++ b/tools/quake3/q3map2/surface_meta.cpp @@ -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 */ score = tri.surfaceNum == ds->surfaceNum ? SURFACE_SCORE : 0;