Commit 2731e32d authored by Oliver Bock's avatar Oliver Bock
Browse files

Using half the pulsar radius (adjusted axes lengths accordingly)

parent 6de9fa14
...@@ -76,7 +76,7 @@ PulsarAnimationWidget::PulsarAnimationWidget(QWidget *parent) : ...@@ -76,7 +76,7 @@ PulsarAnimationWidget::PulsarAnimationWidget(QWidget *parent) :
m_pulsarRotationDelta = 0.0; m_pulsarRotationDelta = 0.0;
m_pulsarRotationAngle = 0.0; m_pulsarRotationAngle = 0.0;
m_pulsarRadius = 1.0; m_pulsarRadius = 0.5;
m_pulsarBeamLength = 3.0f; m_pulsarBeamLength = 3.0f;
m_pulsarBeamRimSize = 0.1f; m_pulsarBeamRimSize = 0.1f;
setPulsarSpinAxisInclination(0); setPulsarSpinAxisInclination(0);
...@@ -277,12 +277,12 @@ void PulsarAnimationWidget::paintGL() ...@@ -277,12 +277,12 @@ void PulsarAnimationWidget::paintGL()
glPushMatrix(); glPushMatrix();
{ {
glTranslatef(0.0, 0.0, m_pulsarRadius + 0.5); glTranslatef(0.0, 0.0, m_pulsarRadius + 0.5);
gluCylinder(m_quadricLineOfSight, 0.025, 0.025, 3.51, 32, 1); gluCylinder(m_quadricLineOfSight, 0.025, 0.025, 3.01, 32, 1);
} }
glPopMatrix(); glPopMatrix();
glPushMatrix(); glPushMatrix();
{ {
glTranslatef(0.0, 0.0, m_pulsarRadius + 4.01); glTranslatef(0.0, 0.0, m_pulsarRadius + 3.51);
gluDisk(m_quadricLineOfSightTop, 0, 0.025, 32, 8); gluDisk(m_quadricLineOfSightTop, 0, 0.025, 32, 8);
} }
glPopMatrix(); glPopMatrix();
...@@ -301,19 +301,19 @@ void PulsarAnimationWidget::paintGL() ...@@ -301,19 +301,19 @@ void PulsarAnimationWidget::paintGL()
glColor3f(1.0f, 1.0f, 1.0f); glColor3f(1.0f, 1.0f, 1.0f);
glPushMatrix(); glPushMatrix();
{ {
glTranslatef(0.0, 0.0, -5.0); glTranslatef(0.0, 0.0, -4.0);
gluCylinder(m_quadricPulsarSpinAxis, 0.020, 0.020, 10.0, 32, 1); gluCylinder(m_quadricPulsarSpinAxis, 0.020, 0.020, 8.0, 32, 1);
} }
glPopMatrix(); glPopMatrix();
glPushMatrix(); glPushMatrix();
{ {
glTranslatef(0.0, 0.0, -5.0); glTranslatef(0.0, 0.0, -4.0);
gluDisk(m_quadricPulsarSpinAxisTop1, 0, 0.020, 32, 8); gluDisk(m_quadricPulsarSpinAxisTop1, 0, 0.020, 32, 8);
} }
glPopMatrix(); glPopMatrix();
glPushMatrix(); glPushMatrix();
{ {
glTranslatef(0.0, 0.0, 5.0); glTranslatef(0.0, 0.0, 4.0);
gluDisk(m_quadricPulsarSpinAxisTop2, 0, 0.020, 32, 8); gluDisk(m_quadricPulsarSpinAxisTop2, 0, 0.020, 32, 8);
} }
glPopMatrix(); glPopMatrix();
...@@ -352,19 +352,19 @@ void PulsarAnimationWidget::paintGL() ...@@ -352,19 +352,19 @@ void PulsarAnimationWidget::paintGL()
glColor3f(1.0f, 1.0f, 0.0f); glColor3f(1.0f, 1.0f, 0.0f);
glPushMatrix(); glPushMatrix();
{ {
glTranslatef(0.0, 0.0, -5.0); glTranslatef(0.0, 0.0, -4.0);
gluCylinder(m_quadricPulsarMagneticAxis, 0.020, 0.020, 10.0, 32, 1); gluCylinder(m_quadricPulsarMagneticAxis, 0.020, 0.020, 8.0, 32, 1);
} }
glPopMatrix(); glPopMatrix();
glPushMatrix(); glPushMatrix();
{ {
glTranslatef(0.0, 0.0, -5.0); glTranslatef(0.0, 0.0, -4.0);
gluDisk(m_quadricPulsarSpinAxisTop1, 0, 0.020, 32, 8); gluDisk(m_quadricPulsarSpinAxisTop1, 0, 0.020, 32, 8);
} }
glPopMatrix(); glPopMatrix();
glPushMatrix(); glPushMatrix();
{ {
glTranslatef(0.0, 0.0, 5.0); glTranslatef(0.0, 0.0, 4.0);
gluDisk(m_quadricPulsarSpinAxisTop2, 0, 0.020, 32, 8); gluDisk(m_quadricPulsarSpinAxisTop2, 0, 0.020, 32, 8);
} }
glPopMatrix(); glPopMatrix();
......
Markdown is supported
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