stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-15 14:11:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

use continue if NULL instead of a big if block if ...not NULL

Browse source 
also, SplitPoly returns if ps < 0, so there's no need to check for ps >= 0 afterwards
This commit is contained in:
Monster Iestyn 2018-12-14 18:00:08 +00:00
parent 3a125dbbd5
commit 4089b6b8e9
1 changed files with 72 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

144
src/hardware/hw_bsp.c
View file

@ -294,57 +294,57 @@ static void SplitPoly (fdivline_t *bsp, //splitting parametric line
// start & end points // start & end points
pv = fracdivline(bsp, &poly->pts[i], &poly->pts[j]); pv = fracdivline(bsp, &poly->pts[i], &poly->pts[j]);
if (pv) if (pv == NULL)
continue;
if (ps < 0)
{ {
if (ps < 0) // first point
ps = i;
vs = *pv;
fracs = bspfrac;
}
else
{
//the partition line traverse a junction between two segments
// or the two points are so close, they can be considered as one
// thus, don't accept, since split 2 must be another vertex
if (SameVertice(pv, &lastpv))
{ {
// first point if (pe < 0)
ps = i;
vs = *pv;
fracs = bspfrac;
}
else
{
//the partition line traverse a junction between two segments
// or the two points are so close, they can be considered as one
// thus, don't accept, since split 2 must be another vertex
if (SameVertice(pv, &lastpv))
{ {
if (pe < 0) ps = i;
{ psonline = 1;
ps = i;
psonline = 1;
}
else
{
pe = i;
peonline = 1;
}
} }
else else
{ {
if (pe < 0) pe = i;
{ peonline = 1;
pe = i; }
ve = *pv; }
frace = bspfrac; else
} {
else if (pe < 0)
{ {
// a frac, not same vertice as last one pe = i;
// we already got pt2 so pt 2 is not on the line, ve = *pv;
// so we probably got back to the start point frace = bspfrac;
// which is on the line }
if (SameVertice(pv, &vs)) else
psonline = 1; {
break; // a frac, not same vertice as last one
} // we already got pt2 so pt 2 is not on the line,
// so we probably got back to the start point
// which is on the line
if (SameVertice(pv, &vs))
psonline = 1;
break;
} }
} }
// remember last point intercept to detect identical points
lastpv = *pv;
} }
// remember last point intercept to detect identical points
lastpv = *pv;
} }
// no split: the partition line is either parallel and // no split: the partition line is either parallel and
@ -368,7 +368,7 @@ static void SplitPoly (fdivline_t *bsp, //splitting parametric line
return; return;
} }
if (ps >= 0 && pe < 0) if (pe < 0)
{ {
//I_Error("SplitPoly: only one point for split line (%d %d)", ps, pe); //I_Error("SplitPoly: only one point for split line (%d %d)", ps, pe);
*frontpoly = poly; *frontpoly = poly;
@ -482,42 +482,42 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 count, poly_t *poly)
pv = fracdivline(&cutseg, &poly->pts[i], &poly->pts[j]); pv = fracdivline(&cutseg, &poly->pts[i], &poly->pts[j]);
if (pv) if (pv == NULL)
continue;
if (ps < 0)
{ {
if (ps < 0) ps = i;
vs = *pv;
fracs = bspfrac;
}
else
{
//frac 1 on previous segment,
// 0 on the next,
//the split line goes through one of the convex poly
// vertices, happens quite often since the convex
// poly is already adjacent to the subsector segs
// on most borders
if (SameVertice(pv, &vs))
continue;
if (fracs <= bspfrac)
{ {
nump = 2 + poly->numpts - (i-ps);
pe = ps;
ps = i; ps = i;
vs = *pv; ve = *pv;
fracs = bspfrac;
} }
else else
{ {
//frac 1 on previous segment, nump = 2 + (i-ps);
// 0 on the next, pe = i;
//the split line goes through one of the convex poly ve = vs;
// vertices, happens quite often since the convex vs = *pv;
// poly is already adjacent to the subsector segs
// on most borders
if (SameVertice(pv, &vs))
continue;
if (fracs <= bspfrac)
{
nump = 2 + poly->numpts - (i-ps);
pe = ps;
ps = i;
ve = *pv;
}
else
{
nump = 2 + (i-ps);
pe = i;
ve = vs;
vs = *pv;
}
//found 2nd point
break;
} }
//found 2nd point
break;
} }
} }