ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2025-01-25 02:41:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

netradiant/tools: ::zerowing-base=422

Browse source 
former commit name: ::zerowing-base=422
This commit is contained in:
Rudolf Polzer 2011-01-11 14:39:55 +01:00 committed by Thomas Debesse
parent b388770c65
commit 06701fab69
1 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -247,13 +247,7 @@ void SnapPlane( vec3_t normal, vec_t *dist, vec3_t center ){
SnapPlane reenabled by namespace because of multiple reports of SnapPlane reenabled by namespace because of multiple reports of
q3map2-crashes which were triggered by this patch. q3map2-crashes which were triggered by this patch.
*/ */
// div0: ensure the point "center" stays on the plane (actually, this
// rotates the plane around the point center).
// if center lies on the plane, it is guaranteed to stay on the plane by
// this fix.
vec_t centerDist = DotProduct( normal, center );
SnapNormal( normal ); SnapNormal( normal );
*dist += ( DotProduct( normal, center ) - centerDist );
// TODO: Rambetter has some serious comments here as well. First off, // TODO: Rambetter has some serious comments here as well. First off,
// in the case where a normal is non-axial, there is nothing special // in the case where a normal is non-axial, there is nothing special
@ -329,16 +323,11 @@ int FindFloatPlane( vec3_t normal, vec_t dist, int numPoints, vec3_t *points ) /
int i, j, hash, h; int i, j, hash, h;
plane_t *p; plane_t *p;
vec_t d; vec_t d;
vec3_t centerofweight;
VectorClear( centerofweight );
for ( i = 0; i < numPoints; ++i )
VectorMA( centerofweight, 1.0 / numPoints, points[i], centerofweight );
#if Q3MAP2_EXPERIMENTAL_SNAP_PLANE_FIX #if Q3MAP2_EXPERIMENTAL_SNAP_PLANE_FIX
SnapPlaneImproved( normal, &dist, numPoints, (const vec3_t *) points ); SnapPlaneImproved( normal, &dist, numPoints, (const vec3_t *) points );
#else #else
SnapPlane( normal, &dist, centerofweight ); SnapPlane( normal, &dist );
#endif #endif
/* hash the plane */ /* hash the plane */
hash = ( PLANE_HASHES - 1 ) & (int) fabs( dist ); hash = ( PLANE_HASHES - 1 ) & (int) fabs( dist );
@ -392,13 +381,7 @@ int FindFloatPlane( vec3_t normal, vec_t dist, int numPoints, vec3_t *points ) /
#if Q3MAP2_EXPERIMENTAL_SNAP_PLANE_FIX #if Q3MAP2_EXPERIMENTAL_SNAP_PLANE_FIX
SnapPlaneImproved( normal, &dist, numPoints, (const vec3_t *) points ); SnapPlaneImproved( normal, &dist, numPoints, (const vec3_t *) points );
#else #else
vec3_t centerofweight; SnapPlane( normal, &dist );
VectorClear( centerofweight );
for ( i = 0; i < numPoints; ++i )
VectorMA( centerofweight, 1.0 / numPoints, points[i], centerofweight );
SnapPlane( normal, &dist, centerofweight );
#endif #endif
for ( i = 0, p = mapplanes; i < nummapplanes; i++, p++ ) for ( i = 0, p = mapplanes; i < nummapplanes; i++, p++ )
{ {