From 8a053d63862aa52c2de71fb013adcca07331def7 Mon Sep 17 00:00:00 2001
From: Oliver Bock <oliver.bock@aei.mpg.de>
Date: Thu, 22 Jul 2010 15:52:49 +0200
Subject: [PATCH] Let beams start at center of pulsar (and reduce hardcoded
 values)

---
 src/pulsaranimationwidget.cpp | 11 ++++++-----
 src/pulsaranimationwidget.h   |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/pulsaranimationwidget.cpp b/src/pulsaranimationwidget.cpp
index e58a527..14a3864 100644
--- a/src/pulsaranimationwidget.cpp
+++ b/src/pulsaranimationwidget.cpp
@@ -75,6 +75,7 @@ PulsarAnimationWidget::PulsarAnimationWidget(QWidget *parent) :
     m_pulsarRotationDelta = 0.0;
     m_pulsarRotationAngle = 0.0;
 
+    m_pulsarRadius = 1.0;
     m_pulsarBeamLength = 3.0f;
     m_pulsarBeamRimSize = 0.1f;
     setPulsarSpinAxisInclination(0);
@@ -260,13 +261,13 @@ void PulsarAnimationWidget::paintGL()
             glColor3f(0.33f, 0.33f, 1.0f);
             glPushMatrix();
             {
-                glTranslatef(0.0, 0.0, 1.0);
+                glTranslatef(0.0, 0.0, m_pulsarRadius);
                 gluCylinder(m_quadricLineOfSight, 0.025, 0.025, 4.01, 32, 1);
             }
             glPopMatrix();
             glPushMatrix();
             {
-                glTranslatef(0.0, 0.0, 0.99);
+                glTranslatef(0.0, 0.0, m_pulsarRadius - 0.01);
                 gluDisk(m_quadricLineOfSightTop1, 0, 0.025, 32, 8);
             }
             glPopMatrix();
@@ -315,7 +316,7 @@ void PulsarAnimationWidget::paintGL()
 
             glMaterialfv(GL_FRONT, GL_AMBIENT, no_mat);
             glMaterialfv(GL_FRONT, GL_DIFFUSE, mat_diffuse);
-            gluSphere(m_quadricPulsar, 1.0, 32, 32);
+            gluSphere(m_quadricPulsar, m_pulsarRadius, 32, 32);
 
             glDisable(GL_LIGHTING);
         }
@@ -361,7 +362,7 @@ void PulsarAnimationWidget::paintGL()
                 glPolygonMode(GL_FRONT_AND_BACK,GL_LINE);
             }
 
-            glTranslatef(0.0, 0.0, -4.0);
+            glTranslatef(0.0, 0.0, -m_pulsarBeamLength);
 
             glMaterialfv(GL_FRONT, GL_AMBIENT, coneAmbient);
             glMaterialfv(GL_FRONT, GL_DIFFUSE, coneDiffuse);
@@ -416,7 +417,7 @@ void PulsarAnimationWidget::paintGL()
             glRotatef(-m_pulsarRotationAngle - 90.0, 0.0, 0.0, 1.0);
             glRotatef(m_pulsarMagneticAxisInclination, 0.0, 1.0, 0.0);
 
-            glTranslatef(0.0, 0.0, -4.0);
+            glTranslatef(0.0, 0.0, -m_pulsarBeamLength);
 
             glMaterialfv(GL_FRONT, GL_AMBIENT, coneAmbient);
             glMaterialfv(GL_FRONT, GL_DIFFUSE, coneDiffuse);
diff --git a/src/pulsaranimationwidget.h b/src/pulsaranimationwidget.h
index 91c3a65..2347003 100644
--- a/src/pulsaranimationwidget.h
+++ b/src/pulsaranimationwidget.h
@@ -93,6 +93,7 @@ private:
     double m_pulsarRotationAngle;
     double m_pulsarRotationDelta;
 
+    double m_pulsarRadius;
     double m_pulsarSpinAxisInclination;
     double m_pulsarMagneticAxisInclination;
     double m_pulsarBeamLength;
-- 
GitLab