Commit 97ca0079 authored by Oliver Bock's avatar Oliver Bock

Using PNG background texture

* JPG version fails to load on some Macs and on Windoze (static build)
* TODO: try alternatives to reduce the PNG size or fix the root cause
parent 208283d7
...@@ -196,7 +196,7 @@ void PulsarAnimationWidget::initializeGL() ...@@ -196,7 +196,7 @@ void PulsarAnimationWidget::initializeGL()
} }
// prepare and check background texture // prepare and check background texture
QImage backgroundTexture(":/textures/resources/texture_background_carina.jpg"); QImage backgroundTexture(":/textures/resources/texture_background_carina.png");
if(backgroundTexture.width() != backgroundTexture.height()) { if(backgroundTexture.width() != backgroundTexture.height()) {
qWarning() << msgShape.arg(tr("Background")); qWarning() << msgShape.arg(tr("Background"));
} }
...@@ -215,7 +215,7 @@ void PulsarAnimationWidget::initializeGL() ...@@ -215,7 +215,7 @@ void PulsarAnimationWidget::initializeGL()
// bind textures // bind textures
m_pulsarTexture = bindTexture(pulsarTexture, GL_TEXTURE_2D, GL_RGBA); m_pulsarTexture = bindTexture(pulsarTexture, GL_TEXTURE_2D, GL_RGBA);
m_backgroundTexture = bindTexture(backgroundTexture, GL_TEXTURE_2D, GL_RGB); m_backgroundTexture = bindTexture(backgroundTexture, GL_TEXTURE_2D, GL_RGBA);
// 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);
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<file>resources/pulsatingscience_de.qm</file> <file>resources/pulsatingscience_de.qm</file>
</qresource> </qresource>
<qresource prefix="textures" > <qresource prefix="textures" >
<file>resources/texture_background_carina.jpg</file> <file>resources/texture_background_carina.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