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

vis: rename vstatus to pstatus 

Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
This commit is contained in:
Kevin Shanahan 2012-12-25 21:28:20 +10:30
parent 0908b25f47
commit a10316d7c9
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/vis/vis.h
View File

@ -49,12 +49,13 @@ winding_t *CopyWinding(winding_t * w);
void PlaneFromWinding(const winding_t * w, plane_t *plane);
qboolean PlaneCompare(plane_t *p1, plane_t *p2);
typedef enum { stat_none, stat_working, stat_done } vstatus_t;
typedef enum { pstat_none = 0, pstat_working, pstat_done } pstatus_t;
typedef struct {
plane_t plane; // normal pointing into neighbor
int leaf; // neighbor
winding_t *winding;
vstatus_t status;
pstatus_t status;
byte *visbits;
byte *mightsee;
int nummightsee;

7
vis/flow.c
View File

@ -193,7 +193,7 @@ RecursiveLeafFlow(int leafnum, threaddata_t * thread, pstack_t * prevstack)
continue; // can't possibly see it
}
// if the portal can't see anything we haven't allready seen, skip it
if (p->status == stat_done) {
if (p->status == pstat_done) {
c_vistest++;
test = (long *)p->visbits;
} else {
@ -354,9 +354,8 @@ PortalFlow(portal_t * p)
{
threaddata_t data;
if (p->status != stat_working)
if (p->status != pstat_working)
Error("%s: reflowed", __func__);
p->status = stat_working;
p->visbits = malloc(leafbytes);
memset(p->visbits, 0, leafbytes);
@ -372,7 +371,7 @@ PortalFlow(portal_t * p)
RecursiveLeafFlow(p->leaf, &data, &data.pstack_head);
p->status = stat_done;
p->status = pstat_done;
}

8
vis/vis.c
View File

@ -350,14 +350,14 @@ GetNextPortal(void)
p = NULL;
for (j = 0, tp = portals; j < numportals * 2; j++, tp++) {
if (tp->nummightsee < min && tp->status == stat_none) {
if (tp->nummightsee < min && tp->status == pstat_none) {
min = tp->nummightsee;
p = tp;
}
}
if (p) {
p->status = stat_working;
p->status = pstat_working;
progress++;
printf("\r%i of %i: %i%%", progress, 2 * numportals,
50 * progress / numportals);
@ -460,7 +460,7 @@ LeafFlow(int leafnum)
leaf = &leafs[leafnum];
for (i = 0; i < leaf->numportals; i++) {
p = leaf->portals[i];
if (p->status != stat_done)
if (p->status != pstat_done)
Error("portal not done");
for (j = 0; j < leafbytes; j++)
outbuffer[j] |= p->visbits[j];
@ -516,7 +516,7 @@ CalcPortalVis(void)
if (fastvis) {
for (i = 0; i < numportals * 2; i++) {
portals[i].visbits = portals[i].mightsee;
portals[i].status = stat_done;
portals[i].status = pstat_done;
}
return;
}