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
17a8b1c7
Commit
17a8b1c7
authored
Sep 07, 2017
by
Oliver Bock
Browse files
Always show normal
parent
e3e65355
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/pulsaranimationwidget.cpp
View file @
17a8b1c7
...
...
@@ -332,53 +332,51 @@ void PulsarAnimationWidget::paintGL()
glRotatef
(
m_pulsarSpinAxisInclination
,
1.0
,
0.0
,
0.0
);
glRotatef
(
-
45
,
1.0
,
0.0
,
0.0
);
// draw spin axis
if
(
m_showRotationAxes
)
{
glColor3f
(
1.0
f
,
0.0
f
,
0.0
f
);
glPushMatrix
();
{
glTranslatef
(
0.0
,
0.0
,
-
2.0
);
gluCylinder
(
m_quadricPulsarSpinAxis
,
0.020
,
0.020
,
4.0
,
32
,
1
);
}
glPopMatrix
();
glPushMatrix
();
{
glTranslatef
(
0.0
,
0.0
,
-
2.0
);
gluDisk
(
m_quadricPulsarSpinAxisTop1
,
0
,
0.020
,
32
,
8
);
}
glPopMatrix
();
glPushMatrix
();
{
glTranslatef
(
0.0
,
0.0
,
2.0
);
gluDisk
(
m_quadricPulsarSpinAxisTop2
,
0
,
0.020
,
32
,
8
);
}
glPopMatrix
();
// draw source plane normal
glColor3f
(
1.0
f
,
0.0
f
,
0.0
f
);
glPushMatrix
();
{
glTranslatef
(
0.0
,
0.0
,
-
2.0
);
gluCylinder
(
m_quadricPulsarSpinAxis
,
0.020
,
0.020
,
4.0
,
32
,
1
);
}
glPopMatrix
();
glPushMatrix
();
{
glTranslatef
(
0.0
,
0.0
,
-
2.0
);
gluDisk
(
m_quadricPulsarSpinAxisTop1
,
0
,
0.020
,
32
,
8
);
}
glPopMatrix
();
glPushMatrix
();
{
glTranslatef
(
0.0
,
0.0
,
2.0
);
gluDisk
(
m_quadricPulsarSpinAxisTop2
,
0
,
0.020
,
32
,
8
);
}
glPopMatrix
();
glPushMatrix
();
glPushMatrix
();
{
glTranslatef
(
0.0
,
0.0
,
2.0
f
-
0.75
f
);
glBegin
(
GL_TRIANGLE_FAN
);
{
glTranslatef
(
0.0
,
0.0
,
2.0
f
-
0.75
f
);
glBegin
(
GL_TRIANGLE_FAN
);
// Pinnacle of cone is shared vertex for fan, moved up z-axis
// to produce a cone instead of a circle
glVertex3f
(
0.0
f
,
0.0
f
,
0.75
f
);
// Loop around in a circle and specify even points along the circle
// as the vertices of the triangle fan (32 sections)
for
(
angle
=
0.0
f
;
angle
<
(
2.0
f
*
PI
);
angle
+=
(
PI
/
32.0
f
))
{
// Pinnacle of cone is shared vertex for fan, moved up z-axis
// to produce a cone instead of a circle
glVertex3f
(
0.0
f
,
0.0
f
,
0.75
f
);
// Loop around in a circle and specify even points along the circle
// as the vertices of the triangle fan (32 sections)
for
(
angle
=
0.0
f
;
angle
<
(
2.0
f
*
PI
);
angle
+=
(
PI
/
32.0
f
))
{
// Calculate x and y position of the next vertex
x
=
0.25
f
*
sin
(
angle
);
y
=
0.25
f
*
cos
(
angle
);
// Specify the next vertex for the triangle fan
glVertex2f
(
x
,
y
);
}
// Calculate x and y position of the next vertex
x
=
0.25
f
*
sin
(
angle
);
y
=
0.25
f
*
cos
(
angle
);
// Specify the next vertex for the triangle fan
glVertex2f
(
x
,
y
);
}
glEnd
();
}
gl
PopMatrix
();
gl
End
();
}
glPopMatrix
();
// draw disc
glMaterialfv
(
GL_FRONT
,
GL_AMBIENT_AND_DIFFUSE
,
translucent
);
...
...
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