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

light: Refactor CalcPoints, store whether a point is occluded

This commit is contained in:
Eric Wasylishen 2016-04-06 11:43:52 -06:00
parent a6a89db530
commit c9aad9d2ce
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/light/light.h
View File

@ -190,6 +190,7 @@ typedef struct {
int numpoints; int numpoints;
vec3_t *points; // malloc'ed array of numpoints vec3_t *points; // malloc'ed array of numpoints
vec3_t *normals; // malloc'ed array of numpoints vec3_t *normals; // malloc'ed array of numpoints
bool *occluded; // malloc'ed array of numpoints
/* /*
raw ambient occlusion amount per sample point, 0-1, where 1 is raw ambient occlusion amount per sample point, 0-1, where 1 is

23
light/ltface.c
View File

@ -595,10 +595,6 @@ __attribute__((noinline))
static void static void
CalcPoints(const modelinfo_t *modelinfo, const vec3_t offset, const texorg_t *texorg, lightsurf_t *surf, const bsp2_t *bsp, const bsp2_dface_t *face) CalcPoints(const modelinfo_t *modelinfo, const vec3_t offset, const texorg_t *texorg, lightsurf_t *surf, const bsp2_t *bsp, const bsp2_dface_t *face)
{ {
int s, t;
int width, height;
vec_t *point, *norm;
/* /*
* Fill in the surface points. The points are biased towards the center of * Fill in the surface points. The points are biased towards the center of
* the surface to help avoid edge cases just inside walls * the surface to help avoid edge cases just inside walls
@ -606,8 +602,8 @@ CalcPoints(const modelinfo_t *modelinfo, const vec3_t offset, const texorg_t *te
TexCoordToWorld(surf->exactmid[0], surf->exactmid[1], texorg, surf->midpoint); TexCoordToWorld(surf->exactmid[0], surf->exactmid[1], texorg, surf->midpoint);
VectorAdd(surf->midpoint, offset, surf->midpoint); VectorAdd(surf->midpoint, offset, surf->midpoint);
width = (surf->texsize[0] + 1) * oversample; const int width = (surf->texsize[0] + 1) * oversample;
height = (surf->texsize[1] + 1) * oversample; const int height = (surf->texsize[1] + 1) * oversample;
surf->starts = (surf->texmins[0] - 0.5 + (0.5 / oversample)) * surf->lightmapscale; surf->starts = (surf->texmins[0] - 0.5 + (0.5 / oversample)) * surf->lightmapscale;
surf->startt = (surf->texmins[1] - 0.5 + (0.5 / oversample)) * surf->lightmapscale; surf->startt = (surf->texmins[1] - 0.5 + (0.5 / oversample)) * surf->lightmapscale;
surf->st_step = surf->lightmapscale / oversample; surf->st_step = surf->lightmapscale / oversample;
@ -616,10 +612,14 @@ CalcPoints(const modelinfo_t *modelinfo, const vec3_t offset, const texorg_t *te
surf->numpoints = width * height; surf->numpoints = width * height;
surf->points = calloc(surf->numpoints, sizeof(vec3_t)); surf->points = calloc(surf->numpoints, sizeof(vec3_t));
surf->normals = calloc(surf->numpoints, sizeof(vec3_t)); surf->normals = calloc(surf->numpoints, sizeof(vec3_t));
point = surf->points[0]; surf->occluded = (bool *)calloc(surf->numpoints, sizeof(bool));
norm = surf->normals[0];
for (t = 0; t < height; t++) { for (int t = 0; t < height; t++) {
for (s = 0; s < width; s++, point += 3, norm += 3) { for (int s = 0; s < width; s++) {
const int i = t*width + s;
vec_t *point = surf->points[i];
vec_t *norm = surf->normals[i];
const vec_t us = surf->starts + s * surf->st_step; const vec_t us = surf->starts + s * surf->st_step;
const vec_t ut = surf->startt + t * surf->st_step; const vec_t ut = surf->startt + t * surf->st_step;
@ -1684,6 +1684,9 @@ void LightFaceShutdown(struct ltface_ctx *ctx)
if (ctx->lightsurf.occlusion) if (ctx->lightsurf.occlusion)
free(ctx->lightsurf.occlusion); free(ctx->lightsurf.occlusion);
if (ctx->lightsurf.occluded)
free(ctx->lightsurf.occluded);
free(ctx); free(ctx);
} }