zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implement better fade-out for quotes and for the mouse cursor in the menu.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4919 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2015-01-15 06:45:14 +00:00
parent 2d161b1bf7
commit cdaa25ef07
8 changed files with 69 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/Makefile.deps
View file

@ -47,7 +47,7 @@ $(DUKE3D_OBJ)/gamevars.$o: $(DUKE3D_SRC)/gamevars.c $(DUKE3D_SRC)/gamestructures
$(DUKE3D_OBJ)/global.$o: $(DUKE3D_SRC)/*.c $(DUKE3D_SRC)/global.c $(duke3d_h) $(DUKE3D_OBJ)/global.$o: $(DUKE3D_SRC)/*.c $(DUKE3D_SRC)/global.c $(duke3d_h)
$(DUKE3D_OBJ)/input.$o: $(DUKE3D_SRC)/input.c $(duke3d_h) $(DUKE3D_SRC)/input.h $(DUKE3D_OBJ)/input.$o: $(DUKE3D_SRC)/input.c $(duke3d_h) $(DUKE3D_SRC)/input.h
$(DUKE3D_OBJ)/mdump.$o: $(DUKE3D_SRC)/mdump.cpp $(DUKE3D_SRC)/mdump.h $(DUKE3D_OBJ)/mdump.$o: $(DUKE3D_SRC)/mdump.cpp $(DUKE3D_SRC)/mdump.h
$(DUKE3D_OBJ)/menus.$o: $(DUKE3D_SRC)/menus.c $(duke3d_h) $(DUKE3D_SRC)/input.h $(DUKE3D_SRC)/jmact/mouse.h $(DUKE3D_OBJ)/menus.$o: $(DUKE3D_SRC)/menus.c $(duke3d_h) $(DUKE3D_SRC)/input.h $(DUKE3D_SRC)/jmact/mouse.h $(DUKE3D_SRC)/menus.h
$(DUKE3D_OBJ)/namesdyn.$o: $(DUKE3D_SRC)/namesdyn.c $(duke3d_h) $(DUKE3D_OBJ)/namesdyn.$o: $(DUKE3D_SRC)/namesdyn.c $(duke3d_h)
$(DUKE3D_OBJ)/net.$o: $(DUKE3D_SRC)/net.c $(duke3d_h) $(DUKE3D_OBJ)/net.$o: $(DUKE3D_SRC)/net.c $(duke3d_h)
$(DUKE3D_OBJ)/player.$o: $(DUKE3D_SRC)/player.c $(duke3d_h) $(DUKE3D_OBJ)/player.$o: $(DUKE3D_SRC)/player.c $(duke3d_h)

6
polymer/eduke32/build/include/build.h
View file

@ -1041,6 +1041,12 @@ FORCE_INLINE void rotatesprite_fs(int32_t sx, int32_t sy, int32_t z, int16_t a,
rotatesprite_(sx, sy, z, a, picnum, dashade, dapalnum, dastat, 0, 0, 0,0,xdim-1,ydim-1); rotatesprite_(sx, sy, z, a, picnum, dashade, dapalnum, dastat, 0, 0, 0,0,xdim-1,ydim-1);
} }
FORCE_INLINE void rotatesprite_fs_alpha(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t picnum,
int8_t dashade, char dapalnum, int32_t dastat, uint8_t alpha)
{
rotatesprite_(sx, sy, z, a, picnum, dashade, dapalnum, dastat, alpha, 0, 0, 0, xdim-1, ydim-1);
}
FORCE_INLINE void rotatesprite_win(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t picnum, FORCE_INLINE void rotatesprite_win(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t picnum,
int8_t dashade, char dapalnum, int32_t dastat) int8_t dashade, char dapalnum, int32_t dastat)
{ {

2
polymer/eduke32/build/src/baselayer.c
View file

@ -32,6 +32,8 @@ int32_t mousepressstateadvance(void)
mousepressstate = Mouse_Idle; mousepressstate = Mouse_Idle;
return 1; return 1;
} }
else if (mousepressstate == Mouse_Held)
return 1;
return 0; return 0;
} }

49
polymer/eduke32/source/game.c
View file

@ -152,6 +152,13 @@ static void G_DrawCameraText(int16_t i);
GAME_STATIC GAME_INLINE int32_t G_MoveLoop(void); GAME_STATIC GAME_INLINE int32_t G_MoveLoop(void);
static void G_DoOrderScreen(void); static void G_DoOrderScreen(void);
#define FTAOPAQUETIME 30
#define ftapulseshade \
((hud_glowingquotes && (getrendermode() == REND_CLASSIC || ps->fta >= FTAOPAQUETIME)) ? \
(sintable[((uint32_t)ps->fta << 7) & 2047] >> 11) : \
(sintable[((uint32_t)FTAOPAQUETIME << 7) & 2047] >> 11))
#define quotepulseshade (sintable[((uint32_t)totalclock<<5)&2047]>>11) #define quotepulseshade (sintable[((uint32_t)totalclock<<5)&2047]>>11)
int32_t althud_numbertile = 2930; int32_t althud_numbertile = 2930;
@ -1155,7 +1162,7 @@ vec2_t G_ScreenTextShadow(int32_t sx, int32_t sy,
// 4: small font, wrap strings? // 4: small font, wrap strings?
int32_t G_PrintGameText(int32_t hack, int32_t tile, int32_t x, int32_t y, const char *t, int32_t G_PrintGameText(int32_t hack, int32_t tile, int32_t x, int32_t y, const char *t,
int32_t s, int32_t p, int32_t o, int32_t s, int32_t p, int32_t o,
int32_t x1, int32_t y1, int32_t x2, int32_t y2, int32_t z) int32_t x1, int32_t y1, int32_t x2, int32_t y2, int32_t z, int32_t a)
{ {
vec2_t dim; vec2_t dim;
int32_t f = TEXT_GAMETEXTNUMHACK; int32_t f = TEXT_GAMETEXTNUMHACK;
@ -1191,7 +1198,7 @@ int32_t G_PrintGameText(int32_t hack, int32_t tile, int32_t x, int32_t y, cons
if (x == (160<<16)) if (x == (160<<16))
f |= TEXT_XCENTER; f |= TEXT_XCENTER;
dim = G_ScreenText(tile, x, y, z, 0, 0, t, s, p, orient|ROTATESPRITE_FULL16, 0, (5<<16), (8<<16), (xbetween<<16), 0, f, x1, y1, x2, y2); dim = G_ScreenText(tile, x, y, z, 0, 0, t, s, p, orient|ROTATESPRITE_FULL16, a, (5<<16), (8<<16), (xbetween<<16), 0, f, x1, y1, x2, y2);
x += dim.x; x += dim.x;
@ -2585,6 +2592,19 @@ static inline int32_t texto(int32_t t)
return 2+8+16+1+32; return 2+8+16+1+32;
} }
static inline int32_t texta(int32_t t)
{
if (getrendermode() == REND_CLASSIC)
{
if (t > 4) return 0;
if (t > 2) return 85;
return 169;
}
t = clamp(t<<3, 0, 255);
return 255 - t;
}
static int32_t calc_ybase(int32_t begy) static int32_t calc_ybase(int32_t begy)
{ {
int32_t k = begy; int32_t k = begy;
@ -2673,26 +2693,28 @@ void G_PrintGameQuotes(int32_t snum)
{ {
#ifdef SPLITSCREEN_MOD_HACKS #ifdef SPLITSCREEN_MOD_HACKS
if (!g_fakeMultiMode) if (!g_fakeMultiMode)
#endif
k = 140; // quotebot-8-4; k = 140; // quotebot-8-4;
#ifdef SPLITSCREEN_MOD_HACKS
else else
k = 50; k = 50;
#else
k = 140;
#endif #endif
} }
else else
{ {
if (ud.althud == 2)
k = 32;
else
#ifdef GEKKO #ifdef GEKKO
k = 16; k = 16;
#elif defined EDUKE32_TOUCH_DEVICES #elif defined EDUKE32_TOUCH_DEVICES
k = ud.althud == 2 ? 32 : 24; k = 24;
#else #else
k = ud.althud == 2 ? 32 : 0; k = 1;
#endif #endif
} }
} }
{
int32_t pal = 0; int32_t pal = 0;
#ifdef SPLITSCREEN_MOD_HACKS #ifdef SPLITSCREEN_MOD_HACKS
@ -2714,10 +2736,7 @@ void G_PrintGameQuotes(int32_t snum)
} }
#endif #endif
gametextpalbits(160, k, ScriptQuotes[ps->ftq], gametextpalbits(160, k, ScriptQuotes[ps->ftq], ftapulseshade, pal, 2 + 8 + 16, texta(ps->fta));
hud_glowingquotes ? quotepulseshade : 0,
pal, texto(ps->fta));
}
} }
void P_DoQuote(int32_t q, DukePlayer_t *p) void P_DoQuote(int32_t q, DukePlayer_t *p)
@ -3820,7 +3839,7 @@ void G_DisplayRest(int32_t smoothratio)
((myps->player_par%REALGAMETICSPERSEC)*33)/10 ((myps->player_par%REALGAMETICSPERSEC)*33)/10
); );
G_PrintGameText(8+4+1,STARTALPHANUM, j,scale(200-i,ud.config.ScreenHeight,200)-textsc(21), G_PrintGameText(8+4+1,STARTALPHANUM, j,scale(200-i,ud.config.ScreenHeight,200)-textsc(21),
tempbuf,0,10,26,0, 0, xdim-1, ydim-1, 65536); tempbuf,0,10,26,0, 0, xdim-1, ydim-1, 65536, 0);
if (ud.player_skill > 3 || ((g_netServer || ud.multimode > 1) && !GTFLAGS(GAMETYPE_PLAYERSFRIENDLY))) if (ud.player_skill > 3 || ((g_netServer || ud.multimode > 1) && !GTFLAGS(GAMETYPE_PLAYERSFRIENDLY)))
Bsprintf(tempbuf,"K:^15%d",(ud.multimode>1 &&!GTFLAGS(GAMETYPE_PLAYERSFRIENDLY))? Bsprintf(tempbuf,"K:^15%d",(ud.multimode>1 &&!GTFLAGS(GAMETYPE_PLAYERSFRIENDLY))?
@ -3838,14 +3857,14 @@ void G_DisplayRest(int32_t smoothratio)
} }
G_PrintGameText(8+4+1,STARTALPHANUM, j,scale(200-i,ud.config.ScreenHeight,200)-textsc(14), G_PrintGameText(8+4+1,STARTALPHANUM, j,scale(200-i,ud.config.ScreenHeight,200)-textsc(14),
tempbuf,0,10,26,0, 0, xdim-1, ydim-1, 65536); tempbuf,0,10,26,0, 0, xdim-1, ydim-1, 65536, 0);
if (myps->secret_rooms == myps->max_secret_rooms) if (myps->secret_rooms == myps->max_secret_rooms)
Bsprintf(tempbuf,"S:%d/%d", myps->secret_rooms, myps->max_secret_rooms); Bsprintf(tempbuf,"S:%d/%d", myps->secret_rooms, myps->max_secret_rooms);
else Bsprintf(tempbuf,"S:^15%d/%d", myps->secret_rooms, myps->max_secret_rooms); else Bsprintf(tempbuf,"S:^15%d/%d", myps->secret_rooms, myps->max_secret_rooms);
G_PrintGameText(8+4+1,STARTALPHANUM, j,scale(200-i,ud.config.ScreenHeight,200)-textsc(7), G_PrintGameText(8+4+1,STARTALPHANUM, j,scale(200-i,ud.config.ScreenHeight,200)-textsc(7),
tempbuf,0,10,26,0, 0, xdim-1, ydim-1, 65536); tempbuf,0,10,26,0, 0, xdim-1, ydim-1, 65536, 0);
} }
if (g_player[myconnectindex].gotvote == 0 && voting != -1 && voting != myconnectindex) if (g_player[myconnectindex].gotvote == 0 && voting != -1 && voting != myconnectindex)
@ -12705,7 +12724,7 @@ void G_BonusScreen(int32_t bonusonly)
gametext((320>>2)+89+(clockpad*24),yy+9,"New record!",0,2+8+16); gametext((320>>2)+89+(clockpad*24),yy+9,"New record!",0,2+8+16);
} }
else else
gametextpalbits((320>>2)+71,yy+9,"Cheated!",0,2,2+8+16); gametextpalbits((320>>2)+71,yy+9,"Cheated!",0,2,2+8+16,0);
yy+=10; yy+=10;
if (!(ud.volume_number == 0 && ud.last_level-1 == 7 && boardfilename[0])) if (!(ud.volume_number == 0 && ud.last_level-1 == 7 && boardfilename[0]))

12
polymer/eduke32/source/game.h
View file

@ -311,7 +311,7 @@ int32_t A_Spawn(int32_t j,int32_t pn);
int32_t G_DoMoveThings(void); int32_t G_DoMoveThings(void);
//int32_t G_EndOfLevel(void); //int32_t G_EndOfLevel(void);
int32_t G_GameTextLen(int32_t x,const char *t); int32_t G_GameTextLen(int32_t x,const char *t);
int32_t G_PrintGameText(int32_t hack,int32_t tile,int32_t x,int32_t y,const char *t,int32_t s,int32_t p,int32_t o,int32_t x1,int32_t y1,int32_t x2,int32_t y2,int32_t z); int32_t G_PrintGameText(int32_t hack,int32_t tile,int32_t x,int32_t y,const char *t,int32_t s,int32_t p,int32_t o,int32_t x1,int32_t y1,int32_t x2,int32_t y2,int32_t z, int32_t a);
extern int32_t minitext_lowercase; extern int32_t minitext_lowercase;
int32_t minitext_(int32_t x,int32_t y,const char *t,int32_t s,int32_t p,int32_t sb); int32_t minitext_(int32_t x,int32_t y,const char *t,int32_t s,int32_t p,int32_t sb);
int32_t mpgametext(int32_t y,const char *t,int32_t s,int32_t dabits); int32_t mpgametext(int32_t y,const char *t,int32_t s,int32_t dabits);
@ -401,11 +401,11 @@ static inline int32_t G_GetTeamPalette(int32_t team)
#define minitextshade(x, y, t, s, p, sb) minitext_(x,y,t,s,p,sb) #define minitextshade(x, y, t, s, p, sb) minitext_(x,y,t,s,p,sb)
#define minitext(x, y, t, p, sb) minitext_(x,y,t,0,p,sb) #define minitext(x, y, t, p, sb) minitext_(x,y,t,0,p,sb)
#define menutext(x,y,s,p,t) menutext_(x,y,s,p,(char *)OSD_StripColors(menutextbuf,t),10+16) #define menutext(x,y,s,p,t) menutext_(x,y,s,p,(char *)OSD_StripColors(menutextbuf,t),10+16)
#define gametext(x,y,t,s,dabits) G_PrintGameText(0,STARTALPHANUM, x,y,t,s,0,dabits,0, 0, xdim-1, ydim-1, 65536) #define gametext(x,y,t,s,dabits) G_PrintGameText(0,STARTALPHANUM, x,y,t,s,0,dabits,0, 0, xdim-1, ydim-1, 65536, 0)
#define gametextscaled(x,y,t,s,dabits) G_PrintGameText(1,STARTALPHANUM, x,y,t,s,0,dabits,0, 0, xdim-1, ydim-1, 65536) #define gametextscaled(x,y,t,s,dabits) G_PrintGameText(1,STARTALPHANUM, x,y,t,s,0,dabits,0, 0, xdim-1, ydim-1, 65536, 0)
#define gametextpal(x,y,t,s,p) G_PrintGameText(0,STARTALPHANUM, x,y,t,s,p,26,0, 0, xdim-1, ydim-1, 65536) #define gametextpal(x,y,t,s,p) G_PrintGameText(0,STARTALPHANUM, x,y,t,s,p,26,0, 0, xdim-1, ydim-1, 65536, 0)
#define gametextpalbits(x,y,t,s,p,dabits) G_PrintGameText(0,STARTALPHANUM, x,y,t,s,p,dabits,0, 0, xdim-1, ydim-1, 65536) #define gametextpalbits(x,y,t,s,p,dabits,a) G_PrintGameText(0,STARTALPHANUM, x,y,t,s,p,dabits,0, 0, xdim-1, ydim-1, 65536, a)
#define mpgametext(y, t, s, dabits) G_PrintGameText(4,STARTALPHANUM, 5,y,t,s,0,dabits,0, 0, xdim-1, ydim-1, 65536); #define mpgametext(y, t, s, dabits) G_PrintGameText(4,STARTALPHANUM, 5,y,t,s,0,dabits,0, 0, xdim-1, ydim-1, 65536, 0);
#define A_CheckSpriteFlags(iActor, iType) (((g_tile[sprite[iActor].picnum].flags^actor[iActor].flags) & iType) != 0) #define A_CheckSpriteFlags(iActor, iType) (((g_tile[sprite[iActor].picnum].flags^actor[iActor].flags) & iType) != 0)
// (unsigned)iPicnum check: AMC TC Rusty Nails, bayonet MG alt. fire, iPicnum == -1 (via aplWeaponShoots) // (unsigned)iPicnum check: AMC TC Rusty Nails, bayonet MG alt. fire, iPicnum == -1 (via aplWeaponShoots)

2
polymer/eduke32/source/gameexec.c
View file

@ -2829,7 +2829,7 @@ nullquote:
orientation &= (ROTATESPRITE_MAX-1); orientation &= (ROTATESPRITE_MAX-1);
G_PrintGameText(0,tilenum,x>>1,y,ScriptQuotes[q],shade,pal,orientation,x1,y1,x2,y2,z); G_PrintGameText(0,tilenum,x>>1,y,ScriptQuotes[q],shade,pal,orientation,x1,y1,x2,y2,z,0);
continue; continue;
} }

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

@ -5567,7 +5567,7 @@ void M_DisplayMenus(void)
#ifndef EDUKE32_TOUCH_DEVICES #ifndef EDUKE32_TOUCH_DEVICES
// Display the mouse cursor, except on touch devices. // Display the mouse cursor, except on touch devices.
if (MOUSEACTIVECONDITION) if (MOUSEACTIVECONDITION)
rotatesprite_fs(m_mousepos.x,m_mousepos.y,65536,0,CROSSHAIR,0,CROSSHAIR_PAL,2|1); rotatesprite_fs_alpha(m_mousepos.x, m_mousepos.y, 65536, 0, CROSSHAIR, 0, CROSSHAIR_PAL, 2|1, MOUSEALPHA);
else else
mousepressstate = Mouse_Idle; mousepressstate = Mouse_Idle;
#endif #endif

3
polymer/eduke32/source/menus.h
View file

@ -416,7 +416,7 @@ void M_OpenMenu(size_t playerID);
void M_CloseMenu(size_t playerID); void M_CloseMenu(size_t playerID);
void M_DisplayMenus(void); void M_DisplayMenus(void);
#define M_MOUSETIMEOUT 120 #define M_MOUSETIMEOUT 210
extern int32_t m_mouselastactivity; extern int32_t m_mouselastactivity;
#if defined EDUKE32_TOUCH_DEVICES #if defined EDUKE32_TOUCH_DEVICES
@ -424,6 +424,7 @@ extern int32_t m_mouselastactivity;
# define MOUSEWATCHPOINTCONDITIONAL(condition) (condition) # define MOUSEWATCHPOINTCONDITIONAL(condition) (condition)
#else #else
extern int32_t m_mousewake_watchpoint, m_menuchange_watchpoint; extern int32_t m_mousewake_watchpoint, m_menuchange_watchpoint;
# define MOUSEALPHA (getrendermode() == REND_CLASSIC ? 0 : clamp((totalclock - m_mouselastactivity - 90)*3, 0, 255))
# define MOUSEACTIVECONDITION (totalclock - m_mouselastactivity < M_MOUSETIMEOUT) # define MOUSEACTIVECONDITION (totalclock - m_mouselastactivity < M_MOUSETIMEOUT)
# define MOUSEACTIVECONDITIONAL(condition) (MOUSEACTIVECONDITION && (condition)) # define MOUSEACTIVECONDITIONAL(condition) (MOUSEACTIVECONDITION && (condition))
# define MOUSEINACTIVECONDITIONAL(condition) (!MOUSEACTIVECONDITION && (condition)) # define MOUSEINACTIVECONDITIONAL(condition) (!MOUSEACTIVECONDITION && (condition))