Commit da11546c authored by Oliver Bock's avatar Oliver Bock
Browse files

Adjust unitial zoom and relative sizes

parent a15339d6
......@@ -102,7 +102,7 @@ PulsarAnimationWidget::PulsarAnimationWidget(QWidget *parent) :
// initial view settings
m_mouseAngleH = 0.0;
m_mouseAngleV = 0.0;
m_cameraZoom = 150.0;
m_cameraZoom = 100.0;
m_cameraZoomLBound = 10.0;
m_cameraZoomUBound = 4500.0;
m_mouseLastX = 0;
......@@ -321,39 +321,39 @@ void PulsarAnimationWidget::paintGL()
glColor3f(1.0f, 0.0f, 0.0f);
glPushMatrix();
{
glTranslatef(0.0, 0.0, -2.0);
gluCylinder(m_quadricPulsarSpinAxis, 0.020, 0.020, 3.5, 32, 1);
glTranslatef(0.0, 0.0, -1.0);
gluCylinder(m_quadricPulsarSpinAxis, 0.020, 0.020, 1.5, 32, 1);
}
glPopMatrix();
glPushMatrix();
{
glTranslatef(0.0, 0.0, -2.0);
glTranslatef(0.0, 0.0, -1.0);
gluDisk(m_quadricPulsarSpinAxisTop1, 0, 0.020, 32, 8);
}
glPopMatrix();
glPushMatrix();
{
glTranslatef(0.0, 0.0, 1.0);
glTranslatef(0.0, 0.0, 0.5);
gluDisk(m_quadricPulsarSpinAxisTop2, 0, 0.020, 32, 8);
}
glPopMatrix();
glPushMatrix();
{
glTranslatef(0.0, 0.0, 1.25f);
glTranslatef(0.0, 0.0, 0.5f);
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.0f, 0.0f, 0.75f);
glVertex3f(0.0f, 0.0f, 0.5f);
// Loop around in a circle and specify even points along the circle
// as the vertices of the triangle fan (32 sections)
for(angle = 0.0f; angle < (2.0f*PI); angle += (PI/32.0f))
{
// Calculate x and y position of the next vertex
x = 0.25f * sin(angle);
y = 0.25f * cos(angle);
x = 0.1f * sin(angle);
y = 0.1f * cos(angle);
// Specify the next vertex for the triangle fan
glVertex2f(x, y);
......@@ -371,7 +371,7 @@ void PulsarAnimationWidget::paintGL()
{
gluDisk(m_quadricPulsarOrbitPlane,
0,
2,
1.0,
64, 1);
}
glPopMatrix();
......
Supports Markdown
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