Commit 2bde7292 authored by Oliver Bock's avatar Oliver Bock

Use wireframe triangle fans for cones and visualize beam intensity by texture

parent f59e10fc
This diff is collapsed.
......@@ -46,6 +46,7 @@ public:
void setPulsarSpinAxisInclination(const int degrees);
void setPulsarMagneticAxisInclination(const int degrees);
void setPulsarSemiMajorAxis(const double length);
void setPulsarBeamAngle(const int degrees);
public slots:
void runAnimation();
......@@ -84,12 +85,15 @@ private:
GLUquadricObj *m_quadricCompanion;
GLUquadricObj *m_quadricPulsarOrbitPlane;
GLUquadricObj *m_quadricPulsar;
GLUquadricObj *m_quadricPulsarCone1;
GLUquadricObj *m_quadricPulsarCone2;
GLUquadricObj *m_quadricPulsarCone1Shell;
GLUquadricObj *m_quadricPulsarCone2Shell;
GLUquadricObj *m_quadricPulsarSpinAxis;
GLUquadricObj *m_quadricPulsarSpinAxisTop1;
GLUquadricObj *m_quadricPulsarSpinAxisTop2;
GLUquadricObj *m_quadricPulsarMagneticAxis;
GLuint m_backgroundTexture;
GLuint m_beamTexture;
int m_framesPerSecond;
......@@ -107,6 +111,9 @@ private:
double m_pulsarSpinAxisInclination;
double m_pulsarMagneticAxisInclination;
double m_pulsarBeamLength;
double m_pulsarBeamAngle;
double m_pulsarBeamOuterRadius;
bool m_showOrbits;
bool m_showRotationAxes;
......
......@@ -14,5 +14,6 @@
</qresource>
<qresource prefix="/textures">
<file>resources/texture_background_carina.png</file>
<file>resources/texture_beam.png</file>
</qresource>
</RCC>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="744.09448819"
height="1052.3622047"
id="svg2"
version="1.1"
inkscape:version="0.47 r22583"
sodipodi:docname="texture_beam.svg">
<defs
id="defs4">
<linearGradient
id="linearGradient3685">
<stop
style="stop-color:#ffff00;stop-opacity:1;"
offset="0"
id="stop3687" />
<stop
style="stop-color:#ffff00;stop-opacity:0;"
offset="1"
id="stop3689" />
</linearGradient>
<linearGradient
id="linearGradient3679">
<stop
id="stop3681"
offset="0"
style="stop-color:#ffff00;stop-opacity:0.17647059;" />
<stop
style="stop-color:#ffff00;stop-opacity:1;"
offset="0.84778017"
id="stop3691" />
<stop
id="stop3683"
offset="1"
style="stop-color:#ffff00;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient3671">
<stop
style="stop-color:#ffff00;stop-opacity:1;"
offset="0"
id="stop3673" />
<stop
style="stop-color:#ffff00;stop-opacity:0;"
offset="1"
id="stop3675" />
</linearGradient>
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
id="perspective10" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3679"
id="radialGradient3677"
cx="438.57144"
cy="610.93359"
fx="438.57144"
fy="610.93359"
r="187.14285"
gradientUnits="userSpaceOnUse"
spreadMethod="repeat" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.71743361"
inkscape:cx="123.94066"
inkscape:cy="470.4268"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1680"
inkscape:window-height="1002"
inkscape:window-x="1440"
inkscape:window-y="22"
inkscape:window-maximized="0" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1">
<path
sodipodi:type="arc"
style="fill:url(#radialGradient3677);fill-opacity:1.0"
id="path2816"
sodipodi:cx="438.57144"
sodipodi:cy="610.93359"
sodipodi:rx="187.14285"
sodipodi:ry="187.14285"
d="m 625.71429,610.93359 a 187.14285,187.14285 0 1 1 -374.2857,0 187.14285,187.14285 0 1 1 374.2857,0 z"
transform="matrix(1.367939,0,0,1.367939,-217.81337,-338.24157)"
inkscape:export-filename="/Users/oliver/Development/pulsatingscience/src/resources/texture_beam.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
</g>
</svg>
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