ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2024-11-10 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Having just one SnapPlaneImproved() instead of both SnapPlaneImproved()

Browse source 
and SnapPlaneImprovedWithCenter(); SnapPlaneImproved() now takes a list of      
points instead of the precomputed center.

- In FindFloatPlane(), using EXPERIMENTAL_SNAP_PLANE_FIX code even if
USE_HASHING is off.


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/Rambetter-math-fix-experiments@402 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
rambetter 2011-01-01 19:48:17 +00:00
parent dee4545065
commit bf05f9350b
1 changed files with 18 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
tools/quake3/q3map2/map.c
View file

@ -291,37 +291,26 @@ void SnapPlane( vec3_t normal, vec_t *dist )
/* /*
SnapPlaneImproved() SnapPlaneImproved()
snaps a plane to normal/distance epsilons, improved code
*/
void SnapPlaneImproved(vec3_t normal, vec_t *dist)
{
vec_t distNearestInt;
SnapNormal(normal);
if (VectorIsOnAxis(normal))
{
// Only snap distance if the normal is an axis. Otherwise there
// is nothing "natural" about snapping the distance to an integer.
distNearestInt = Q_rint(*dist);
if (-distanceEpsilon < *dist - distNearestInt && *dist - distNearestInt < distanceEpsilon)
{
*dist = distNearestInt;
}
}
}
/*
SnapPlaneImprovedWithCenter()
snaps a plane to normal/distance epsilons, improved code uses center snaps a plane to normal/distance epsilons, improved code uses center
*/ */
void SnapPlaneImprovedWithCenter(vec3_t normal, vec_t *dist, const vec3_t center) void SnapPlaneImproved(vec3_t normal, vec_t *dist, int numPoints, vec3_t *points) // TODO: const const on points
{ {
int i;
vec3_t center;
vec_t distNearestInt; vec_t distNearestInt;
if (SnapNormal(normal)) if (SnapNormal(normal))
{ {
*dist = DotProduct(normal, center); if (numPoints > 0)
{
VectorClear(center);
for (i = 0; i < numPoints; i++)
{
VectorAdd(center, points[i], center);
}
for (i = 0; i < 3; i++) { center[i] = center[i] / numPoints; }
*dist = DotProduct(normal, center);
}
} }
if (VectorIsOnAxis(normal)) if (VectorIsOnAxis(normal))
@ -354,22 +343,7 @@ int FindFloatPlane( vec3_t normal, vec_t dist, int numPoints, vec3_t *points )
#if EXPERIMENTAL_SNAP_PLANE_FIX #if EXPERIMENTAL_SNAP_PLANE_FIX
vec3_t center; SnapPlaneImproved(normal, &dist, numPoints, points);
if (numPoints > 0)
{
VectorClear(center);
for (i = 0; i < numPoints; i++)
{
VectorAdd(center, points[i], center);
}
for (j = 0; j < 3; j++) { center[j] = center[j] / numPoints; }
SnapPlaneImprovedWithCenter(normal, &dist, center);
}
else
{
SnapPlaneImproved(normal, &dist);
}
#else #else
SnapPlane( normal, &dist ); SnapPlane( normal, &dist );
#endif #endif
@ -413,8 +387,11 @@ int FindFloatPlane( vec3_t normal, vec_t dist, int numPoints, vec3_t *points )
int i; int i;
plane_t *p; plane_t *p;
#if EXPERIMENTAL_SNAP_PLANE_FIX
SnapPlaneImproved(normal, &dist, numPoints, points);
#else
SnapPlane( normal, &dist ); SnapPlane( normal, &dist );
#endif
for( i = 0, p = mapplanes; i < nummapplanes; i++, p++ ) for( i = 0, p = mapplanes; i < nummapplanes; i++, p++ )
{ {
if( PlaneEqual( p, normal, dist ) ) if( PlaneEqual( p, normal, dist ) )