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

possibly speed up MergeMetaTriangles, will benchmark it later

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@385 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent 2009-07-12 17:54:07 +00:00
parent 12a8e70662
commit 2b7668ee33
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tools/quake3/q3map2/surface_meta.c
View File

@ -1226,14 +1226,15 @@ returns the score of the triangle added
#define ST_SCORE2 (2 * (ST_SCORE)) #define ST_SCORE2 (2 * (ST_SCORE))
#define ADEQUATE_SCORE ((AXIS_MIN) + 1 * (VERT_SCORE)) #define ADEQUATE_SCORE ((AXIS_MIN) + 1 * (VERT_SCORE))
#define GOOD_SCORE ((AXIS_MIN) + 2 * (VERT_SCORE) + 4 * (ST_SCORE)) #define GOOD_SCORE ((AXIS_MIN) + 2 * (VERT_SCORE) + 4 * (ST_SCORE))
#define PERFECT_SCORE ((AXIS_MIN) + + 3 * (VERT_SCORE) + (SURFACE_SCORE) + 4 * (ST_SCORE)) #define PERFECT_SCORE ((AXIS_MIN) + 3 * (VERT_SCORE) + (SURFACE_SCORE) + 4 * (ST_SCORE))
#define MAX_BBOX_DISTANCE 16
static int AddMetaTriangleToSurface( mapDrawSurface_t *ds, metaTriangle_t *tri, qboolean testAdd ) static int AddMetaTriangleToSurface( mapDrawSurface_t *ds, metaTriangle_t *tri, qboolean testAdd )
{ {
int i, score, coincident, ai, bi, ci, oldTexRange[ 2 ]; int i, score, coincident, ai, bi, ci, oldTexRange[ 2 ];
float lmMax; float lmMax;
vec3_t mins, maxs; vec3_t mins, maxs, p;
qboolean inTexRange, es, et; qboolean inTexRange, es, et;
mapDrawSurface_t old; mapDrawSurface_t old;
@ -1264,6 +1265,32 @@ static int AddMetaTriangleToSurface( mapDrawSurface_t *ds, metaTriangle_t *tri,
if( tri->planeNum >= 0 && tri->planeNum != ds->planeNum ) if( tri->planeNum >= 0 && tri->planeNum != ds->planeNum )
return 0; return 0;
} }
#if MAX_BBOX_DISTANCE > 0
VectorCopy( mins, ds->mins );
VectorCopy( maxs, ds->maxs );
mins[0] -= MAX_BBOX_DISTANCE;
mins[1] -= MAX_BBOX_DISTANCE;
mins[2] -= MAX_BBOX_DISTANCE;
maxs[0] += MAX_BBOX_DISTANCE;
maxs[1] += MAX_BBOX_DISTANCE;
maxs[2] += MAX_BBOX_DISTANCE;
#define CHECK_1D(mins, v, maxs) ((mins) <= (v) && (v) <= (maxs))
#define CHECK_3D(mins, v, maxs) (CHECK_1D((mins)[0], (v)[0], (maxs)[0]) && CHECK_1D((mins)[1], (v)[1], (maxs)[1]) && CHECK_1D((mins)[2], (v)[2], (maxs)[2]))
VectorCopy(p, metaVerts[ tri->indexes[ 0 ] ].xyz);
if(!CHECK_3D(mins, p, maxs))
{
VectorCopy(p, metaVerts[ tri->indexes[ 1 ] ].xyz);
if(!CHECK_3D(mins, p, maxs))
{
VectorCopy(p, metaVerts[ tri->indexes[ 2 ] ].xyz);
if(!CHECK_3D(mins, p, maxs))
return 0;
}
}
#undef CHECK_3D
#undef CHECK_1D
#endif
/* set initial score */ /* set initial score */
score = tri->surfaceNum == ds->surfaceNum ? SURFACE_SCORE : 0; score = tri->surfaceNum == ds->surfaceNum ? SURFACE_SCORE : 0;