From 2731e32dffac9c496677ac44df327f01001c23f0 Mon Sep 17 00:00:00 2001
From: Oliver Bock <oliver.bock@aei.mpg.de>
Date: Fri, 23 Jul 2010 15:23:17 +0200
Subject: [PATCH] Using half the pulsar radius (adjusted axes lengths
accordingly)
---
src/pulsaranimationwidget.cpp | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/pulsaranimationwidget.cpp b/src/pulsaranimationwidget.cpp
index 5c7a286..d2297ac 100644
--- a/src/pulsaranimationwidget.cpp
+++ b/src/pulsaranimationwidget.cpp
@@ -76,7 +76,7 @@ PulsarAnimationWidget::PulsarAnimationWidget(QWidget *parent) :
m_pulsarRotationDelta = 0.0;
m_pulsarRotationAngle = 0.0;
- m_pulsarRadius = 1.0;
+ m_pulsarRadius = 0.5;
m_pulsarBeamLength = 3.0f;
m_pulsarBeamRimSize = 0.1f;
setPulsarSpinAxisInclination(0);
@@ -277,12 +277,12 @@ void PulsarAnimationWidget::paintGL()
glPushMatrix();
{
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();
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);
}
glPopMatrix();
@@ -301,19 +301,19 @@ void PulsarAnimationWidget::paintGL()
glColor3f(1.0f, 1.0f, 1.0f);
glPushMatrix();
{
- glTranslatef(0.0, 0.0, -5.0);
- gluCylinder(m_quadricPulsarSpinAxis, 0.020, 0.020, 10.0, 32, 1);
+ glTranslatef(0.0, 0.0, -4.0);
+ gluCylinder(m_quadricPulsarSpinAxis, 0.020, 0.020, 8.0, 32, 1);
}
glPopMatrix();
glPushMatrix();
{
- glTranslatef(0.0, 0.0, -5.0);
+ glTranslatef(0.0, 0.0, -4.0);
gluDisk(m_quadricPulsarSpinAxisTop1, 0, 0.020, 32, 8);
}
glPopMatrix();
glPushMatrix();
{
- glTranslatef(0.0, 0.0, 5.0);
+ glTranslatef(0.0, 0.0, 4.0);
gluDisk(m_quadricPulsarSpinAxisTop2, 0, 0.020, 32, 8);
}
glPopMatrix();
@@ -352,19 +352,19 @@ void PulsarAnimationWidget::paintGL()
glColor3f(1.0f, 1.0f, 0.0f);
glPushMatrix();
{
- glTranslatef(0.0, 0.0, -5.0);
- gluCylinder(m_quadricPulsarMagneticAxis, 0.020, 0.020, 10.0, 32, 1);
+ glTranslatef(0.0, 0.0, -4.0);
+ gluCylinder(m_quadricPulsarMagneticAxis, 0.020, 0.020, 8.0, 32, 1);
}
glPopMatrix();
glPushMatrix();
{
- glTranslatef(0.0, 0.0, -5.0);
+ glTranslatef(0.0, 0.0, -4.0);
gluDisk(m_quadricPulsarSpinAxisTop1, 0, 0.020, 32, 8);
}
glPopMatrix();
glPushMatrix();
{
- glTranslatef(0.0, 0.0, 5.0);
+ glTranslatef(0.0, 0.0, 4.0);
gluDisk(m_quadricPulsarSpinAxisTop2, 0, 0.020, 32, 8);
}
glPopMatrix();
--
GitLab