zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-18 22:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

r_cullobstructedmodels 2: only cull if model texture has alpha

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@908 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2008-07-26 07:20:57 +00:00
parent b4a353988d
commit 8b9116d1a4
7 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
polymer/build/src/engine.c
View file

@ -9994,13 +9994,13 @@ void setvgapalette(void)
void setbrightness(char dabrightness, char *dapal, char noapply) void setbrightness(char dabrightness, char *dapal, char noapply)
{ {
int i, k, j; int i, k, j;
unsigned int lastbright = curbrightness; // unsigned int lastbright = curbrightness;
if (!(noapply&4)) if (!(noapply&4))
{ {
curbrightness = min(max((int)dabrightness,0),15); curbrightness = min(max((int)dabrightness,0),15);
if (lastbright != (unsigned)curbrightness) // if (lastbright != (unsigned)curbrightness)
vid_gamma = 1.0 + ((float)curbrightness / 10.0); // vid_gamma = 1.0 + ((float)curbrightness / 10.0);
} }
if (setgamma()) j = curbrightness; else j = 0; if (setgamma()) j = curbrightness; else j = 0;

7
polymer/build/src/polymost.c
View file

@ -4464,7 +4464,7 @@ void polymost_drawsprite(int snum)
int posx,posy; int posx,posy;
int oldsizx, oldsizy; int oldsizx, oldsizy;
int tsizx, tsizy; int tsizx, tsizy;
md2model *modelptr = NULL;
tspr = tspriteptr[snum]; tspr = tspriteptr[snum];
if (tspr->owner < 0 || tspr->picnum < 0) return; if (tspr->owner < 0 || tspr->picnum < 0) return;
@ -4513,7 +4513,8 @@ void polymost_drawsprite(int snum)
if (mddraw(tspr)) return; if (mddraw(tspr)) return;
break; // else, render as flat sprite break; // else, render as flat sprite
} }
if (r_cullobstructedmodels) modelptr = (md2model *)models[tile2model[Ptile2tile(tspr->picnum,tspr->pal)].modelid];
if (r_cullobstructedmodels == 1 || (r_cullobstructedmodels == 2 && (modelptr->usesalpha)))
{ {
do // this is so gay do // this is so gay
{ {
@ -5965,7 +5966,7 @@ static int osdcmd_polymostvars(const osdfuncparm_t *parm)
else if (!Bstrcasecmp(parm->name, "r_cullobstructedmodels")) else if (!Bstrcasecmp(parm->name, "r_cullobstructedmodels"))
{ {
if (showval) { OSD_Printf("r_cullobstructedmodels is %d\n", r_cullobstructedmodels); } if (showval) { OSD_Printf("r_cullobstructedmodels is %d\n", r_cullobstructedmodels); }
else r_cullobstructedmodels = (val != 0); else r_cullobstructedmodels = max(0,min(val,2));
return OSDCMD_OK; return OSDCMD_OK;
} }
else if (!Bstrcasecmp(parm->name, "r_fullbrights")) else if (!Bstrcasecmp(parm->name, "r_fullbrights"))

4
polymer/eduke32/source/config.c
View file

@ -713,7 +713,7 @@ int32 CONFIG_ReadSetup(void)
#endif #endif
SCRIPT_GetNumber(ud.config.scripthandle, "Screen Setup", "OSDTextMode",&dummy); SCRIPT_GetNumber(ud.config.scripthandle, "Screen Setup", "OSDTextMode",&dummy);
OSD_SetTextMode(dummy); OSD_SetTextMode(dummy);
SCRIPT_GetNumber(ud.config.scripthandle, "Screen Setup", "OSDHightile",&r_osdhightile); SCRIPT_GetNumber(ud.config.scripthandle, "Screen Setup", "OSDHightile",&osdhightile);
SCRIPT_GetNumber(ud.config.scripthandle, "Misc", "Executions",&ud.executions); SCRIPT_GetNumber(ud.config.scripthandle, "Misc", "Executions",&ud.executions);
SCRIPT_GetNumber(ud.config.scripthandle, "Setup", "ForceSetup",&ud.config.ForceSetup); SCRIPT_GetNumber(ud.config.scripthandle, "Setup", "ForceSetup",&ud.config.ForceSetup);
SCRIPT_GetNumber(ud.config.scripthandle, "Misc", "RunMode",&ud.config.RunMode); SCRIPT_GetNumber(ud.config.scripthandle, "Misc", "RunMode",&ud.config.RunMode);
@ -944,7 +944,7 @@ void CONFIG_WriteSetup(void)
SCRIPT_PutNumber(ud.config.scripthandle, "Screen Setup", "UseModels",usemodels,false,false); SCRIPT_PutNumber(ud.config.scripthandle, "Screen Setup", "UseModels",usemodels,false,false);
#endif #endif
SCRIPT_PutNumber(ud.config.scripthandle, "Screen Setup", "OSDTextMode",OSD_GetTextMode(),false,false); SCRIPT_PutNumber(ud.config.scripthandle, "Screen Setup", "OSDTextMode",OSD_GetTextMode(),false,false);
SCRIPT_PutNumber(ud.config.scripthandle, "Screen Setup", "OSDHightile",r_osdhightile,false,false); SCRIPT_PutNumber(ud.config.scripthandle, "Screen Setup", "OSDHightile",osdhightile,false,false);
SCRIPT_PutNumber(ud.config.scripthandle, "Sound Setup", "AmbienceToggle",ud.config.AmbienceToggle,false,false); SCRIPT_PutNumber(ud.config.scripthandle, "Sound Setup", "AmbienceToggle",ud.config.AmbienceToggle,false,false);
SCRIPT_PutNumber(ud.config.scripthandle, "Sound Setup", "FXVolume",ud.config.FXVolume,false,false); SCRIPT_PutNumber(ud.config.scripthandle, "Sound Setup", "FXVolume",ud.config.FXVolume,false,false);
SCRIPT_PutNumber(ud.config.scripthandle, "Sound Setup", "MusicToggle",ud.config.MusicToggle,false,false); SCRIPT_PutNumber(ud.config.scripthandle, "Sound Setup", "MusicToggle",ud.config.MusicToggle,false,false);

12
polymer/eduke32/source/menus.c
View file

@ -367,7 +367,7 @@ static void _bar(int type, int x,int y,int *p,int dainc,int damodify,int s, int
*p = min; *p = min;
sound(KICK_HIT); sound(KICK_HIT);
} }
if (*p < 64 && (KB_KeyPressed(sc_LeftArrow) || KB_KeyPressed(sc_kpad_4) || ((buttonstat&1) && minfo.dyaw < -256))) // && onbar) ) if (*p < max && (KB_KeyPressed(sc_LeftArrow) || KB_KeyPressed(sc_kpad_4) || ((buttonstat&1) && minfo.dyaw < -256))) // && onbar) )
{ {
KB_ClearKeyDown(sc_LeftArrow); KB_ClearKeyDown(sc_LeftArrow);
KB_ClearKeyDown(sc_kpad_4); KB_ClearKeyDown(sc_kpad_4);
@ -2618,12 +2618,12 @@ cheat_for_port_credits:
rotatesprite(160<<16,27<<16,24576,0,3290,0,0,2+8+16,0,scale(ydim,35,200),xdim-1,scale(ydim,80,200)-1); rotatesprite(160<<16,27<<16,24576,0,3290,0,0,2+8+16,0,scale(ydim,35,200),xdim-1,scale(ydim,80,200)-1);
{ {
int b = (vid_gamma*40960.f); int b = (double)(vid_gamma*40960.f);
_bar(0,c+177,98,&b,4096,x==0,MENUHIGHLIGHT(0),0,8192,163840); _bar(0,c+177,98,&b,4096,x==0,MENUHIGHLIGHT(0),0,8192,163840);
if (b != (vid_gamma*40960.f)) if (b != (double)(vid_gamma*40960.f))
{ {
vid_gamma = b/40960.f; vid_gamma = (double)b/40960.f;
ud.brightness = min(max((double)((vid_gamma-1.0)*10.0),0),15); ud.brightness = min(max((double)((vid_gamma-1.0)*10.0),0),15);
ud.brightness <<= 2; ud.brightness <<= 2;
setbrightness(ud.brightness>>2,&g_player[myconnectindex].ps->palette[0],0); setbrightness(ud.brightness>>2,&g_player[myconnectindex].ps->palette[0],0);
@ -2634,7 +2634,7 @@ cheat_for_port_credits:
if (b != (vid_contrast*40960.f)) if (b != (vid_contrast*40960.f))
{ {
vid_contrast = b/40960.f; vid_contrast = (double)b/40960.f;
setbrightness(ud.brightness>>2,&g_player[myconnectindex].ps->palette[0],0); setbrightness(ud.brightness>>2,&g_player[myconnectindex].ps->palette[0],0);
} }
@ -2643,7 +2643,7 @@ cheat_for_port_credits:
if (b != (vid_brightness*40960.f)) if (b != (vid_brightness*40960.f))
{ {
vid_brightness = b/40960.f; vid_brightness = (double)b/40960.f;
setbrightness(ud.brightness>>2,&g_player[myconnectindex].ps->palette[0],0); setbrightness(ud.brightness>>2,&g_player[myconnectindex].ps->palette[0],0);
} }

6
polymer/eduke32/source/osdcmds.c
View file

@ -694,7 +694,7 @@ cvarmappings cvar[] =
#endif #endif
#endif #endif
{ "r_drawweapon", "r_drawweapon: enable/disable weapon drawing", (void*)&ud.drawweapon, CVAR_INT, 0, 0, 2 }, { "r_drawweapon", "r_drawweapon: enable/disable weapon drawing", (void*)&ud.drawweapon, CVAR_INT, 0, 0, 2 },
{ "r_osdhightile", "r_osdhightile: enable/disable hires art replacements for console text", (void*)&r_osdhightile, CVAR_BOOL, 0, 0, 1 }, { "osdhightile", "osdhightile: enable/disable hires art replacements for console text", (void*)&osdhightile, CVAR_BOOL, 0, 0, 1 },
{ "r_showfps", "r_showfps: show the frame rate counter", (void*)&ud.tickrate, CVAR_BOOL, 0, 0, 1 }, { "r_showfps", "r_showfps: show the frame rate counter", (void*)&ud.tickrate, CVAR_BOOL, 0, 0, 1 },
{ "r_shadows", "r_shadows: enable/disable sprite and model shadows", (void*)&ud.shadows, CVAR_BOOL, 0, 0, 1 }, { "r_shadows", "r_shadows: enable/disable sprite and model shadows", (void*)&ud.shadows, CVAR_BOOL, 0, 0, 1 },
{ "r_precache", "r_precache: enable/disable the pre-level caching routine", (void*)&ud.config.useprecache, CVAR_BOOL, 0, 0, 1 }, { "r_precache", "r_precache: enable/disable the pre-level caching routine", (void*)&ud.config.useprecache, CVAR_BOOL, 0, 0, 1 },
@ -790,6 +790,7 @@ static int osdcmd_sensitivity(const osdfuncparm_t *parm)
return OSDCMD_OK; return OSDCMD_OK;
} }
/*
static int osdcmd_setbrightness(const osdfuncparm_t *parm) static int osdcmd_setbrightness(const osdfuncparm_t *parm)
{ {
if (parm->numparms != 1) if (parm->numparms != 1)
@ -802,6 +803,7 @@ static int osdcmd_setbrightness(const osdfuncparm_t *parm)
OSD_Printf("setbrightness %d\n",ud.brightness>>2); OSD_Printf("setbrightness %d\n",ud.brightness>>2);
return OSDCMD_OK; return OSDCMD_OK;
} }
*/
static int osdcmd_give(const osdfuncparm_t *parm) static int osdcmd_give(const osdfuncparm_t *parm)
{ {
@ -1351,7 +1353,7 @@ int registerosdcommands(void)
OSD_RegisterFunction(t,Bstrdup(tempbuf),osdcmd_button); OSD_RegisterFunction(t,Bstrdup(tempbuf),osdcmd_button);
} }
OSD_RegisterFunction("setbrightness","setbrightness <value>: changes brightness (obsolete)", osdcmd_setbrightness); // OSD_RegisterFunction("setbrightness","setbrightness <value>: changes brightness (obsolete)", osdcmd_setbrightness);
OSD_RegisterFunction("give","give <all|health|weapons|ammo|armor|keys|inventory>: gives requested item", osdcmd_give); OSD_RegisterFunction("give","give <all|health|weapons|ammo|armor|keys|inventory>: gives requested item", osdcmd_give);
OSD_RegisterFunction("god","god: toggles god mode", osdcmd_god); OSD_RegisterFunction("god","god: toggles god mode", osdcmd_god);

6
polymer/eduke32/source/osdfuncs.c
View file

@ -3,7 +3,7 @@
#include "namesdyn.h" #include "namesdyn.h"
#include "osdfuncs.h" #include "osdfuncs.h"
int r_osdhightile = 0; int osdhightile = 0;
void GAME_drawosdchar(int x, int y, char ch, int shade, int pal) void GAME_drawosdchar(int x, int y, char ch, int shade, int pal)
{ {
@ -13,7 +13,7 @@ void GAME_drawosdchar(int x, int y, char ch, int shade, int pal)
if (ch == 32) return; if (ch == 32) return;
ac = ch-'!'+STARTALPHANUM; ac = ch-'!'+STARTALPHANUM;
if (ac < STARTALPHANUM || ac > ENDALPHANUM) return; if (ac < STARTALPHANUM || ac > ENDALPHANUM) return;
usehightile = (r_osdhightile && ht); usehightile = (osdhightile && ht);
rotatesprite(((x<<3)+x)<<16, (y<<3)<<16, 65536l, 0, ac, shade, pal, 8|16, 0, 0, xdim-1, ydim-1); rotatesprite(((x<<3)+x)<<16, (y<<3)<<16, 65536l, 0, ac, shade, pal, 8|16, 0, 0, xdim-1, ydim-1);
usehightile = ht; usehightile = ht;
} }
@ -25,7 +25,7 @@ void GAME_drawosdstr(int x, int y, char *ch, int len, int shade, int pal)
char *fmt = OSD_GetFmtPtr(); char *fmt = OSD_GetFmtPtr();
int ht = usehightile; int ht = usehightile;
usehightile = (r_osdhightile && ht); usehightile = (osdhightile && ht);
for (x = (x<<3)+x; len>0; len--, ch++, x++) for (x = (x<<3)+x; len>0; len--, ch++, x++)
{ {

2
polymer/eduke32/source/osdfuncs.h
View file

@ -6,7 +6,7 @@ int GAME_getrowheight(int w);
void GAME_clearbackground(int c, int r); void GAME_clearbackground(int c, int r);
void GAME_onshowosd(int shown); void GAME_onshowosd(int shown);
extern int r_osdhightile; extern int osdhightile;
#define OSDCHAR_WIDTH 8 #define OSDCHAR_WIDTH 8