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

qbsp: fix coordinates in degenerate edge error in tjunc.c 

The error message was actually displaying the edge vector, which is
always going to be ~(0,0,0).  Pass in the edge end points and then we
can display both the length of the edge and the location of one end
point.

Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
This commit is contained in:
Kevin Shanahan 2014-05-06 20:30:15 +09:30
parent 191bc63267
commit 90aa616866
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qbsp/tjunc.c
View File

@ -79,9 +79,12 @@ HashVec(vec3_t vec)
//============================================================================
static void
CanonicalVector(vec3_t vec)
CanonicalVector(const vec3_t p1, const vec3_t p2, vec3_t vec)
{
VectorNormalize(vec);
vec_t length;
VectorSubtract(p2, p1, vec);
length = VectorNormalize(vec);
if (vec[0] > EQUAL_EPSILON)
return;
else if (vec[0] < -EQUAL_EPSILON) {
@ -106,7 +109,8 @@ CanonicalVector(vec3_t vec)
} else
vec[2] = 0;
Error("Degenerate edge at (%.3f %.3f %.3f)", vec[0], vec[1], vec[2]);
Error("Degenerate edge of length %f at (%.3f %.3f %.3f)",
length, p1[0], p1[1], p1[2]);
}
static wedge_t *
@ -118,8 +122,7 @@ FindEdge(vec3_t p1, vec3_t p2, vec_t *t1, vec_t *t2)
vec_t temp;
int h;
VectorSubtract(p2, p1, edgevec);
CanonicalVector(edgevec);
CanonicalVector(p1, p2, edgevec);
*t1 = DotProduct(p1, edgevec);
*t2 = DotProduct(p2, edgevec);