mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-01-24 17:26:41 +00:00
Code Issues Releases Wiki Activity

tweaks to loading screen; skip short logo entirely because even waiting 2 seconds for nothing is unnecessary

Browse source
This commit is contained in:
fgenesis 2023-06-01 03:56:01 +02:00
parent ccd22f2015
commit b9798a1889
1 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Aquaria/DSQ.cpp
View file

@ -936,19 +936,32 @@ void DSQ::init()
applyPatches(); applyPatches();
precacher.setBaseDir(this->getBaseTexturePath());
precacher.precacheTex("loading/*.png");
Quad *loadbg = new Quad;
loadbg->position = Vector(400,300);
loadbg->color = Vector(0.06f, 0.06f, 0.08f);
loadbg->followCamera = 1;
loadbg->autoWidth = AUTO_VIRTUALWIDTH;
loadbg->autoHeight = AUTO_VIRTUALHEIGHT;
// during early startup we're not updated so AUTO_VIRTUAL* doesn't stick
loadbg->setWidthHeight(getVirtualWidth(), getVirtualHeight());
addRenderObject(loadbg, LR_BACKDROP);
Quad *logo = new Quad("bitblot/logo", Vector(400,300+220));
logo->followCamera = 1;
logo->scale = Vector(0.2f,0.2f);
addRenderObject(logo, LR_HUD);
loading = new Quad("loading/juice", Vector(400,300)); loading = new Quad("loading/juice", Vector(400,300));
loading->alpha = 1.0; loading->alpha = 1.0;
loading->followCamera = 1; loading->followCamera = 1;
loading->setWidthHeight(0,0); loading->setWidthHeight(0,0);
addRenderObject(loading, LR_HUD); addRenderObject(loading, LR_HUD);
Vector loadShift(2, 0);
Vector sz(800.0f/1024.0f, 600.0f/768.0f); Vector sz(800.0f/1024.0f, 600.0f/768.0f);
Quad *tube = new Quad("loading/tube", Vector(400, 300)); Quad *tube = new Quad("loading/tube", Vector(400, 300));
tube->followCamera = 1; tube->followCamera = 1;
tube->scale = sz; tube->scale = sz;
@ -972,6 +985,8 @@ void DSQ::init()
sider->scale = sz; sider->scale = sz;
addRenderObject(sider, LR_HUD); addRenderObject(sider, LR_HUD);
precacher.clear();
render(); render();
@ -1005,6 +1020,15 @@ void DSQ::init()
loadFonts(); loadFonts();
TTFText *url = new TTFText(&fontArialSmall);
url->setText("github.com/AquariaOSE");
url->setAlign(ALIGN_CENTER);
url->followCamera = 1;
url->position = Vector(400, 300+280);
url->alphaMod = 0.75;
url->scale = Vector(0.7f, 0.7f);
addRenderObject(url, LR_HUD);
loadBit(LOAD_FONTS); loadBit(LOAD_FONTS);
setTexturePointers(); setTexturePointers();
@ -1252,7 +1276,6 @@ void DSQ::init()
} }
addRenderObject(fpsText, LR_DEBUG_TEXT); addRenderObject(fpsText, LR_DEBUG_TEXT);
precacher.setBaseDir(this->getBaseTexturePath());
precacher.precacheList("data/precache.txt", loadBitForTexPrecache); precacher.precacheList("data/precache.txt", loadBitForTexPrecache);
setTexturePointers(); setTexturePointers();
@ -1327,6 +1350,9 @@ void DSQ::init()
removeRenderObject(sider); removeRenderObject(sider);
removeRenderObject(label); removeRenderObject(label);
removeRenderObject(tube); removeRenderObject(tube);
removeRenderObject(logo);
removeRenderObject(loadbg);
removeRenderObject(url);
if (useFrameBuffer && frameBuffer.isInited()) if (useFrameBuffer && frameBuffer.isInited())
afterEffectManager = new AfterEffectManager(vars->afterEffectsXDivs,vars->afterEffectsYDivs); afterEffectManager = new AfterEffectManager(vars->afterEffectsXDivs,vars->afterEffectsYDivs);
@ -1337,7 +1363,7 @@ void DSQ::init()
setInputGrab(user.system.grabInput); setInputGrab(user.system.grabInput);
// Go directly to the title in dev mode // Go directly to the title in dev mode
if(isDeveloperKeys()) if(isDeveloperKeys() || (dsq->user.demo.shortLogos && !dsq->user.demo.intro))
title(); title();
else else
enqueueJumpState("BitBlotLogo"); enqueueJumpState("BitBlotLogo");