diff --git a/src/pulsaranimationwidget.cpp b/src/pulsaranimationwidget.cpp index 83ade7b6e175daf3e4b7d4c206437ee727ffca53..9351a8be1378ba39290099183d59d4ff1ffb4396 100644 --- a/src/pulsaranimationwidget.cpp +++ b/src/pulsaranimationwidget.cpp @@ -144,7 +144,8 @@ void PulsarAnimationWidget::initializeGL() // load textures m_pulsarTexture = bindTexture(QImage(":/textures/resources/texture_pulsar.png"), GL_TEXTURE_2D, GL_RGBA); - m_backgroundTexture = bindTexture(QImage(":/textures/resources/texture_background.png"), GL_TEXTURE_2D, GL_RGBA); +// m_backgroundTexture = bindTexture(QImage(":/textures/resources/texture_background_simple.png"), GL_TEXTURE_2D, GL_RGBA); + m_backgroundTexture = bindTexture(QImage(":/textures/resources/texture_background_carina.jpg"), GL_TEXTURE_2D, GL_RGB); // use mipmapped textures glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); diff --git a/src/pulsatingscience.cpp b/src/pulsatingscience.cpp index e85bca55a29699bf6ebfcd0666d012c7b9e3aad6..9cbec148df950e7c3d11b55319d4ef871de0b26a 100644 --- a/src/pulsatingscience.cpp +++ b/src/pulsatingscience.cpp @@ -167,6 +167,8 @@ void PulsatingScience::on_actionAbout_activated() "<b>Pulsating Science</b><br>" "International Year of Astronomy 2009<br><br>" "Authors: Oliver Bock, Benjamin Knispel<br><br>" + "Background image: The Carina Nebula<br>" + "Courtesy of: ESO/IDA/Danish 1.5 m/R.Gendler, J-E. Ovaldsen, C. Thöne and C. Feron<br><br>" "Copyright © 2009 " "<a href=\"http://www.aei.mpg.de\">Max-Planck-Institut für Gravitationsphysik</a>"); } diff --git a/src/pulsatingscience.qrc b/src/pulsatingscience.qrc index 13d531d7d825e7b089cc4724540752aa84d3f25c..166de46e71553a7060d822a33124a681c053526a 100644 --- a/src/pulsatingscience.qrc +++ b/src/pulsatingscience.qrc @@ -10,7 +10,8 @@ <file>resources/aei-icon48.png</file> </qresource> <qresource prefix="textures" > - <file>resources/texture_background.png</file> + <file>resources/texture_background_carina.jpg</file> + <file>resources/texture_background_simple.png</file> <file>resources/texture_pulsar.png</file> </qresource> </RCC> diff --git a/src/resources/texture_background_carina.jpg b/src/resources/texture_background_carina.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e80d02edc500e914d98092bdc6ce308e8eee95b3 Binary files /dev/null and b/src/resources/texture_background_carina.jpg differ diff --git a/src/resources/texture_background.png b/src/resources/texture_background_simple.png similarity index 100% rename from src/resources/texture_background.png rename to src/resources/texture_background_simple.png