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
8b336f34
Commit
8b336f34
authored
Jul 20, 2010
by
Oliver Bock
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Deleted obsolete stuff (i.e. pulsar texture)
parent
a8b4d0a2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
23 deletions
+0
-23
src/pulsaranimationwidget.cpp
src/pulsaranimationwidget.cpp
+0
-22
src/pulsaranimationwidget.h
src/pulsaranimationwidget.h
+0
-1
No files found.
src/pulsaranimationwidget.cpp
View file @
8b336f34
...
...
@@ -66,7 +66,6 @@ PulsarAnimationWidget::PulsarAnimationWidget(QWidget *parent) :
m_quadricLineOfSightTop2
=
NULL
;
// initialize texture pointers
m_pulsarTexture
=
0
;
m_backgroundTexture
=
0
;
// initial render timing settings
...
...
@@ -116,7 +115,6 @@ PulsarAnimationWidget::~PulsarAnimationWidget()
if
(
m_quadricPulsarSpinAxis
)
gluDeleteQuadric
(
m_quadricLineOfSight
);
if
(
m_quadricPulsarSpinAxisTop1
)
gluDeleteQuadric
(
m_quadricLineOfSightTop1
);
if
(
m_quadricPulsarSpinAxisTop2
)
gluDeleteQuadric
(
m_quadricLineOfSightTop2
);
if
(
m_pulsarTexture
)
deleteTexture
(
m_pulsarTexture
);
if
(
m_backgroundTexture
)
deleteTexture
(
m_backgroundTexture
);
}
...
...
@@ -183,24 +181,6 @@ void PulsarAnimationWidget::initializeGL()
QString
msgPower
=
tr
(
"%1 texture dimensions not a power of 2!"
);
QString
msgSize
=
tr
(
"Maximum texture size exceeded! Scaling down %1 texture to %2x%3..."
);
// prepare and check pulsar texture
QImage
pulsarTexture
(
":/textures/resources/texture_pulsar.png"
);
if
(
pulsarTexture
.
width
()
!=
pulsarTexture
.
height
())
{
qWarning
()
<<
msgShape
.
arg
(
tr
(
"Pulsar"
));
}
else
{
double
integer
=
0.0
;
double
fraction
=
0.0
;
fraction
=
modf
(
log
(
pulsarTexture
.
width
())
/
log
(
2.0
),
&
integer
);
if
(
fraction
>
0.0
)
{
qWarning
()
<<
msgPower
.
arg
(
tr
(
"Pulsar"
));
}
}
if
(
pulsarTexture
.
width
()
>
maxTextureSize
)
{
qWarning
()
<<
msgSize
.
arg
(
tr
(
"pulsar"
).
arg
(
maxTextureSize
).
arg
(
maxTextureSize
));
pulsarTexture
=
pulsarTexture
.
scaled
(
maxTextureSize
,
maxTextureSize
,
Qt
::
IgnoreAspectRatio
,
Qt
::
SmoothTransformation
);
}
// prepare and check background texture
QImage
backgroundTexture
(
":/textures/resources/texture_background_carina.png"
);
if
(
backgroundTexture
.
width
()
!=
backgroundTexture
.
height
())
{
...
...
@@ -220,7 +200,6 @@ void PulsarAnimationWidget::initializeGL()
}
// bind textures
m_pulsarTexture
=
bindTexture
(
pulsarTexture
,
GL_TEXTURE_2D
,
GL_RGBA
);
m_backgroundTexture
=
bindTexture
(
backgroundTexture
,
GL_TEXTURE_2D
,
GL_RGBA
);
// use mipmapped textures
...
...
@@ -263,7 +242,6 @@ void PulsarAnimationWidget::paintGL()
static
GLfloat
mat_diffuse
[]
=
{
0.5
,
0.5
,
0.5
,
1.0
};
static
GLfloat
mat_specular
[]
=
{
1.0
,
1.0
,
1.0
,
1.0
};
static
GLfloat
low_shininess
[]
=
{
2.5
};
static
GLfloat
translucent
[]
=
{
1.0
,
1.0
,
1.0
,
0.33
};
glMaterialfv
(
GL_FRONT
,
GL_AMBIENT
,
no_mat
);
glMaterialfv
(
GL_FRONT
,
GL_DIFFUSE
,
mat_diffuse
);
...
...
src/pulsaranimationwidget.h
View file @
8b336f34
...
...
@@ -85,7 +85,6 @@ private:
GLUquadricObj
*
m_quadricLineOfSightTop1
;
GLUquadricObj
*
m_quadricLineOfSightTop2
;
GLuint
m_pulsarTexture
;
GLuint
m_backgroundTexture
;
int
m_framesPerSecond
;
...
...
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