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

remove NearVertice (which was unused anyway), clean up maz's changes

Browse source
This commit is contained in:
Monster Iestyn 2018-12-14 23:28:07 +00:00
parent de96fe8e7b
commit e0079ea1a2
1 changed files with 4 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/hardware/hw_bsp.c
View file

@ -217,29 +217,6 @@ static polyvertex_t *fracdivline(fdivline_t *bsp, polyvertex_t *v1,
return &pt; return &pt;
} }
#if 0
//Hurdler: it's not used anymore
static boolean NearVertice (polyvertex_t *p1, polyvertex_t *p2)
{
#if 1
float diff;
diff = p2->x - p1->x;
if (diff < -1.5f || diff > 1.5f)
return false;
diff = p2->y - p1->y;
if (diff < -1.5f || diff > 1.5f)
return false;
#else
if (p1->x != p2->x)
return false;
if (p1->y != p2->y)
return false;
#endif
// p1 and p2 are considered the same vertex
return true;
}
#endif
// if two vertice coords have a x and/or y difference // if two vertice coords have a x and/or y difference
// of less or equal than 1 FRACUNIT, they are considered the same // of less or equal than 1 FRACUNIT, they are considered the same
// point. Note: hardcoded value, 1.0f could be anything else. // point. Note: hardcoded value, 1.0f could be anything else.
@ -253,8 +230,7 @@ static boolean SameVertice (polyvertex_t *p1, polyvertex_t *p2)
diff = p2->y - p1->y; diff = p2->y - p1->y;
if (diff < -1.5f || diff > 1.5f) if (diff < -1.5f || diff > 1.5f)
return false; return false;
#else #elif 0
#if 0
if (p1->x != p2->x) if (p1->x != p2->x)
return false; return false;
if (p1->y != p2->y) if (p1->y != p2->y)
@ -263,12 +239,9 @@ static boolean SameVertice (polyvertex_t *p1, polyvertex_t *p2)
#define DIVLINE_VERTEX_DIFF 0.45f #define DIVLINE_VERTEX_DIFF 0.45f
float ep = DIVLINE_VERTEX_DIFF; float ep = DIVLINE_VERTEX_DIFF;
if (fabsf( p2->x - p1->x ) > ep ) if (fabsf( p2->x - p1->x ) > ep )
return false; return false;
if (fabsf( p2->y - p1->y ) > ep ) if (fabsf( p2->y - p1->y ) > ep )
return false; return false;
// p1 and p2 are considered the same vertex
return true;
#endif
#endif #endif
// p1 and p2 are considered the same vertex // p1 and p2 are considered the same vertex
return true; return true;