Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
einsteinathome
pulsatingscience
Commits
142c8c6c
Commit
142c8c6c
authored
Sep 07, 2017
by
Oliver Bock
Browse files
Repurpose unused elements to build LHO (fixed position)
parent
da11546c
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/pulsaranimationwidget.cpp
View file @
142c8c6c
...
...
@@ -61,8 +61,8 @@ PulsarAnimationWidget::PulsarAnimationWidget(QWidget *parent) :
m_quadricPulsarCone2Shell
=
NULL
;
m_quadricPulsarSpinAxis
=
NULL
;
m_quadricPulsarSpinAxisTop1
=
NULL
;
m_quadric
PulsarSpinAxisTop2
=
NULL
;
m_quadric
PulsarMagneticAxis
=
NULL
;
m_quadric
LHOv
=
NULL
;
m_quadric
LHOh
=
NULL
;
// initialize texture pointers
m_backgroundTexture
=
0
;
...
...
@@ -122,8 +122,8 @@ PulsarAnimationWidget::~PulsarAnimationWidget()
if
(
m_quadricPulsarCone2Shell
)
gluDeleteQuadric
(
m_quadricPulsarCone2Shell
);
if
(
m_quadricPulsarSpinAxis
)
gluDeleteQuadric
(
m_quadricPulsarSpinAxis
);
if
(
m_quadricPulsarSpinAxisTop1
)
gluDeleteQuadric
(
m_quadricPulsarSpinAxisTop1
);
if
(
m_quadric
PulsarSpinAxisTop2
)
gluDeleteQuadric
(
m_quadric
PulsarSpinAxisTop2
);
if
(
m_quadric
PulsarMagneticAxis
)
gluDeleteQuadric
(
m_quadric
PulsarMagneticAxis
);
if
(
m_quadric
LHOv
)
gluDeleteQuadric
(
m_quadric
LHOv
);
if
(
m_quadric
LHOh
)
gluDeleteQuadric
(
m_quadric
LHOh
);
if
(
m_backgroundTexture
)
deleteTexture
(
m_backgroundTexture
);
if
(
m_beamTexture
)
deleteTexture
(
m_beamTexture
);
...
...
@@ -167,8 +167,8 @@ void PulsarAnimationWidget::initializeGL()
m_quadricPulsarCone2Shell
=
gluNewQuadric
();
m_quadricPulsarSpinAxis
=
gluNewQuadric
();
m_quadricPulsarSpinAxisTop1
=
gluNewQuadric
();
m_quadric
PulsarSpinAxisTop2
=
gluNewQuadric
();
m_quadric
PulsarMagneticAxis
=
gluNewQuadric
();
m_quadric
LHOv
=
gluNewQuadric
();
m_quadric
LHOh
=
gluNewQuadric
();
gluQuadricNormals
(
m_quadricCompanionOrbitPlane
,
GLU_SMOOTH
);
gluQuadricNormals
(
m_quadricCompanion
,
GLU_SMOOTH
);
...
...
@@ -178,8 +178,8 @@ void PulsarAnimationWidget::initializeGL()
gluQuadricNormals
(
m_quadricPulsarCone2Shell
,
GLU_SMOOTH
);
gluQuadricNormals
(
m_quadricPulsarSpinAxis
,
GLU_SMOOTH
);
gluQuadricNormals
(
m_quadricPulsarSpinAxisTop1
,
GLU_SMOOTH
);
gluQuadricNormals
(
m_quadric
PulsarSpinAxisTop2
,
GLU_SMOOTH
);
gluQuadricNormals
(
m_quadric
PulsarMagneticAxis
,
GLU_SMOOTH
);
gluQuadricNormals
(
m_quadric
LHOv
,
GLU_SMOOTH
);
gluQuadricNormals
(
m_quadric
LHOh
,
GLU_SMOOTH
);
// query max texture size (estimate)
GLint
maxTextureSize
;
...
...
@@ -302,6 +302,31 @@ void PulsarAnimationWidget::paintGL()
}
glPopMatrix
();
// draw LHO
glPushMatrix
();
{
glColor3f
(
1.0
f
,
1.0
f
,
1.0
f
);
glRotatef
(
-
81
,
1.0
,
1.0
,
0.0
);
glTranslatef
(
0.0
,
0.0
,
m_pulsarRadius
);
glRotatef
(
180
,
0.0
,
0.0
,
1.0
);
glPushMatrix
();
{
glRotatef
(
90
,
0.0
,
1.0
,
0.0
);
gluCylinder
(
m_quadricLHOh
,
0.010
,
0.010
,
0.20
,
32
,
1
);
}
glPopMatrix
();
glPushMatrix
();
{
glRotatef
(
90
,
0.0
,
1.0
,
0.0
);
glRotatef
(
90
,
1.0
,
0.0
,
0.0
);
gluCylinder
(
m_quadricLHOv
,
0.010
,
0.010
,
0.20
,
32
,
1
);
}
glPopMatrix
();
}
glPopMatrix
();
// draw source
glPushMatrix
();
{
...
...
@@ -331,13 +356,6 @@ void PulsarAnimationWidget::paintGL()
gluDisk
(
m_quadricPulsarSpinAxisTop1
,
0
,
0.020
,
32
,
8
);
}
glPopMatrix
();
glPushMatrix
();
{
glTranslatef
(
0.0
,
0.0
,
0.5
);
gluDisk
(
m_quadricPulsarSpinAxisTop2
,
0
,
0.020
,
32
,
8
);
}
glPopMatrix
();
glPushMatrix
();
{
glTranslatef
(
0.0
,
0.0
,
0.5
f
);
...
...
src/pulsaranimationwidget.h
View file @
142c8c6c
...
...
@@ -98,8 +98,8 @@ private:
GLUquadricObj
*
m_quadricPulsarCone2Shell
;
GLUquadricObj
*
m_quadricPulsarSpinAxis
;
GLUquadricObj
*
m_quadricPulsarSpinAxisTop1
;
GLUquadricObj
*
m_quadric
PulsarSpinAxisTop2
;
GLUquadricObj
*
m_quadric
PulsarMagneticAxis
;
GLUquadricObj
*
m_quadric
LHOv
;
GLUquadricObj
*
m_quadric
LHOh
;
GLuint
m_backgroundTexture
;
GLuint
m_beamTexture
;
...
...
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