vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

sync with upstream

master
Marius Kintel 2015-01-13 16:52:23 -05:00
parent 0b1925a417
commit b0c822988b
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libtess2/Source/sweep.c
View File

@ -1121,10 +1121,10 @@ static void InitEdgeDict( TESStesselator *tess )
w = (tess->bmax[0] - tess->bmin[0]);
h = (tess->bmax[1] - tess->bmin[1]);
smin = tess->bmin[0] - w;
smax = tess->bmax[0] + w;
tmin = tess->bmin[1] - h;
tmax = tess->bmax[1] + h;
smin = tess->bmin[0] - w - 0.01;
smax = tess->bmax[0] + w + 0.01;
tmin = tess->bmin[1] - h - 0.01;
tmax = tess->bmax[1] + h + 0.01;
AddSentinel( tess, smin, smax, tmin );
AddSentinel( tess, smin, smax, tmax );

11
src/libtess2/Source/tess.c
View File

@ -70,6 +70,15 @@ static int LongAxis( TESSreal v[3] )
return i;
}
static int ShortAxis( TESSreal v[3] )
{
int i = 0;
if( ABS(v[1]) < ABS(v[0]) ) { i = 1; }
if( ABS(v[2]) < ABS(v[i]) ) { i = 2; }
return i;
}
static void ComputeNormal( TESStesselator *tess, TESSreal norm[3] )
{
TESSvertex *v, *v1, *v2;
@ -136,7 +145,7 @@ static void ComputeNormal( TESStesselator *tess, TESSreal norm[3] )
if( maxLen2 <= 0 ) {
/* All points lie on a single line -- any decent normal will do */
norm[0] = norm[1] = norm[2] = 0;
norm[LongAxis(d1)] = 1;
norm[ShortAxis(d1)] = 1;
}
}