ioquake
/
gtkradiant
mirror of https://github.com/TTimo/GtkRadiant.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

In Rambetter-math-fix-experiments branch. 

Fixing winding_logging.patch with some new code structure.


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/Rambetter-math-fix-experiments@385 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
rambetter 2010-12-30 12:02:41 +00:00
parent f32b2b3712
commit 0fc962a240
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
regression_tests/q3map2/disappearing_sliver/winding_logging.patch
View File

@ -1,18 +1,17 @@
Index: tools/quake3/q3map2/brush.c Index: tools/quake3/q3map2/brush.c
=================================================================== ===================================================================
--- tools/quake3/q3map2/brush.c (revision 371) --- tools/quake3/q3map2/brush.c (revision 384)
+++ tools/quake3/q3map2/brush.c (working copy) +++ tools/quake3/q3map2/brush.c (working copy)
@@ -356,17 +356,29 @@ @@ -422,10 +422,16 @@
winding_t *w;
side_t *side; side_t *side;
plane_t *plane; plane_t *plane;
+
-
+ static int brushord = -1; + static int brushord = -1;
+ brushord++; + brushord++;
+ +
+ Sys_Printf("In CreateBrushWindings() for brush %i\n", brushord); + Sys_Printf("In CreateBrushWindings() for brush %i\n", brushord);
+
-
/* walk the list of brush sides */ /* walk the list of brush sides */
for( i = 0; i < brush->numsides; i++ ) for( i = 0; i < brush->numsides; i++ )
{ {
@ -21,33 +20,38 @@ Index: tools/quake3/q3map2/brush.c
/* get side and plane */ /* get side and plane */
side = &brush->sides[ i ]; side = &brush->sides[ i ];
plane = &mapplanes[ side->planenum ]; plane = &mapplanes[ side->planenum ];
@@ -436,7 +442,13 @@
/* make huge winding */ #else
w = BaseWindingForPlane( plane->normal, plane->dist ); w = BaseWindingForPlane( plane->normal, plane->dist );
#endif
-
+ +
+ Sys_Printf(" Before clipping we have:\n"); + Sys_Printf(" Before clipping we have:\n");
+ int z; + int z;
+ for (z = 0; z < w->numpoints; z++) { + for (z = 0; z < w->numpoints; z++) {
+ Sys_Printf(" (%.8f %.8f %.8f)\n", w->p[z][0], w->p[z][1], w->p[z][2]); + Sys_Printf(" (%.8f %.8f %.8f)\n", w->p[z][0], w->p[z][1], w->p[z][2]);
+ } + }
+
/* walk the list of brush sides */ /* walk the list of brush sides */
for( j = 0; j < brush->numsides && w != NULL; j++ ) for( j = 0; j < brush->numsides && w != NULL; j++ )
@@ -379,6 +391,11 @@ {
continue; @@ -452,7 +464,12 @@
plane = &mapplanes[ brush->sides[ j ].planenum ^ 1 ]; #else
ChopWindingInPlace( &w, plane->normal, plane->dist, 0 ); // CLIP_EPSILON ); ChopWindingInPlace( &w, plane->normal, plane->dist, 0 ); // CLIP_EPSILON );
#endif
-
+ +
+ Sys_Printf(" After clipping w/ side %i we have:\n", j); + Sys_Printf(" After clipping w/ side %i we have:\n", j);
+ for (z = 0; z < w->numpoints; z++) { + for (z = 0; z < w->numpoints; z++) {
+ Sys_Printf(" (%.8f %.8f %.8f)\n", w->p[z][0], w->p[z][1], w->p[z][2]); + Sys_Printf(" (%.8f %.8f %.8f)\n", w->p[z][0], w->p[z][1], w->p[z][2]);
+ } + }
+
/* ydnar: fix broken windings that would generate trifans */ /* ydnar: fix broken windings that would generate trifans */
FixWinding( w ); #ifdef EXPERIMENTAL_HIGH_PRECISION_MATH_Q3MAP2_FIXES
FixWindingAccu(w);
Index: tools/quake3/q3map2/map.c Index: tools/quake3/q3map2/map.c
=================================================================== ===================================================================
--- tools/quake3/q3map2/map.c (revision 371) --- tools/quake3/q3map2/map.c (revision 384)
+++ tools/quake3/q3map2/map.c (working copy) +++ tools/quake3/q3map2/map.c (working copy)
@@ -803,7 +803,11 @@ @@ -803,7 +803,11 @@
char shader[ MAX_QPATH ]; char shader[ MAX_QPATH ];