Skip to content

Commit

Permalink
Remove hard-coded startup logo (Closes: #417)
Browse files Browse the repository at this point in the history
  • Loading branch information
@375gnu
375gnu committed Oct 9, 2019
1 parent e3baaad commit 17db71b
Show file tree
Hide file tree
Showing 26 changed files with 185 additions and 48 deletions.
0 textures/logo.png → images/logo.png
View file
File renamed without changes
8 changes: 8 additions & 0 deletions locale/start_be.cel
View file
Expand Up @@ -24,6 +24,14 @@
# *
#****************************************************************************

overlay {
duration 5.0
fadeafter 4.0
colortop "#9999ff"
colorbottom "#ccccff"
filename "logo.png"
}

preloadtex { object "Sol/Earth" }
preloadtex { object "Sol/Earth/Moon" }

Expand Down
8 changes: 8 additions & 0 deletions locale/start_bg.cel
View file
Expand Up @@ -23,6 +23,14 @@
# *
#********************************************************************************

overlay {
duration 5.0
fadeafter 4.0
colortop "#9999ff"
colorbottom "#ccccff"
filename "logo.png"
}

preloadtex { object "Sol/Earth" }
preloadtex { object "Sol/Earth/Moon" }

Expand Down
8 changes: 8 additions & 0 deletions locale/start_de.cel
View file
Expand Up @@ -32,6 +32,14 @@
# *
#****************************************************************************

overlay {
duration 5.0
fadeafter 4.0
colortop "#9999ff"
colorbottom "#ccccff"
filename "logo.png"
}

preloadtex { object "Sol/Earth" }
preloadtex { object "Sol/Earth/Moon" }

Expand Down
8 changes: 8 additions & 0 deletions locale/start_es.cel
View file
Expand Up @@ -24,6 +24,14 @@
# *
#****************************************************************************

overlay {
duration 5.0
fadeafter 4.0
colortop "#9999ff"
colorbottom "#ccccff"
filename "logo.png"
}

preloadtex { object "Sol/Earth" }
preloadtex { object "Sol/Earth/Moon" }

Expand Down
8 changes: 8 additions & 0 deletions locale/start_fr.cel
View file
Expand Up @@ -24,6 +24,14 @@
# *
#****************************************************************************

overlay {
duration 5.0
fadeafter 4.0
colortop "#9999ff"
colorbottom "#ccccff"
filename "logo.png"
}

preloadtex { object "Sol/Earth" }
preloadtex { object "Sol/Earth/Moon" }

Expand Down
10 changes: 9 additions & 1 deletion locale/start_gl.cel
View file
Expand Up @@ -27,6 +27,14 @@
# *
#****************************************************************************

overlay {
duration 5.0
fadeafter 4.0
colortop "#9999ff"
colorbottom "#ccccff"
filename "logo.png"
}

preloadtex { object "Sol/Earth" }
preloadtex { object "Sol/Earth/Moon" }

Expand Down Expand Up @@ -325,4 +333,4 @@


# Fin do script...
}
}
8 changes: 8 additions & 0 deletions locale/start_hu.cel
View file
Expand Up @@ -24,6 +24,14 @@
# *
#****************************************************************************

overlay {
duration 5.0
fadeafter 4.0
colortop "#9999ff"
colorbottom "#ccccff"
filename "logo.png"
}

preloadtex { object "Sol/Earth" }
preloadtex { object "Sol/Earth/Moon" }

Expand Down
8 changes: 8 additions & 0 deletions locale/start_it.cel
View file
Expand Up @@ -24,6 +24,14 @@
# *
#****************************************************************************

overlay {
duration 5.0
fadeafter 4.0
colortop "#9999ff"
colorbottom "#ccccff"
filename "logo.png"
}

preloadtex { object "Sol/Earth" }
preloadtex { object "Sol/Earth/Moon" }

Expand Down
8 changes: 8 additions & 0 deletions locale/start_ja.cel
View file
Expand Up @@ -23,6 +23,14 @@
# *
#****************************************************************************

overlay {
duration 5.0
fadeafter 4.0
colortop "#9999ff"
colorbottom "#ccccff"
filename "logo.png"
}

preloadtex { object "Sol/Earth" }
preloadtex { object "Sol/Earth/Moon" }

Expand Down
8 changes: 8 additions & 0 deletions locale/start_ko.cel
View file
Expand Up @@ -21,6 +21,14 @@
# *
#****************************************************************************

overlay {
duration 5.0
fadeafter 4.0
colortop "#9999ff"
colorbottom "#ccccff"
filename "logo.png"
}

preloadtex { object "Sol/Earth" }
preloadtex { object "Sol/Earth/Moon" }

Expand Down
8 changes: 8 additions & 0 deletions locale/start_lt.cel
View file
Expand Up @@ -24,6 +24,14 @@
# *
#****************************************************************************

overlay {
duration 5.0
fadeafter 4.0
colortop "#9999ff"
colorbottom "#ccccff"
filename "logo.png"
}

preloadtex { object "Sol/Earth" }
preloadtex { object "Sol/Earth/Moon" }

Expand Down
8 changes: 8 additions & 0 deletions locale/start_lv.cel
View file
Expand Up @@ -24,6 +24,14 @@
# *
#****************************************************************************

overlay {
duration 5.0
fadeafter 4.0
colortop "#9999ff"
colorbottom "#ccccff"
filename "logo.png"
}

preloadtex { object "Sol/Earth" }
preloadtex { object "Sol/Earth/Moon" }

Expand Down
8 changes: 8 additions & 0 deletions locale/start_nl.cel
View file
Expand Up @@ -30,6 +30,14 @@
# *
#****************************************************************************

overlay {
duration 5.0
fadeafter 4.0
colortop "#9999ff"
colorbottom "#ccccff"
filename "logo.png"
}

preloadtex { object "Sol/Earth" }
preloadtex { object "Sol/Earth/Moon" }

Expand Down
8 changes: 8 additions & 0 deletions locale/start_pl.cel
View file
Expand Up @@ -24,6 +24,14 @@
# *
#****************************************************************************

overlay {
duration 5.0
fadeafter 4.0
colortop "#9999ff"
colorbottom "#ccccff"
filename "logo.png"
}

preloadtex { object "Sol/Earth" }
preloadtex { object "Sol/Earth/Moon" }

Expand Down
8 changes: 8 additions & 0 deletions locale/start_pt.cel
View file
Expand Up @@ -24,6 +24,14 @@
# *
#****************************************************************************

overlay {
duration 5.0
fadeafter 4.0
colortop "#9999ff"
colorbottom "#ccccff"
filename "logo.png"
}

preloadtex { object "Sol/Earth" }
preloadtex { object "Sol/Earth/Moon" }

Expand Down
8 changes: 8 additions & 0 deletions locale/start_pt_BR.cel
View file
Expand Up @@ -24,6 +24,14 @@
# *
#****************************************************************************

overlay {
duration 5.0
fadeafter 4.0
colortop "#9999ff"
colorbottom "#ccccff"
filename "logo.png"
}

preloadtex { object "Sol/Earth" }
preloadtex { object "Sol/Earth/Moon" }

Expand Down
8 changes: 8 additions & 0 deletions locale/start_ru.cel
View file
Expand Up @@ -32,6 +32,14 @@
# *
#****************************************************************************

overlay {
duration 5.0
fadeafter 4.0
colortop "#9999ff"
colorbottom "#ccccff"
filename "logo.png"
}

preloadtex { object "Sol/Earth" }
preloadtex { object "Sol/Earth/Moon" }

Expand Down
8 changes: 8 additions & 0 deletions locale/start_sk.cel
View file
Expand Up @@ -24,6 +24,14 @@
# *
#****************************************************************************

overlay {
duration 5.0
fadeafter 4.0
colortop "#9999ff"
colorbottom "#ccccff"
filename "logo.png"
}

preloadtex { object "Sol/Earth" }
preloadtex { object "Sol/Earth/Moon" }

Expand Down
8 changes: 8 additions & 0 deletions locale/start_sv.cel
View file
Expand Up @@ -25,6 +25,14 @@
# *
#****************************************************************************

overlay {
duration 5.0
fadeafter 4.0
colortop "#9999ff"
colorbottom "#ccccff"
filename "logo.png"
}

preloadtex { object "Sol/Earth" }
preloadtex { object "Sol/Earth/Moon" }

Expand Down
8 changes: 8 additions & 0 deletions locale/start_uk.cel
View file
Expand Up @@ -24,6 +24,14 @@
# *
#****************************************************************************

overlay {
duration 5.0
fadeafter 4.0
colortop "#9999ff"
colorbottom "#ccccff"
filename "logo.png"
}

preloadtex { object "Sol/Earth" }
preloadtex { object "Sol/Earth/Moon" }

Expand Down
8 changes: 8 additions & 0 deletions locale/start_zh_CN.cel
View file
Expand Up @@ -24,6 +24,14 @@
# *
#****************************************************************************

overlay {
duration 5.0
fadeafter 4.0
colortop "#9999ff"
colorbottom "#ccccff"
filename "logo.png"
}

preloadtex { object "Sol/Earth" }
preloadtex { object "Sol/Earth/Moon" }

Expand Down
8 changes: 8 additions & 0 deletions locale/start_zh_TW.cel
View file
Expand Up @@ -27,6 +27,14 @@
# *
#****************************************************************************

overlay {
duration 5.0
fadeafter 4.0
colortop "#9999ff"
colorbottom "#ccccff"
filename "logo.png"
}

preloadtex { object "Sol/Earth" }
preloadtex { object "Sol/Earth/Moon" }

Expand Down
45 changes: 0 additions & 45 deletions src/celestia/celestiacore.cpp
View file
Expand Up @@ -3602,45 +3602,6 @@ void CelestiaCore::renderOverlay()
overlay->restorePos();
}

// Show logo at start
if (logoTexture != nullptr)
{
glEnable(GL_TEXTURE_2D);
if (currentTime < 5.0)
{
int xSize = (int) (logoTexture->getWidth() * 0.8f);
int ySize = (int) (logoTexture->getHeight() * 0.8f);
int left = (width - xSize) / 2;
int bottom = height / 2;

float topAlpha, botAlpha;
if (currentTime < 4.0)
{
botAlpha = (float) clamp(currentTime / 1.0);
topAlpha = (float) clamp(currentTime / 4.0);
}
else
{
botAlpha = topAlpha = (float) (5.0 - currentTime);
}

logoTexture->bind();
vector<Color> c = {
{0.8f, 0.8f, 1.0f, botAlpha},
{0.8f, 0.8f, 1.0f, botAlpha},
{0.6f, 0.6f, 1.0f, topAlpha},
{0.6f, 0.6f, 1.0f, topAlpha}
};
Overlay::Rectangle r(left, bottom, xSize, ySize, c, Overlay::RectType::Textured);
overlay->rect(r);
}
else
{
delete logoTexture;
logoTexture = nullptr;
}
}

overlay->end();
setlocale(LC_NUMERIC, "C");
}
Expand Down Expand Up @@ -4022,12 +3983,6 @@ bool CelestiaCore::initRenderer()
}

renderer->setFont(Renderer::FontLarge, titleFont);

if (config->logoTextureFile != "")
{
logoTexture = LoadTextureFromFile(fs::path("textures") / config->logoTextureFile);
}

return true;
}

Expand Down

0 comments on commit 17db71b

Please sign in to comment.