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

light: phong shading: handle some sources of nan's

This commit is contained in:
Eric Wasylishen 2016-04-19 19:33:49 -06:00
parent 9560ba3901
commit 03df93851b
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
light/light.cc
View File

@ -311,10 +311,14 @@ FindModelInfo(const bsp2_t *bsp, const char *lmscaleoverride)
selfshadowlist = selfshadowmodels; selfshadowlist = selfshadowmodels;
} }
/* return 0 if either vector is zero-length */
static float static float
AngleBetweenVectors(const vec3_t d1, const vec3_t d2) AngleBetweenVectors(const vec3_t d1, const vec3_t d2)
{ {
float cosangle = DotProduct(d1, d2)/(VectorLength(d1)*VectorLength(d2)); float length_product = (VectorLength(d1)*VectorLength(d2));
if (length_product == 0)
return 0;
float cosangle = DotProduct(d1, d2)/length_product;
if (cosangle < -1) cosangle = -1; if (cosangle < -1) cosangle = -1;
if (cosangle > 1) cosangle = 1; if (cosangle > 1) cosangle = 1;
@ -385,8 +389,8 @@ Face_Normal(const bsp2_t *bsp, const bsp2_dface_t *f, vec3_t norm)
const vec_t *GetSurfaceVertexNormal(const bsp2_t *bsp, const bsp2_dface_t *f, const int vertindex) const vec_t *GetSurfaceVertexNormal(const bsp2_t *bsp, const bsp2_dface_t *f, const int vertindex)
{ {
const auto &face_normals_vector = vertex_normals[f]; const auto &face_normals_vector = vertex_normals.at(f);
return face_normals_vector[vertindex].v; return face_normals_vector.at(vertindex).v;
} }
static bool static bool

7
light/ltface.c
View File

@ -547,6 +547,13 @@ static void CalcPointNormal(const bsp2_t *bsp, const bsp2_dface_t *face, plane_t
CalcBarycentric(pointOnPlane, v1, v2, v3, barry); CalcBarycentric(pointOnPlane, v1, v2, v3, barry);
if (!isfinite(barry[0])
|| !isfinite(barry[1])
|| !isfinite(barry[2])) {
VectorCopy(surfplane.normal, norm);
return;
}
v1 = GetSurfaceVertexNormal(bsp, face, 0); v1 = GetSurfaceVertexNormal(bsp, face, 0);
v2 = GetSurfaceVertexNormal(bsp, face, best-1); v2 = GetSurfaceVertexNormal(bsp, face, best-1);
v3 = GetSurfaceVertexNormal(bsp, face, best); v3 = GetSurfaceVertexNormal(bsp, face, best);