zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Get rid of that old model occlusion checking hack I wrote for Polymost years ago. I actually didn't know this was still in EDuke32... it's one of the worst things I've ever written. :p 

git-svn-id: https://svn.eduke32.com/eduke32@3764 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2013-05-15 02:19:41 +00:00
parent 20e5bfd821
commit c717f9a7b5
4 changed files with 0 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
polymer/eduke32/build/include/build.h
View File

@ -1239,7 +1239,6 @@ extern int32_t r_vbocount;
extern int32_t r_animsmoothing; extern int32_t r_animsmoothing;
extern int32_t r_parallaxskyclamping; extern int32_t r_parallaxskyclamping;
extern int32_t r_parallaxskypanning; extern int32_t r_parallaxskypanning;
extern int32_t r_modelocclusionchecking;
extern int32_t r_fullbrights; extern int32_t r_fullbrights;
extern int32_t r_downsize; extern int32_t r_downsize;
extern int32_t r_downsizevar; extern int32_t r_downsizevar;

12
polymer/eduke32/build/include/polymost.h
View File

@ -5,18 +5,6 @@
#include "hightile.h" #include "hightile.h"
#define MODEL_OCCLUSION_CHECKING
#ifdef MODEL_OCCLUSION_CHECKING
# define CULL_OFFSET 384
# define CULL_DELAY 2
# define MAXCULLCHECKS 1024
extern int32_t lastcullcheck;
extern char cullmodel[MAXSPRITES];
extern int32_t cullcheckcnt;
#endif
typedef struct { char r, g, b, a; } coltype; typedef struct { char r, g, b, a; } coltype;
extern int32_t rendmode; extern int32_t rendmode;

10
polymer/eduke32/build/src/engine.c
View File

@ -9258,9 +9258,6 @@ killsprite:
#ifdef USE_OPENGL #ifdef USE_OPENGL
curpolygonoffset = 0; curpolygonoffset = 0;
# ifdef MODEL_OCCLUSION_CHECKING
cullcheckcnt = 0;
# endif
#endif #endif
pos.x = (float)globalposx; pos.x = (float)globalposx;
pos.y = (float)globalposy; pos.y = (float)globalposy;
@ -9327,13 +9324,6 @@ killsprite:
if (tspriteptr[spritesortcnt] != NULL) if (tspriteptr[spritesortcnt] != NULL)
drawsprite(spritesortcnt); drawsprite(spritesortcnt);
} }
#ifdef MODEL_OCCLUSION_CHECKING
if (totalclock < lastcullcheck - CULL_DELAY)
lastcullcheck = totalclock;
if (totalclock >= lastcullcheck + CULL_DELAY)
lastcullcheck = (totalclock + CULL_DELAY);
#endif
} }
#ifdef POLYMER #ifdef POLYMER

102
polymer/eduke32/build/src/polymost.c
View File

@ -175,9 +175,6 @@ int32_t r_vbocount = 64;
// model animation smoothing cvar // model animation smoothing cvar
int32_t r_animsmoothing = 1; int32_t r_animsmoothing = 1;
// line of sight checks before mddraw()
int32_t r_modelocclusionchecking = 0;
// fullbright cvar // fullbright cvar
int32_t r_fullbrights = 1; int32_t r_fullbrights = 1;
@ -3727,56 +3724,6 @@ void polymost_drawmaskwall(int32_t damaskwallcnt)
drawpoly(dpx,dpy,n,method); drawpoly(dpx,dpy,n,method);
} }
#ifdef MODEL_OCCLUSION_CHECKING
int32_t lastcullcheck = 0;
char cullmodel[MAXSPRITES];
int32_t cullcheckcnt = 0;
static int32_t polymost_checkcoordinates(int32_t x, int32_t y, const spritetype *tspr)
{
int16_t datempsectnum = tspr->sectnum;
int32_t oldx = x, i, j = (tilesizy[tspr->picnum]*tspr->yrepeat);
RECHECK:
updatesectorz(tspr->x+x,tspr->y+y,tspr->z,&datempsectnum);
if (datempsectnum == -1)
{
if (x == y || x != oldx)
return 0;
swaplong(&x,&y);
updatesector(tspr->x+x,tspr->y+y,&datempsectnum);
}
i = 4;
do
{
cullcheckcnt += 2;
if (cansee(globalposx, globalposy, globalposz, globalcursectnum,
tspr->x+x, tspr->y+y, tspr->z-(j*i)-512, datempsectnum))
return 1;
if (cansee(globalposx, globalposy, globalposz, globalcursectnum,
tspr->x+x, tspr->y+y, tspr->z-(j*(i-1))-512, datempsectnum))
return 1;
i -= 2;
}
while (i);
cullcheckcnt++;
if (cansee(globalposx, globalposy, globalposz, globalcursectnum,
tspr->x+x, tspr->y+y, tspr->z-512, datempsectnum))
return 1;
if (x != y && x == oldx)
{
swaplong(&x,&y);
goto RECHECK;
}
return 0;
}
#endif
void polymost_drawsprite(int32_t snum) void polymost_drawsprite(int32_t snum)
{ {
double px[6], py[6]; double px[6], py[6];
@ -3829,54 +3776,6 @@ void polymost_drawsprite(int32_t snum)
break; // else, render as flat sprite break; // else, render as flat sprite
} }
# ifdef MODEL_OCCLUSION_CHECKING
if (r_modelocclusionchecking)
{
const int32_t spic = sprite[spritenum].picnum;
if (totalclock >= lastcullcheck + CULL_DELAY && cullcheckcnt < MAXCULLCHECKS &&
(/*modelptr->usesalpha ||*/ tspr->yrepeat*tilesizy[spic] > 1536 || tspr->xrepeat*tilesizx[spic] > 1536))
{
do // this is so gay
{
uint32_t t = getticks()+4;
// don't bother with shadows because processing its owner will take care of it
if (tspr->statnum == TSPR_TEMP)
break;
cullmodel[spritenum] = 1;
cullcheckcnt++;
if (cansee(globalposx, globalposy, globalposz, globalcursectnum,
tspr->x, tspr->y, tspr->z,tspr->sectnum))
{ cullmodel[spritenum] = 0; break; }
if (polymost_checkcoordinates(-CULL_OFFSET, 0, tspr) || getticks() > t || cullcheckcnt >= MAXCULLCHECKS)
{ cullmodel[spritenum] = 0; break; }
if (polymost_checkcoordinates(-CULL_OFFSET, -CULL_OFFSET, tspr) || getticks() > t || cullcheckcnt >= MAXCULLCHECKS)
{ cullmodel[spritenum] = 0; break; }
if (polymost_checkcoordinates(CULL_OFFSET, 0, tspr) || getticks() > t || cullcheckcnt >= MAXCULLCHECKS)
{ cullmodel[spritenum] = 0; break; }
if (polymost_checkcoordinates(CULL_OFFSET, CULL_OFFSET, tspr) || getticks() > t || cullcheckcnt >= MAXCULLCHECKS)
{ cullmodel[spritenum] = 0; break; }
if (polymost_checkcoordinates(-CULL_OFFSET, CULL_OFFSET, tspr) || getticks() > t || cullcheckcnt >= MAXCULLCHECKS)
{ cullmodel[spritenum] = 0; break; }
if (polymost_checkcoordinates(0, 0, tspr) || getticks() > t || cullcheckcnt >= MAXCULLCHECKS)
{ cullmodel[spritenum] = 0; break; }
break;
}
while (1);
}
}
else cullmodel[spritenum] = 0;
if (cullmodel[spritenum])
break;
# endif
if (mddraw(tspr)) if (mddraw(tspr))
return; return;
@ -5270,7 +5169,6 @@ void polymost_initosdfuncs(void)
{ {
#ifdef USE_OPENGL #ifdef USE_OPENGL
{ "r_animsmoothing","r_animsmoothing: enable/disable model animation smoothing",(void *) &r_animsmoothing, CVAR_BOOL, 0, 1 }, { "r_animsmoothing","r_animsmoothing: enable/disable model animation smoothing",(void *) &r_animsmoothing, CVAR_BOOL, 0, 1 },
{ "r_modelocclusionchecking","r_modelocclusionchecking: enable/disable hack to cull \"obstructed\" models",(void *) &r_modelocclusionchecking, CVAR_INT, 0, 2 },
{ "r_detailmapping","r_detailmapping: enable/disable detail mapping",(void *) &r_detailmapping, CVAR_BOOL, 0, 1 }, { "r_detailmapping","r_detailmapping: enable/disable detail mapping",(void *) &r_detailmapping, CVAR_BOOL, 0, 1 },
{ "r_downsize","r_downsize: controls downsizing factor (quality) for hires textures",(void *) &r_downsize, CVAR_INT|CVAR_FUNCPTR, 0, 5 }, { "r_downsize","r_downsize: controls downsizing factor (quality) for hires textures",(void *) &r_downsize, CVAR_INT|CVAR_FUNCPTR, 0, 5 },
{ "r_fullbrights","r_fullbrights: enable/disable fullbright textures",(void *) &r_fullbrights, CVAR_BOOL, 0, 1 }, { "r_fullbrights","r_fullbrights: enable/disable fullbright textures",(void *) &r_fullbrights, CVAR_BOOL, 0, 1 },