Commit afa38600 authored by Oliver Bock's avatar Oliver Bock

Added new/real background image (in compliance with ESO copyright terms)

parent ed51f0e7
...@@ -144,7 +144,8 @@ void PulsarAnimationWidget::initializeGL() ...@@ -144,7 +144,8 @@ void PulsarAnimationWidget::initializeGL()
// load textures // load textures
m_pulsarTexture = bindTexture(QImage(":/textures/resources/texture_pulsar.png"), GL_TEXTURE_2D, GL_RGBA); 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 // use mipmapped textures
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
......
...@@ -167,6 +167,8 @@ void PulsatingScience::on_actionAbout_activated() ...@@ -167,6 +167,8 @@ void PulsatingScience::on_actionAbout_activated()
"<b>Pulsating Science</b><br>" "<b>Pulsating Science</b><br>"
"International Year of Astronomy 2009<br><br>" "International Year of Astronomy 2009<br><br>"
"Authors: Oliver Bock, Benjamin Knispel<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&ouml;ne and C. Feron<br><br>"
"Copyright &copy; 2009 " "Copyright &copy; 2009 "
"<a href=\"http://www.aei.mpg.de\">Max-Planck-Institut f&uuml;r Gravitationsphysik</a>"); "<a href=\"http://www.aei.mpg.de\">Max-Planck-Institut f&uuml;r Gravitationsphysik</a>");
} }
......
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
<file>resources/aei-icon48.png</file> <file>resources/aei-icon48.png</file>
</qresource> </qresource>
<qresource prefix="textures" > <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> <file>resources/texture_pulsar.png</file>
</qresource> </qresource>
</RCC> </RCC>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment