OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Enable the generic start screen and adjust its graphics to show a basic engine logo with a progress bar

Browse source
This commit is contained in:
Magnus Norddahl 2023-10-09 16:33:23 +02:00
commit 709563490f
2 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/common/startscreen/startscreen.cpp
View file

@ -367,7 +367,7 @@ FStartScreen* GetGameStartScreen(int max_progress)
Printf("Error creating start screen: %s\n", err.what());
// fall through to the generic startup screen
}
//return CreateGenericStartScreen(max_progress);
return CreateGenericStartScreen(max_progress);
}
return nullptr;
}

21
src/common/startscreen/startscreen_generic.cpp
View file

@ -72,10 +72,10 @@ FGenericStartScreen::FGenericStartScreen(int max_progress)
: FStartScreen(max_progress)
{
// at this point we do not have a working texture manager yet, so we have to do the lookup via the file system
int startup_lump = fileSystem.CheckNumForName("GZDOOM", ns_graphics);
int startup_lump = fileSystem.CheckNumForName("STARTLOGO", ns_graphics);
StartupBitmap.Create(640, 480);
ClearBlock(StartupBitmap, { 0, 0, 0, 255 }, 0, 0, 640, 480);
StartupBitmap.Create(640 * 2, 480 * 2);
ClearBlock(StartupBitmap, { 0, 0, 0, 255 }, 0, 0, 640 * 2, 480 * 2);
// This also needs to work if the lump turns out to be unusable.
if (startup_lump != -1)
{
@ -83,14 +83,13 @@ FGenericStartScreen::FGenericStartScreen(int max_progress)
if (iBackground)
{
Background = iBackground->GetCachedBitmap(nullptr, FImageSource::normal);
if (Background.GetWidth() < 640 || Background.GetHeight() < 480)
StartupBitmap.Blit(320 - Background.GetWidth()/2, 220 - Background.GetHeight() /2, Background);
if (Background.GetWidth() < 640 * 2 || Background.GetHeight() < 480 * 2)
StartupBitmap.Blit(320 * 2 - Background.GetWidth()/2, 220 * 2 - Background.GetHeight() / 2, Background);
else
StartupBitmap.Blit(0, 0, Background, 640, 480);
StartupBitmap.Blit(0, 0, Background, 640 * 2, 480 * 2);
}
}
CreateHeader();
}
//==========================================================================
@ -107,12 +106,12 @@ bool FGenericStartScreen::DoProgress(int advance)
if (CurPos < MaxPos)
{
RgbQuad bcolor = { 128, 0, 0, 255 }; // todo: make configurable
int numnotches = 512;
notch_pos = ((CurPos + 1) * 512) / MaxPos;
RgbQuad bcolor = { 2, 25, 87, 255 }; // todo: make configurable
int numnotches = 100 * 2;
notch_pos = ((CurPos + 1) * numnotches) / MaxPos;
if (notch_pos != NotchPos)
{ // Time to draw another notch.
ClearBlock(StartupBitmap, bcolor, ST_PROGRESS_X, ST_PROGRESS_Y, notch_pos, 16);
ClearBlock(StartupBitmap, bcolor, (320 - 50) * 2, 250 * 2, notch_pos, 4 * 2);
NotchPos = notch_pos;
StartupTexture->CleanHardwareData(true);
}