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

light: revert to older CalcPoints (push off hit normal) to fix artifacts in testlightonface.map

This commit is contained in:
Eric Wasylishen 2016-04-06 19:15:19 -06:00
parent c9aad9d2ce
commit 6fcf04a298
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
light/ltface.c
View File

@ -635,20 +635,25 @@ CalcPoints(const modelinfo_t *modelinfo, const vec3_t offset, const texorg_t *te
VectorCopy(surf->plane.normal, norm);
}
vec3_t tracevec, tracedir;
VectorSubtract(point, surf->midpoint, tracevec);
VectorCopy(tracevec, tracedir);
VectorNormalize(tracedir);
// trace 1 unit further than we need to go to ensure 1 unit clearance
const vec_t dist = VectorLength(tracevec) + 1;
vec_t hitdist = 0;
vec3_t hitnormal = {0};
if (CalcPointsTrace_embree(surf->midpoint, tracedir, dist, &hitdist, hitnormal, surf->modelinfo)) {
// we hit a solid. pull back 1 unit from the hitpoint and hope that's in empty space.
hitdist = qmax(0.0f, hitdist - 1.0f);
VectorMA(surf->midpoint, hitdist, tracedir, point);
for (int tries=0; tries<5; tries++) {
vec3_t tracevec, tracedir;
VectorSubtract(point, surf->midpoint, tracevec);
VectorCopy(tracevec, tracedir);
VectorNormalize(tracedir);
// trace 1 unit further than we need to go to ensure 1 unit clearance
const vec_t dist = VectorLength(tracevec) + 1;
vec_t hitdist = 0;
vec3_t hitnormal = {0};
if (CalcPointsTrace_embree(surf->midpoint, tracedir, dist, &hitdist, hitnormal, surf->modelinfo)) {
// we hit a solid. pull back 1 unit in the direction of the hit normal
vec3_t hitpoint;
VectorMA(surf->midpoint, hitdist, tracedir, hitpoint);
VectorMA(hitpoint, 1, hitnormal, point);
} else {
break;
}
}
}
}

4
light/trace_embree.cc
View File

@ -329,8 +329,10 @@ CalcPointsTrace_embree(const vec3_t start, const vec3_t dir, vec_t dist, vec_t *
if (hitdist)
*hitdist = ray.tfar;
if (normal)
if (normal) {
VectorCopy(ray.Ng, normal);
VectorNormalize(normal);
}
return ray.geomID != RTC_INVALID_GEOMETRY_ID;
}