olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qbsp: refactor PlaneInvEqual

This commit is contained in:
Eric Wasylishen 2017-06-20 13:07:17 -06:00
parent 73ffb37417
commit 85a6b9095d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/qbsp/brush.hh
View File

@ -42,7 +42,7 @@ brush_t *LoadBrush(const mapbrush_t *mapbrush, const vec3_t rotate_offset, const
void FreeBrushes(brush_t *brushlist); void FreeBrushes(brush_t *brushlist);
int FindPlane(const qbsp_plane_t *plane, int *side); int FindPlane(const qbsp_plane_t *plane, int *side);
int PlaneEqual(const qbsp_plane_t *p1, const qbsp_plane_t *p2); bool PlaneEqual(const qbsp_plane_t *p1, const qbsp_plane_t *p2);
int PlaneInvEqual(const qbsp_plane_t *p1, const qbsp_plane_t *p2); bool PlaneInvEqual(const qbsp_plane_t *p1, const qbsp_plane_t *p2);
#endif #endif

12
qbsp/brush.cc
View File

@ -185,7 +185,7 @@ NormalizePlane(qbsp_plane_t *p)
} }
int bool
PlaneEqual(const qbsp_plane_t *p1, const qbsp_plane_t *p2) PlaneEqual(const qbsp_plane_t *p1, const qbsp_plane_t *p2)
{ {
return (fabs(p1->normal[0] - p2->normal[0]) < NORMAL_EPSILON && return (fabs(p1->normal[0] - p2->normal[0]) < NORMAL_EPSILON &&
@ -194,13 +194,13 @@ PlaneEqual(const qbsp_plane_t *p1, const qbsp_plane_t *p2)
fabs(p1->dist - p2->dist) < DIST_EPSILON); fabs(p1->dist - p2->dist) < DIST_EPSILON);
} }
int bool
PlaneInvEqual(const qbsp_plane_t *p1, const qbsp_plane_t *p2) PlaneInvEqual(const qbsp_plane_t *p1, const qbsp_plane_t *p2)
{ {
return (fabs(p1->normal[0] + p2->normal[0]) < NORMAL_EPSILON && qbsp_plane_t temp = {0};
fabs(p1->normal[1] + p2->normal[1]) < NORMAL_EPSILON && VectorScale(p1->normal, -1.0, temp.normal);
fabs(p1->normal[2] + p2->normal[2]) < NORMAL_EPSILON && temp.dist = -p1->dist;
fabs(p1->dist + p2->dist) < DIST_EPSILON); return PlaneEqual(&temp, p2);
} }
/* Plane Hashing */ /* Plane Hashing */