Commit 323e37d0 authored by Oliver Bock's avatar Oliver Bock

Removed obsolete inner radius

parent 1d633f57
...@@ -79,7 +79,6 @@ PulsarAnimationWidget::PulsarAnimationWidget(QWidget *parent) : ...@@ -79,7 +79,6 @@ PulsarAnimationWidget::PulsarAnimationWidget(QWidget *parent) :
m_pulsarRadius = 0.5; m_pulsarRadius = 0.5;
m_pulsarBeamLength = 3.0f; m_pulsarBeamLength = 3.0f;
m_pulsarBeamRimSize = 0.1f;
setPulsarSpinAxisInclination(30); setPulsarSpinAxisInclination(30);
setPulsarMagneticAxisInclination(20); setPulsarMagneticAxisInclination(20);
setPulsarBeamAngle(74); setPulsarBeamAngle(74);
...@@ -665,9 +664,7 @@ void PulsarAnimationWidget::setPulsarBeamAngle(const int degrees) ...@@ -665,9 +664,7 @@ void PulsarAnimationWidget::setPulsarBeamAngle(const int degrees)
{ {
m_pulsarBeamAngle = degrees; m_pulsarBeamAngle = degrees;
m_pulsarBeamOuterRadius = tan(deg2rad * degrees * 0.5f) * m_pulsarBeamLength + m_pulsarBeamRimSize * 0.5f; m_pulsarBeamOuterRadius = tan(deg2rad * degrees * 0.5f) * m_pulsarBeamLength;
m_pulsarBeamInnerRadius = m_pulsarBeamOuterRadius - m_pulsarBeamRimSize;
if(m_pulsarBeamInnerRadius < 0.0) m_pulsarBeamInnerRadius = 0.0;
updatePulseProfile(); updatePulseProfile();
updateGL(); updateGL();
......
...@@ -102,7 +102,6 @@ private: ...@@ -102,7 +102,6 @@ private:
double m_pulsarBeamAngle; double m_pulsarBeamAngle;
double m_pulsarBeamInnerRadius; double m_pulsarBeamInnerRadius;
double m_pulsarBeamOuterRadius; double m_pulsarBeamOuterRadius;
double m_pulsarBeamRimSize;
bool m_showRotationAxes; bool m_showRotationAxes;
bool m_cameraInteraction; bool m_cameraInteraction;
......
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