Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
einsteinathome
pulsatingscience
Commits
afa38600
Commit
afa38600
authored
Feb 02, 2009
by
Oliver Bock
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added new/real background image (in compliance with ESO copyright terms)
parent
ed51f0e7
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
2 deletions
+6
-2
src/pulsaranimationwidget.cpp
src/pulsaranimationwidget.cpp
+2
-1
src/pulsatingscience.cpp
src/pulsatingscience.cpp
+2
-0
src/pulsatingscience.qrc
src/pulsatingscience.qrc
+2
-1
src/resources/texture_background_carina.jpg
src/resources/texture_background_carina.jpg
+0
-0
src/resources/texture_background_simple.png
src/resources/texture_background_simple.png
+0
-0
No files found.
src/pulsaranimationwidget.cpp
View file @
afa38600
...
...
@@ -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
);
...
...
src/pulsatingscience.cpp
View file @
afa38600
...
...
@@ -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>"
);
}
...
...
src/pulsatingscience.qrc
View file @
afa38600
...
...
@@ -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>
src/resources/texture_background_carina.jpg
0 → 100644
View file @
afa38600
935 KB
src/resources/texture_background.png
→
src/resources/texture_background
_simple
.png
View file @
afa38600
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment