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

- added level summary screens and made the fade for the screens an engine feature.

Browse source 
This also hijacks one free element in the shader uniforms for the newly added factor.
This commit is contained in:
Christoph Oelckers 2020-07-01 12:55:32 +02:00
parent 4baf065370
commit 197a35291a
13 changed files with 677 additions and 1504 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/common/2d/v_2ddrawer.cpp
View file

@ -945,8 +945,12 @@ void F2DDrawer::AddPixel(int x1, int y1, uint32_t color)
void F2DDrawer::Clear()
{
mVertices.Clear();
mIndices.Clear();
mData.Clear();
mIsFirstPass = true;
if (!locked)
{
mVertices.Clear();
mIndices.Clear();
mData.Clear();
mIsFirstPass = true;
}
screenFade = 1.f;
}

5
source/common/2d/v_2ddrawer.h
View file

@ -164,6 +164,8 @@ public:
TArray<RenderCommand> mData;
int Width, Height;
bool isIn2D;
bool locked; // prevents clearing of the data so it can be reused multiple times (useful for screen fades)
float screenFade = 1.f;
public:
int fullscreenautoaspect = 0;
int cliptop = -1, clipleft = -1, clipwidth = -1, clipheight = -1;
@ -199,6 +201,9 @@ public:
void AddPixel(int x1, int y1, uint32_t color);
void Clear();
void Lock() { locked = true; }
void SetScreenFade(float factor) { screenFade = factor; }
void Unlock() { locked = false; }
int GetWidth() const { return Width; }
int GetHeight() const { return Height; }
void SetSize(int w, int h) { Width = w; Height = h; }

1
source/common/rendering/gl/gl_shader.cpp
View file

@ -246,7 +246,6 @@ bool FShader::Load(const char * name, const char * vert_prog_lump, const char *
uniform vec4 uTextureBlendColor;
uniform vec4 uTextureModulateColor;
uniform vec4 uTextureAddColor;
uniform vec4 uBlendColor;
uniform vec4 uFogColor;
uniform float uDesaturationFactor;
uniform float uInterpolationFactor;

12
source/common/rendering/hwrenderer/data/hw_renderstate.h
View file

@ -291,7 +291,7 @@ public:
mStreamData.uGradientBottomPlane = { 0.0f, 0.0f, 0.0f, 0.0f };
mStreamData.uSplitTopPlane = { 0.0f, 0.0f, 0.0f, 0.0f };
mStreamData.uSplitBottomPlane = { 0.0f, 0.0f, 0.0f, 0.0f };
mStreamData.uDynLightColor = { 0.0f, 0.0f, 0.0f, 0.0f };
mStreamData.uDynLightColor = { 0.0f, 0.0f, 0.0f, 1.0f };
mStreamData.uDetailParms = { 0.0f, 0.0f, 0.0f, 0.0f };
#ifdef NPOT_EMULATION
mStreamData.uNpotEmulation = { 0,0 };
@ -460,7 +460,15 @@ public:
void SetDynLight(float r, float g, float b)
{
mStreamData.uDynLightColor = { r, g, b, 0.0f };
mStreamData.uDynLightColor.X = r;
mStreamData.uDynLightColor.Y = g;
mStreamData.uDynLightColor.Z = b;
}
void SetScreenFade(float f)
{
// This component is otherwise unused.
mStreamData.uDynLightColor.W = f;
}
void SetObjectColor(PalEntry pe)

2
source/common/rendering/hwrenderer/hw_draw2d.cpp
View file

@ -130,6 +130,7 @@ void Draw2D(F2DDrawer *drawer, FRenderState &state)
vb.UploadData(&vertices[0], vertices.Size(), &indices[0], indices.Size());
state.SetVertexBuffer(&vb);
state.EnableFog(false);
state.SetScreenFade(drawer->screenFade);
for(auto &cmd : commands)
{
@ -226,6 +227,7 @@ void Draw2D(F2DDrawer *drawer, FRenderState &state)
state.EnableBrightmap(true);
state.SetTextureMode(TM_NORMAL);
state.EnableFog(false);
state.SetScreenFade(1);
state.ResetColor();
drawer->mIsFirstPass = false;
twoD.Unclock();

45
source/core/screenjob.cpp
View file

@ -61,16 +61,10 @@ int DImageScreen::Frame(uint64_t clock, bool skiprequest)
}
if (!tex) return 0;
int span = int(clock / 1'000'000);
int light = 255;
if (span < 255) light = span;
else if (fadeoutstart > 0 && span > fadeoutstart - 255) light = fadeoutstart - span;
light = clamp(light, 0, 255);
PalEntry pe(255, light, light, light);
twod->ClearScreen();
DrawTexture(twod, tex, 0, 0, DTA_FullscreenEx, 3, DTA_Color, pe, DTA_LegacyRenderStyle, STYLE_Normal, TAG_DONE);
DrawTexture(twod, tex, 0, 0, DTA_FullscreenEx, 3, DTA_LegacyRenderStyle, STYLE_Normal, TAG_DONE);
// Only end after having faded out.
if (skiprequest&& fadeoutstart < 0) fadeoutstart = span;
return fadeoutstart > 0 && light == 0 ? -1 : 1;
return skiprequest ? -1 : 1;
}
@ -104,19 +98,52 @@ void RunScreenJob(JobDesc *jobs, int count, CompletionFunc completion, bool clea
// Input later needs to be event based so that these screens can do more than be skipped.
inputState.ClearAllInput();
float screenfade = job.job->fadestyle & DScreenJob::fadein ? 0.f : 1.f;
while (true)
{
auto now = I_nsTime();
handleevents();
bool skiprequest = inputState.CheckAllInput();
int state = job.job->Frame(now - startTime, skiprequest);
auto clock = now - startTime;
if (screenfade < 1.f)
{
float ms = (clock / 1'000'000) / job.job->fadetime;
screenfade = clamp(ms, 0.f, 1.f);
twod->SetScreenFade(screenfade);
}
job.job->SetClock(clock);
int state = job.job->Frame(clock, skiprequest);
startTime -= job.job->GetClock() - clock;
// Must lock before displaying.
if (state < 1 && job.job->fadestyle & DScreenJob::fadeout)
twod->Lock();
videoNextPage();
if (state < 1)
{
if (job.job->fadestyle & DScreenJob::fadeout)
{
startTime = now;
float screenfade2;
do
{
now = I_nsTime();
auto clock = now - startTime;
float ms = (clock / 1'000'000) / job.job->fadetime;
screenfade2 = clamp(screenfade - ms, 0.f, 1.f);
twod->SetScreenFade(screenfade2);
if (screenfade2 <= 0.f) twod->Unlock(); // must unlock before displaying.
videoNextPage();
} while (screenfade2 > 0.f);
}
skipped = state < 0;
job.job->Destroy();
job.job->ObjectFlags |= OF_YesReallyDelete;
delete job.job;
twod->SetScreenFade(1);
break;
}
}

31
source/core/screenjob.h
View file

@ -3,12 +3,36 @@
#include "dobject.h"
using CompletionFunc = std::function<void(bool)>;
struct JobDesc;
class DScreenJob : public DObject
{
DECLARE_CLASS(DScreenJob, DObject)
int64_t now;
const int fadestyle;
const float fadetime; // in milliseconds
friend void RunScreenJob(JobDesc* jobs, int count, CompletionFunc completion, bool clearbefore);
public:
enum
{
fadein = 1,
fadeout = 2,
};
DScreenJob(int fade = 0, float fadet = 250.f) : fadestyle(fade), fadetime(fadet) {}
void SetClock(int64_t nsnow)
{
now = nsnow;
}
int64_t GetClock() const
{
return now;
}
virtual int Frame(uint64_t clock, bool skiprequest) = 0;
};
@ -22,17 +46,16 @@ class DImageScreen : public DScreenJob
{
DECLARE_CLASS(DImageScreen, DScreenJob)
int fadeoutstart = -1;
int tilenum = -1;
FGameTexture* tex = nullptr;
public:
DImageScreen(FGameTexture* tile)
DImageScreen(FGameTexture* tile, int fade = DScreenJob::fadein | DScreenJob::fadeout) : DScreenJob(fade)
{
tex = tile;
}
DImageScreen(int tile)
DImageScreen(int tile, int fade = DScreenJob::fadein | DScreenJob::fadeout) : DScreenJob(fade)
{
tilenum = tile;
}

592
source/games/duke/src/2d_d.cpp
View file

@ -160,21 +160,18 @@ static void MiniText(double x, double y, const char* t, int shade, int align = -
class DDRealmsScreen : public DScreenJob
{
public:
DDRealmsScreen() : DScreenJob(fadein | fadeout) {}
int Frame(uint64_t clock, bool skiprequest) override
{
const int duration = 7500;
const uint64_t duration = 7'000'000'000;
const auto tex = tileGetTexture(DREALMS, true);
const int translation = TRANSLATION(Translation_BasePalettes, DREALMSPAL);
int span = int(clock / 1'000'000);
int light = 255;
if (span < 255) light = span;
else if (span > duration - 255) light = duration - span;
light = clamp(light, 0, 255);
PalEntry pe(255, light, light, light);
twod->ClearScreen();
DrawTexture(twod, tex, 0, 0, DTA_FullscreenEx, 3, DTA_TranslationIndex, translation, DTA_Color, pe, DTA_LegacyRenderStyle, STYLE_Normal, TAG_DONE);
return skiprequest ? -1 : span < duration ? 1 : 0;
DrawTexture(twod, tex, 0, 0, DTA_FullscreenEx, 3, DTA_TranslationIndex, translation, DTA_LegacyRenderStyle, STYLE_Normal, TAG_DONE);
return skiprequest ? -1 : clock < duration ? 1 : 0;
}
};
@ -188,26 +185,18 @@ class DTitleScreen : public DScreenJob
{
int soundanm = 0;
public:
DTitleScreen() : DScreenJob(fadein | fadeout) {}
int Frame(uint64_t nsclock, bool skiprequest) override
{
twod->ClearScreen();
int clock = nsclock * 120 / 1'000'000'000;
// Make this draw an empty frame before it ends.
if (clock > (860 + 120))
{
return 0;
}
auto translation = TRANSLATION(Translation_BasePalettes, TITLEPAL);
uint64_t span = nsclock / 1'000'000;
int light = 255;
if (span < 255) light = span;
//else if (span > duration - 255) light = duration - span;
light = clamp(light, 0, 255);
PalEntry pe(255, light, light, light);
twod->ClearScreen();
DrawTexture(twod, tileGetTexture(BETASCREEN, true), 0, 0, DTA_FullscreenEx, 3, DTA_TranslationIndex, translation, DTA_Color, pe, DTA_LegacyRenderStyle, STYLE_Normal, TAG_DONE);
DrawTexture(twod, tileGetTexture(BETASCREEN, true), 0, 0, DTA_FullscreenEx, 3, DTA_TranslationIndex, translation, DTA_LegacyRenderStyle, STYLE_Normal, TAG_DONE);
if (soundanm == 0 && clock >= 120 && clock < 120 + 60)
{
@ -233,20 +222,26 @@ class DTitleScreen : public DScreenJob
double scale = clamp(clock - 120, 0, 60) / 64.;
if (scale > 0.)
DrawTexture(twod, tileGetTexture(DUKENUKEM, true), 160, 104, DTA_FullscreenScale, 3, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200,
DTA_CenterOffset, true, DTA_TranslationIndex, translation, DTA_Color, pe, DTA_ScaleX, scale, DTA_ScaleY, scale, TAG_DONE);
DTA_CenterOffset, true, DTA_TranslationIndex, translation, DTA_ScaleX, scale, DTA_ScaleY, scale, TAG_DONE);
scale = clamp(clock - 220, 0, 30) / 32.;
if (scale > 0.)
DrawTexture(twod, tileGetTexture(THREEDEE, true), 160, 129, DTA_FullscreenScale, 3, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200,
DTA_CenterOffset, true, DTA_TranslationIndex, translation, DTA_Color, pe, DTA_ScaleX, scale, DTA_ScaleY, scale, TAG_DONE);
DTA_CenterOffset, true, DTA_TranslationIndex, translation, DTA_ScaleX, scale, DTA_ScaleY, scale, TAG_DONE);
if (PLUTOPAK)
{
scale = (410 - clamp(clock, 280, 395)) / 16.;
if (scale > 0. && clock > 280)
DrawTexture(twod, tileGetTexture(PLUTOPAKSPRITE+1, true), 160, 151, DTA_FullscreenScale, 3, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200,
DTA_CenterOffset, true, DTA_TranslationIndex, translation, DTA_Color, pe, DTA_ScaleX, scale, DTA_ScaleY, scale, TAG_DONE);
DTA_CenterOffset, true, DTA_TranslationIndex, translation, DTA_ScaleX, scale, DTA_ScaleY, scale, TAG_DONE);
}
if (clock > (860 + 120))
{
return 0;
}
return skiprequest ? -1 : 1;
}
};
@ -287,9 +282,10 @@ void Logo_d(CompletionFunc completion)
class DEpisode1End1 : public DScreenJob
{
int bonuscnt = 0;
int fadeoutstart = -1;
public:
DEpisode1End1() : DScreenJob(fadein | fadeout) {}
int Frame(uint64_t nsclock, bool skiprequest) override
{
static const int breathe[] =
@ -313,18 +309,12 @@ public:
auto translation = TRANSLATION(Translation_BasePalettes, ENDINGPAL);
int totalclock = nsclock * 120 / 1'000'000'000;
if (skiprequest) fadeoutstart = totalclock;
uint64_t span = nsclock / 1'000'000;
int light = 255;
if (span < 255) light = span;
else if (fadeoutstart > 0 && span > fadeoutstart - 255) light = fadeoutstart - span;
light = clamp(light, 0, 255);
PalEntry pe(255, light, light, light);
twod->ClearScreen();
DrawTexture(twod, tileGetTexture(VICTORY1, true), 0, 50, DTA_FullscreenScale, 3, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200,
DTA_TranslationIndex, translation, DTA_Color, pe, DTA_LegacyRenderStyle, STYLE_Normal, TAG_DONE);
DTA_TranslationIndex, translation, DTA_LegacyRenderStyle, STYLE_Normal, TAG_DONE);
// boss
@ -338,7 +328,7 @@ public:
bonuscnt++;
}
DrawTexture(twod, tileGetTexture(bossmove[t + 2], true), bossmove[t + 3], bossmove[t + 4], DTA_FullscreenScale, 3, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200,
DTA_TranslationIndex, translation, DTA_Color, pe, TAG_DONE);
DTA_TranslationIndex, translation, TAG_DONE);
}
// Breathe
@ -347,7 +337,7 @@ public:
if (totalclock >= 750)
{
DrawTexture(twod, tileGetTexture(VICTORY1 + 8, true), 86, 59, DTA_FullscreenScale, 3, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200,
DTA_TranslationIndex, translation, DTA_Color, pe, TAG_DONE);
DTA_TranslationIndex, translation, TAG_DONE);
if (totalclock >= 750 && bonuscnt == 2)
{
S_PlaySound(DUKETALKTOBOSS, CHAN_AUTO, CHANF_UI);
@ -363,11 +353,11 @@ public:
bonuscnt++;
}
DrawTexture(twod, tileGetTexture(breathe[t + 2], true), breathe[t + 3], breathe[t + 4], DTA_FullscreenScale, 3, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200,
DTA_TranslationIndex, translation, DTA_Color, pe, TAG_DONE);
DTA_TranslationIndex, translation, TAG_DONE);
}
}
// Only end after having faded out.
return fadeoutstart > 0 && light == 0 ? -1 : 1;
return skiprequest ? -1 : 1;
}
};
@ -402,6 +392,8 @@ class DEpisode3End : public DImageScreen
int sound = 0;
int64_t waittime = 0;
public:
FGameTexture* getTexture()
{
// Here we must provide a real texture, even if invalid, so that the sounds play.
@ -411,7 +403,7 @@ class DEpisode3End : public DImageScreen
}
public:
DEpisode3End() : DImageScreen(getTexture())
DEpisode3End() : DImageScreen(getTexture(), fadein|fadeout)
{
}
@ -460,7 +452,7 @@ public:
if (!S_CheckSoundPlaying(ENDSEQVOL3SND8))
{
sound++;
waittime = clock + 1'000'000'000;
waittime = clock + SoundEnabled()? 1'000'000'000 : 5'000'000'000; // if sound is off this wouldn't wait without a longer delay here.
}
break;
@ -488,6 +480,8 @@ public:
class DEpisode4Text : public DScreenJob
{
public:
DEpisode4Text() : DScreenJob(fadein | fadeout) {}
int Frame(uint64_t clock, bool skiprequest)
{
@ -510,10 +504,9 @@ class DEpisode4Text : public DScreenJob
class DEpisode5End : public DImageScreen
{
int sound = 0;
int64_t waittime = 0;
public:
DEpisode5End() : DImageScreen(FIREFLYGROWEFFECT)
DEpisode5End() : DImageScreen(FIREFLYGROWEFFECT, fadein|fadeout)
{
}
@ -680,6 +673,32 @@ void bonussequence_d(int num, CompletionFunc completion)
//
//---------------------------------------------------------------------------
void showtwoscreens(CompletionFunc completion)
{
JobDesc jobs[2];
int job = 0;
jobs[job++] = { Create<DImageScreen>(3291), nullptr };
jobs[job++] = { Create<DImageScreen>(3290), nullptr };
RunScreenJob(jobs, job, completion);
}
void doorders(CompletionFunc completion)
{
JobDesc jobs[4];
int job = 0;
for (int i = 0; i < 4; i++)
jobs[job++] = { Create<DImageScreen>(ORDERING + i), nullptr };
RunScreenJob(jobs, job, completion);
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
static void PlayBonusMusic()
{
if (MusicEnabled() && mus_enabled)
@ -692,7 +711,7 @@ class DDukeMultiplayerBonusScreen : public DScreenJob
int playerswhenstarted;
public:
DDukeMultiplayerBonusScreen(int pws)
DDukeMultiplayerBonusScreen(int pws) : DScreenJob(fadein|fadeout)
{
playerswhenstarted = pws;
}
@ -791,295 +810,240 @@ void ShowMPBonusScreen_d(int pws, CompletionFunc completion)
//
//---------------------------------------------------------------------------
void showtwoscreens(CompletionFunc completion)
class DDukeLevelSummaryScreen : public DScreenJob
{
JobDesc jobs[2];
int job = 0;
jobs[job++] = { Create<DImageScreen>(3291), nullptr };
jobs[job++] = { Create<DImageScreen>(3290), nullptr };
RunScreenJob(jobs, job, completion);
}
void doorders(CompletionFunc completion)
{
JobDesc jobs[2];
int job = 0;
for(int i=0;i<4;i++)
jobs[job++] = { Create<DImageScreen>(ORDERING+i), nullptr };
RunScreenJob(jobs, job, completion);
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
#if 1
CCMD(testbonus)
{
if (argv.argc() > 1)
{
//bonussequence_d(strtol(argv[1], nullptr, 0), nullptr);
ShowMPBonusScreen_d(strtol(argv[1], nullptr, 0), nullptr);
}
}
#endif
#if 0
void dobonus(char bonusonly)
{
short tinc,gfx_offset;
//int i, y, xfragtotal, yfragtotal;
short bonuscnt;
bonuscnt = 0;
FX_StopAllSounds();
FX_SetReverb(0);
if(bonusonly) goto FRAGBONUS;
FRAGBONUS:
;
#if 0
inputState.ClearAllInput();
totalclock = 0; tinc = 0;
bonuscnt = 0;
Mus_Stop();
FX_StopAllSounds();
if(playerswhenstarted > 1 && ud.coop != 1 )
{
}
#endif
if(bonusonly || ud.multimode > 1) return;
switch(ud.volume_number)
{
case 1:
gfx_offset = 5;
break;
default:
gfx_offset = 0;
break;
}
const char* lastmapname;
int gfx_offset;
int bonuscnt = 0;
if (ud.volume_number == 0 && ud.last_level == 8 && boardfilename[0])
void SetTotalClock(int tc)
{
lastmapname = strrchr(boardfilename, '\\');
if (!lastmapname) lastmapname = strrchr(boardfilename, '/');
if (!lastmapname) lastmapname = boardfilename;
}
else
{
lastmapname = currentLevel->name;
if (!lastmapname || !*lastmapname) // this isn't right but it's better than no name at all
lastmapname = currentLevel->fileName;
SetClock(tc * (uint64_t)1'000'000'000 / 120);
}
rotatesprite(0,0,65536L,0,BONUSSCREEN+gfx_offset,0,0,2+8+16+64+128,0,0,xdim-1,ydim-1);
menutext_center(20-6,lastmapname);
menutext_center(36-6,"COMPLETED");
gametext_(160,192,"PRESS ANY KEY TO CONTINUE",16,2+8+16);
if (MusicEnabled() && mus_enabled)
S_PlaySound(BONUSMUSIC, CHAN_AUTO, CHANF_UI);
videoNextPage();
inputState.ClearAllInput();
//for(t=0;t<64;t++) palto(0,0,0,63-t);
bonuscnt = 0;
totalclock = 0; tinc = 0;
while( 1 )
public:
DDukeLevelSummaryScreen() : DScreenJob(fadein | fadeout)
{
if(ps[myconnectindex].gm&MODE_EOL)
gfx_offset = BONUSSCREEN + ((ud.volume_number == 1) ? 5 : 0);
if (ud.volume_number == 0 && ud.last_level == 8 && boardfilename[0]) // todo: get rid of this awful hack.
{
rotatesprite(0,0,65536L,0,BONUSSCREEN+gfx_offset,0,0,2+8+16+64+128,0,0,xdim-1,ydim-1);
lastmapname = strrchr(boardfilename, '\\');
if (!lastmapname) lastmapname = strrchr(boardfilename, '/');
if (!lastmapname) lastmapname = boardfilename;
}
else
{
lastmapname = currentLevel->DisplayName();
}
PlayBonusMusic();
}
if( totalclock > (1000000000L) && totalclock < (1000000320L) )
void FormatTime(int time, char* tempbuf)
{
mysnprintf(tempbuf, 32, "%02ld:%02ld", (time / (26 * 60)) % 60, (time / 26) % 60);
}
void PrintTime(int totalclock)
{
char tempbuf[32];
GameText(10, 59 + 9, GStrings("TXT_YourTime"), 0);
GameText(10, 69 + 9, GStrings("TXT_ParTime"), 0);
if (!isNamWW2GI())
GameText(10, 78 + 9, GStrings("TXT_3DRTIME"), 0);
if (bonuscnt == 0)
bonuscnt++;
if (totalclock > (60 * 4))
{
if (bonuscnt == 1)
{
switch( ((int)totalclock>>4)%15 )
{
case 0:
if(bonuscnt == 6)
{
bonuscnt++;
sound(SHOTGUN_COCK);
switch(rand()&3)
{
case 0:
sound(BONUS_SPEECH1);
break;
case 1:
sound(BONUS_SPEECH2);
break;
case 2:
sound(BONUS_SPEECH3);
break;
case 3:
sound(BONUS_SPEECH4);
break;
}
}
case 1:
case 4:
case 5:
rotatesprite(199<<16,31<<16,65536L,0,BONUSSCREEN+3+gfx_offset,0,0,2+8+16+64+128,0,0,xdim-1,ydim-1);
break;
case 2:
case 3:
rotatesprite(199<<16,31<<16,65536L,0,BONUSSCREEN+4+gfx_offset,0,0,2+8+16+64+128,0,0,xdim-1,ydim-1);
break;
}
bonuscnt++;
S_PlaySound(PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI);
}
else if( totalclock > (10240+120L) ) break;
else
FormatTime(ps[myconnectindex].player_par, tempbuf);
GameText((320 >> 2) + 71, 60 + 9, tempbuf, 0);
FormatTime(currentLevel->parTime, tempbuf);
GameText((320 >> 2) + 71, 69 + 9, tempbuf, 0);
if (!isNamWW2GI())
{
switch( ((int)totalclock>>5)&3 )
{
case 1:
case 3:
rotatesprite(199<<16,31<<16,65536L,0,BONUSSCREEN+1+gfx_offset,0,0,2+8+16+64+128,0,0,xdim-1,ydim-1);
break;
case 2:
rotatesprite(199<<16,31<<16,65536L,0,BONUSSCREEN+2+gfx_offset,0,0,2+8+16+64+128,0,0,xdim-1,ydim-1);
break;
}
}
menutext_center(20-6,lastmapname);
menutext_center(36-6,"COMPLETED");
gametext_(160,192,"PRESS ANY KEY TO CONTINUE",16,2+8+16);
if( totalclock > (60*3) )
{
gametext_(10,59+9,"Your Time:",0,2+8+16);
gametext_(10,69+9,"Par time:",0,2+8+16);
if (!isNamWW2GI())
gametext_(10,78+9,"3D Realms' Time:",0,2+8+16);
if(bonuscnt == 0)
bonuscnt++;
if( totalclock > (60*4) )
{
if(bonuscnt == 1)
{
bonuscnt++;
sound(PIPEBOMB_EXPLODE);
}
sprintf(tempbuf,"%02ld:%02ld",
(ps[myconnectindex].player_par/(26*60))%60,
(ps[myconnectindex].player_par/26)%60);
gametext_((320>>2)+71,60+9,tempbuf,0,2+8+16);
sprintf(tempbuf,"%02ld:%02ld",
(currentLevel->parTime / (26*60))%60,
(currentLevel->parTime / 26)%60);
gametext_((320>>2)+71,69+9,tempbuf,0,2+8+16);
if (!isNamWW2GI())
{
mysnprintf(tempbuf, 32, "%02ld:%02ld",
(currentLevel->designerTime / (26 * 60)) % 60,
(currentLevel->designerTime / 26) % 60);
gametext_((320 >> 2) + 71, 78 + 9, tempbuf, 0, 2 + 8 + 16);
}
}
}
if( totalclock > (60*6) )
{
gametext_(10,94+9,"Enemies Killed:",0,2+8+16);
gametext_(10,99+4+9,"Enemies Left:",0,2+8+16);
if(bonuscnt == 2)
{
bonuscnt++;
sound(FLY_BY);
}
if( totalclock > (60*7) )
{
if(bonuscnt == 3)
{
bonuscnt++;
sound(PIPEBOMB_EXPLODE);
}
sprintf(tempbuf,"%-3ld",ps[myconnectindex].actors_killed);
gametext_((320>>2)+70,93+9,tempbuf,0,2+8+16);
if(ud.player_skill > 3 )
{
sprintf(tempbuf,"N/A");
gametext_((320>>2)+70,99+4+9,tempbuf,0,2+8+16);
}
else
{
if( (ps[myconnectindex].max_actors_killed-ps[myconnectindex].actors_killed) < 0 )
sprintf(tempbuf,"%-3ld",0);
else sprintf(tempbuf,"%-3ld",ps[myconnectindex].max_actors_killed-ps[myconnectindex].actors_killed);
gametext_((320>>2)+70,99+4+9,tempbuf,0,2+8+16);
}
}
}
if( totalclock > (60*9) )
{
gametext_(10,120+9,"Secrets Found:",0,2+8+16);
gametext_(10,130+9,"Secrets Missed:",0,2+8+16);
if(bonuscnt == 4) bonuscnt++;
if( totalclock > (60*10) )
{
if(bonuscnt == 5)
{
bonuscnt++;
sound(PIPEBOMB_EXPLODE);
}
sprintf(tempbuf,"%-3d",ps[myconnectindex].secret_rooms);
gametext_((320>>2)+70,120+9,tempbuf,0,2+8+16);
if( ps[myconnectindex].secret_rooms > 0 )
sprintf(tempbuf,"%-3d",(100*ps[myconnectindex].secret_rooms/ps[myconnectindex].max_secret_rooms));
sprintf(tempbuf,"%-3d",ps[myconnectindex].max_secret_rooms-ps[myconnectindex].secret_rooms);
gametext_((320>>2)+70,130+9,tempbuf,0,2+8+16);
}
}
if(totalclock > 10240 && totalclock < 10240+10240)
totalclock = 1024;
if( inputState.CheckAllInput() && totalclock > (60*2) )
{
if( totalclock < (60*13) )
{
inputState.ClearAllInput();
totalclock = (60*13);
}
else if( totalclock < (1000000000L))
totalclock = (1000000000L);
FormatTime(currentLevel->designerTime, tempbuf);
GameText((320 >> 2) + 71, 78 + 9, tempbuf, 0);
}
}
else break;
videoNextPage();
}
void PrintKills(int totalclock)
{
GameText(10, 94 + 9, GStrings("TXT_EnemiesKilled"), 0);
GameText(10, 99 + 4 + 9, GStrings("TXT_EnemiesLeft"), 0);
if (bonuscnt == 2)
{
bonuscnt++;
S_PlaySound(FLY_BY, CHAN_AUTO, CHANF_UI);
}
if (totalclock > (60 * 7))
{
if (bonuscnt == 3)
{
bonuscnt++;
S_PlaySound(PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI);
}
mysnprintf(tempbuf, 32, "%-3ld", ps[myconnectindex].actors_killed);
GameText((320 >> 2) + 70, 93 + 9, tempbuf, 0);
if (ud.player_skill > 3)
{
mysnprintf(tempbuf, 32, GStrings("TXT_N_A"));
GameText((320 >> 2) + 70, 99 + 4 + 9, tempbuf, 0);
}
else
{
if ((ps[myconnectindex].max_actors_killed - ps[myconnectindex].actors_killed) < 0)
mysnprintf(tempbuf, 32, "%-3ld", 0);
else mysnprintf(tempbuf, 32, "%-3ld", ps[myconnectindex].max_actors_killed - ps[myconnectindex].actors_killed);
GameText((320 >> 2) + 70, 99 + 4 + 9, tempbuf, 0);
}
}
}
void PrintSecrets(int totalclock)
{
GameText(10, 120 + 9, GStrings("TXT_SECFND"), 0);
GameText(10, 130 + 9, GStrings("TXT_SECMISS"), 0);
if (bonuscnt == 4) bonuscnt++;
if (totalclock > (60 * 10))
{
if (bonuscnt == 5)
{
bonuscnt++;
S_PlaySound(PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI);
}
mysnprintf(tempbuf, 32, "%-3d", ps[myconnectindex].secret_rooms);
GameText((320 >> 2) + 70, 120 + 9, tempbuf, 0);
if (ps[myconnectindex].secret_rooms > 0)
sprintf(tempbuf, "%-3d", (100 * ps[myconnectindex].secret_rooms / ps[myconnectindex].max_secret_rooms));
mysnprintf(tempbuf, 32, "%-3d", ps[myconnectindex].max_secret_rooms - ps[myconnectindex].secret_rooms);
GameText((320 >> 2) + 70, 130 + 9, tempbuf, 0);
}
}
int Frame(uint64_t clock, bool skiprequest)
{
int totalclock = int(clock * 120 / 1'000'000'000);
DrawTexture(twod, tileGetTexture(gfx_offset, true), 0, 0, DTA_FullscreenEx, 3, DTA_LegacyRenderStyle, STYLE_Normal, TAG_DONE);
if (lastmapname) BigText(160, 20 - 6, lastmapname);
BigText(160, 36 - 6, GStrings("Completed"));
GameText(160, 192, GStrings("PRESSKEY"), (sintable[(totalclock << 5) & 2047] >> 11), 0);
if (totalclock > (60 * 3))
{
PrintTime(totalclock);
}
if (totalclock > (60 * 6))
{
PrintKills(totalclock);
}
if (totalclock > (60 * 9))
{
PrintSecrets(totalclock);
}
if (totalclock > (1000000000L) && totalclock < (1000000320L))
{
int val = (totalclock >> 4) % 15;
if (val == 0)
{
if (bonuscnt == 6)
{
bonuscnt++;
S_PlaySound(SHOTGUN_COCK, CHAN_AUTO, CHANF_UI);
S_PlaySound(BONUS_SPEECH1 + (rand() & 3), CHAN_AUTO, CHANF_UI);
}
}
else
{
int tile = val == 2 || val == 3 ? gfx_offset + 4 : gfx_offset + 3;
DrawTexture(twod, tileGetTexture(tile), 199, 31, DTA_FullscreenScale, 3, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200, TAG_DONE);
}
}
else if (totalclock > (10240 + 120L)) return 0;
else
{
int val = (totalclock >> 5) & 3;
int tile = val == 2 ? gfx_offset + 2 : gfx_offset + 1;
DrawTexture(twod, tileGetTexture(tile), 199, 31, DTA_FullscreenScale, 3, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200, TAG_DONE);
}
if (totalclock > 10240 && totalclock < 10240 + 10240)
SetTotalClock(1024);
if (skiprequest && totalclock > (60 * 2))
{
skiprequest = false;
if (totalclock < (60 * 13))
{
SetTotalClock(60 * 13);
}
else if (totalclock < (1000000000))
SetTotalClock(1000000000);
}
return 1;
}
};
void ShowBonusScreen_d(CompletionFunc completion)
{
PlayBonusMusic();
JobDesc job = { Create<DDukeLevelSummaryScreen>() };
RunScreenJob(&job, 1, completion);
}
// Utility for testing the above screens
CCMD(testscreen)
{
C_HideConsole();
if (argv.argc() > 1)
{
int screen = strtol(argv[1], nullptr, 0);
switch (screen)
{
case 0:
case 1:
case 2:
case 3:
case 4:
case 5:
bonussequence_d(screen, nullptr);
break;
case 6:
ShowMPBonusScreen_d(6, nullptr);
break;
case 7:
showtwoscreens(nullptr);
break;
case 8:
doorders(nullptr);
break;
case 9:
ShowBonusScreen_d(nullptr);
break;
}
}
}
#endif
END_DUKE_NS

1082
source/games/duke/src/2d_r.cpp
View file

File diff suppressed because it is too large Load diff

6
source/games/duke/src/sounds.cpp
View file

@ -638,4 +638,10 @@ void S_PlayRRMusic(int newTrack)
}
void PlayBonusMusic()
{
if (MusicEnabled() && mus_enabled)
S_PlaySound(BONUSMUSIC, CHAN_AUTO, CHANF_UI);
}
END_DUKE_NS

1
source/games/duke/src/sounds.h
View file

@ -94,6 +94,7 @@ int S_GetUserFlags(int sndnum);
int S_DefineSound(unsigned index, const char* filename, int ps, int pe, int pr, int m, int vo, float vol);
void S_InitSound();
void S_PlayRRMusic(int newTrack = -1);
void PlayBonusMusic();
inline bool S_IsSoundValid(int num)
{

390
source/games/duke/src/zz_screens.cpp
View file

@ -46,13 +46,6 @@ double g_moveActorsTime, g_moveWorldTime; // in ms, smoothed
int32_t g_noLogoAnim = 0;
int32_t g_noLogo = 0;
void PlayBonusMusic()
{
if (MusicEnabled() && mus_enabled)
S_PlaySound(BONUSMUSIC, CHAN_AUTO, CHANF_UI);
}
////////// OFTEN-USED FEW-LINERS //////////
static void G_HandleEventsWhileNoInput(void)
{
@ -515,10 +508,6 @@ static void G_DrawOverheadMap(int32_t cposx, int32_t cposy, int32_t czoom, int16
}
}
#ifdef DEBUGGINGAIDS
sprstat_t g_spriteStat;
#endif
FString G_PrintCoords(int32_t snum)
{
const int32_t x = g_Debug ? 288 : 0;
@ -551,17 +540,6 @@ FString G_PrintCoords(int32_t snum)
out.AppendFormat("\nTHOLD= %d ", ps->transporter_hold);
out.AppendFormat("GAMETIC= %u, TOTALCLOCK=%d\n", g_moveThingsCount, (int32_t)totalclock);
#ifdef DEBUGGINGAIDS
out.AppendFormat("NUMSPRITES= %d\n", Numsprites);
if (g_moveThingsCount > g_spriteStat.lastgtic + REALGAMETICSPERSEC)
{
g_spriteStat.lastgtic = g_moveThingsCount;
g_spriteStat.lastnumins = g_spriteStat.numins;
g_spriteStat.numins = 0;
}
out.AppendFormat("INSERTIONS/s= %u\n", g_spriteStat.lastnumins);
out.AppendFormat("ONSCREEN= %d\n", g_spriteStat.numonscreen);
#endif
out.AppendFormat("\nVR=%.03f YX=%.03f", (double)dr_viewingrange / 65536.0, (double)dr_yxaspect / 65536.0);
return out;
}
@ -1099,24 +1077,8 @@ const char* G_PrintBestTime(void)
void G_BonusScreen(int32_t bonusonly)
{
int32_t gfx_offset;
int32_t bonuscnt;
int32_t clockpad = 2;
const char *lastmapname;
//if (g_networkMode == NET_DEDICATED_SERVER)
// return;
if (ud.volume_number == 0 && ud.last_level == 8 && boardfilename[0])
{
lastmapname = Bstrrchr(boardfilename, '\\');
if (!lastmapname) lastmapname = Bstrrchr(boardfilename, '/');
if (!lastmapname) lastmapname = boardfilename;
}
else
{
lastmapname = currentLevel->DisplayName();
}
fadepal(0, 0, 0, 0, 252, RR ? 4 : 28);
videoSetViewableArea(0, 0, xdim-1, ydim-1);
@ -1150,353 +1112,9 @@ void G_BonusScreen(int32_t bonusonly)
if (bonusonly || (g_netServer || ud.multimode > 1)) return;
if (!RR)
{
gfx_offset = (ud.volume_number==1) ? 5 : 0;
gfx_offset += TILE_BONUSSCREEN;
rotatesprite_fs(160<<16, 100<<16, 65536L, 0, gfx_offset, 0, 0, 2+8+64+128+BGSTRETCH);
//if (!RR) ShowBonusScreen_d();
//else ShowMPBonusScreen_r();
if (lastmapname)
menutext_center(20-6, lastmapname);
menutext_center(36-6, GStrings("Completed"));
gametext_center_shade(192, GStrings("PRESSKEY"), quotepulseshade);
PlayBonusMusic();
}
else
{
gfx_offset = (ud.volume_number==0) ? TILE_RRTILE403 : TILE_RRTILE409;
gfx_offset += ud.level_number-1;
if (g_lastLevel || g_vixenLevel)
gfx_offset = TILE_RRTILE409+7;
if (boardfilename[0])
gfx_offset = TILE_RRTILE403;
rotatesprite_fs(160<<16, 100<<16, 65536L, 0, gfx_offset, 0, 0, 2+8+64+128+BGSTRETCH);
if (lastmapname)
menutext(80,16, lastmapname);
menutext(15, 192, GStrings("PRESSKEY"));
}
videoNextPage();
inputState.ClearAllInput();
fadepal(0, 0, 0, 252, 0, -4);
bonuscnt = 0;
totalclock = 0;
do
{
int32_t yy = 0, zz;
G_HandleAsync();
if (G_FPSLimit())
{
if (g_player[myconnectindex].ps->gm&MODE_EOL)
{
videoClearScreen(0);
rotatesprite_fs(160<<16, 100<<16, 65536L, 0, gfx_offset, 0, 0, 2+8+64+128+BGSTRETCH);
if (totalclock >= 1000000000 && totalclock < 1000000320)
{
switch (((int32_t) totalclock>>4)%15)
{
case 0:
if (bonuscnt == 6)
{
bonuscnt++;
S_PlaySound(RR ? 425 : SHOTGUN_COCK, CHAN_AUTO, CHANF_UI);
switch (rand()&3)
{
case 0:
S_PlaySound(BONUS_SPEECH1, CHAN_AUTO, CHANF_UI);
break;
case 1:
S_PlaySound(BONUS_SPEECH2, CHAN_AUTO, CHANF_UI);
break;
case 2:
S_PlaySound(BONUS_SPEECH3, CHAN_AUTO, CHANF_UI);
break;
case 3:
S_PlaySound(BONUS_SPEECH4, CHAN_AUTO, CHANF_UI);
break;
}
}
fallthrough__;
case 1:
case 4:
case 5:
if (!RR)
rotatesprite_fs(199<<16, 31<<16, 65536L, 0, 3+gfx_offset, 0, 0, 2+8+16+64+128+BGSTRETCH);
break;
case 2:
case 3:
if (!RR)
rotatesprite_fs(199<<16, 31<<16, 65536L, 0, 4+gfx_offset, 0, 0, 2+8+16+64+128+BGSTRETCH);
break;
}
}
else if (totalclock > (10240+120L)) break;
else
{
switch (((int32_t) totalclock>>5)&3)
{
case 1:
case 3:
if (!RR)
rotatesprite_fs(199<<16, 31<<16, 65536L, 0, 1+gfx_offset, 0, 0, 2+8+16+64+128+BGSTRETCH);
break;
case 2:
if (!RR)
rotatesprite_fs(199<<16, 31<<16, 65536L, 0, 2+gfx_offset, 0, 0, 2+8+16+64+128+BGSTRETCH);
break;
}
}
if (!RR)
{
if (lastmapname)
menutext_center(20-6, lastmapname);
menutext_center(36-6, GStrings("Completed"));
gametext_center_shade(192, GStrings("PRESSKEY"), quotepulseshade);
}
else
{
if (lastmapname)
menutext(80, 16, lastmapname);
menutext(15, 192, GStrings("PRESSKEY"));
}
const int yystep = RR ? 16 : 10;
if (totalclock > (60*3))
{
yy = zz = RR ? 48 : 59;
if (!RR)
gametext(10, yy+9, GStrings("TXT_YourTime"));
else
menutext(30, yy, GStrings("TXT_YerTime"));
yy+= yystep;
if (!(ud.volume_number == 0 && ud.last_level-1 == 7 && boardfilename[0]))
{
if (currentLevel->parTime)
{
if (!RR)
gametext(10, yy+9, GStrings("TXT_ParTime"));
else
menutext(30, yy, GStrings("TXT_ParTime"));
yy+=yystep;
}
if (currentLevel->designerTime)
{
// EDuke 2.0 / NAM source suggests "Green Beret's Time:"
if (DUKE)
gametext(10, yy+9, GStrings("TXT_3DRTIME"));
else if (RR)
menutext(30, yy, GStrings("TXT_XTRTIME"));
yy+=yystep;
}
}
if (ud.playerbest > 0)
{
if (!RR)
gametext(10, yy+9, (g_player[myconnectindex].ps->player_par > 0 && g_player[myconnectindex].ps->player_par < ud.playerbest) ? "Prev Best Time:" : "Your Best Time:");
else
menutext(30, yy, (g_player[myconnectindex].ps->player_par > 0 && g_player[myconnectindex].ps->player_par < ud.playerbest) ? "Prev Best:" : "Yer Best:");
yy += yystep;
}
if (bonuscnt == 0)
bonuscnt++;
yy = zz;
if (totalclock >(60*4))
{
if (bonuscnt == 1)
{
bonuscnt++;
S_PlaySound(RR ? 404 : PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI);
}
if (g_player[myconnectindex].ps->player_par > 0)
{
G_PrintYourTime();
if (!RR)
{
gametext_number((320>>2)+71, yy+9, tempbuf);
if (g_player[myconnectindex].ps->player_par < ud.playerbest)
gametext((320>>2)+89+(clockpad*24), yy+9, GStrings("TXT_NEWRECORD"));
}
else
{
menutext(191, yy, tempbuf);
//if (g_player[myconnectindex].ps->player_par < ud.playerbest)
// menutext(191 + 30 + (clockpad*24), yy, "New record!");
}
}
else if (!RR)
gametext_pal((320>>2)+71, yy+9, GStrings("TXT_Cheated"), 2);
else
menutext(191, yy, GStrings("TXT_Cheated"));
yy+=yystep;
if (!(ud.volume_number == 0 && ud.last_level-1 == 7 && boardfilename[0]))
{
if (currentLevel->parTime)
{
G_PrintParTime();
if (!RR)
gametext_number((320>>2)+71, yy+9, tempbuf);
else
menutext(191, yy, tempbuf);
yy+=yystep;
}
if (currentLevel->designerTime)
{
G_PrintDesignerTime();
if (DUKE)
gametext_number((320>>2)+71, yy+9, tempbuf);
else if (RR)
menutext(191, yy, tempbuf);
yy+=yystep;
}
}
if (ud.playerbest > 0)
{
G_PrintBestTime();
if (!RR)
gametext_number((320>>2)+71, yy+9, tempbuf);
else
menutext(191, yy, tempbuf);
yy+=yystep;
}
}
}
zz = yy += RR ? 16 : 5;
if (totalclock > (60*6))
{
if (!RR)
gametext(10, yy+9, GStrings("TXT_EnemiesKilled"));
else
menutext(30, yy, GStrings("TXT_VarmintsKilled"));
yy += yystep;
if (!RR)
gametext(10, yy+9, GStrings("TXT_EnemiesLeft"));
else
menutext(30, yy, GStrings("TXT_VarmintsLeft"));
yy += yystep;
if (bonuscnt == 2)
{
bonuscnt++;
if (!RR)
S_PlaySound(FLY_BY, CHAN_AUTO, CHANF_UI);
}
yy = zz;
if (totalclock > (60*7))
{
if (bonuscnt == 3)
{
bonuscnt++;
S_PlaySound(RR ? 422 : PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI);
}
Bsprintf(tempbuf, "%-3d", g_player[myconnectindex].ps->actors_killed);
if (!RR)
gametext_number((320>>2)+70, yy+9, tempbuf);
else
menutext(231,yy,tempbuf);
yy += yystep;
if (ud.player_skill > 3 && !RR)
{
if (!RR)
gametext((320>>2)+70, yy+9, GStrings("TXT_N_A"));
else
menutext(231,yy, GStrings("TXT_N_A"));
yy += yystep;
}
else
{
if ((g_player[myconnectindex].ps->max_actors_killed-g_player[myconnectindex].ps->actors_killed) < 0)
Bsprintf(tempbuf, "%-3d", 0);
else Bsprintf(tempbuf, "%-3d", g_player[myconnectindex].ps->max_actors_killed-g_player[myconnectindex].ps->actors_killed);
if (!RR)
gametext_number((320>>2)+70, yy+9, tempbuf);
else
menutext(231, yy, tempbuf);
yy += yystep;
}
}
}
zz = yy += RR ? 0 : 5;
if (totalclock > (60*9))
{
if (!RR)
gametext(10, yy+9, GStrings("TXT_SECFND"));
else
menutext(30, yy, GStrings("TXT_SECFND"));
yy += yystep;
if (!RR)
gametext(10, yy+9, GStrings("TXT_SECMISS"));
else
menutext(30, yy, GStrings("TXT_SECMISS"));
yy += yystep;
if (bonuscnt == 4) bonuscnt++;
yy = zz;
if (totalclock > (60*10))
{
if (bonuscnt == 5)
{
bonuscnt++;
S_PlaySound(RR ? 404 : PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI);
}
Bsprintf(tempbuf, "%-3d", g_player[myconnectindex].ps->secret_rooms);
if (!RR)
gametext_number((320>>2)+70, yy+9, tempbuf);
else
menutext(231, yy, tempbuf);
yy += yystep;
Bsprintf(tempbuf, "%-3d", g_player[myconnectindex].ps->max_secret_rooms-g_player[myconnectindex].ps->secret_rooms);
if (!RR)
gametext_number((320>>2)+70, yy+9, tempbuf);
else
menutext(231, yy, tempbuf);
yy += yystep;
}
}
if (totalclock > 10240 && totalclock < 10240+10240)
totalclock = 1024;
if (inputState.CheckAllInput() && totalclock >(60*2)) // JBF 20030809
{
if (totalclock < (60*13))
{
totalclock = (60*13);
}
else if (totalclock < 1000000000)
totalclock = 1000000000;
}
}
else
break;
videoNextPage();
}
} while (1);
if (g_turdLevel)
g_turdLevel = 0;
if (g_vixenLevel)
@ -1564,7 +1182,7 @@ void G_ShowMapFrame(void)
rotatesprite_fs(160<<16,100<<16,65536L,0,TILE_RRTILE8624+frame,0,0,10+64+128);
}
void PlayMapAnim(CompletionFunc completion);
void PlayMapAnim(int v, int m, CompletionFunc completion);
void G_BonusScreenRRRA(int32_t bonusonly)
@ -1682,7 +1300,7 @@ void G_BonusScreenRRRA(int32_t bonusonly)
{
bonuscnt++;
Mus_Stop();
PlayMapAnim([](bool) {});
PlayMapAnim(ud.volume_number, ud.level_number, [](bool) {});
break;
}
}

2
wadsrc/static/shaders/glsl/main.fp
View file

@ -773,7 +773,7 @@ void main()
frag = frag * ProcessLight(material, vColor);
frag.rgb = frag.rgb + uFogColor.rgb;
}
FragColor = frag;
FragColor = vec4(frag.rgb * uDynLightColor.a, frag.a); // apply a global fade factor.
#ifdef GBUFFER_PASS
FragFog = vec4(AmbientOcclusionColor(), 1.0);
FragNormal = vec4(vEyeNormal.xyz * 0.5 + 0.5, 1.0);