SporadicMeteorMgr.cpp   SporadicMeteorMgr.cpp 
skipping to change at line 36 skipping to change at line 36
#include "StelModuleMgr.hpp" #include "StelModuleMgr.hpp"
#include "StelPainter.hpp" #include "StelPainter.hpp"
#include "StelTextureMgr.hpp" #include "StelTextureMgr.hpp"
#include <QSettings> #include <QSettings>
SporadicMeteorMgr::SporadicMeteorMgr(int zhr, int maxv) SporadicMeteorMgr::SporadicMeteorMgr(int zhr, int maxv)
: m_zhr(zhr) : m_zhr(zhr)
, m_maxVelocity(maxv) , m_maxVelocity(maxv)
, m_flagShow(true) , m_flagShow(true)
, m_flagForcedShow(false)
{ {
setObjectName("SporadicMeteorMgr"); setObjectName("SporadicMeteorMgr");
} }
SporadicMeteorMgr::~SporadicMeteorMgr() SporadicMeteorMgr::~SporadicMeteorMgr()
{ {
qDeleteAll(activeMeteors); qDeleteAll(activeMeteors);
activeMeteors.clear(); activeMeteors.clear();
m_bolideTexture.clear(); m_bolideTexture.clear();
} }
void SporadicMeteorMgr::init() void SporadicMeteorMgr::init()
{ {
m_bolideTexture = StelApp::getInstance().getTextureManager().createT extureThread( m_bolideTexture = StelApp::getInstance().getTextureManager().createT extureThread(
StelFileMgr::getInstallationDir() + "/textur es/cometComa.png", StelFileMgr::getInstallationDir() + "/textur es/cometComa.png",
StelTexture::StelTextureParams(true, GL_LINE AR, GL_CLAMP_TO_EDGE)); StelTexture::StelTextureParams(true, GL_LINE AR, GL_CLAMP_TO_EDGE));
setZHR(StelApp::getInstance().getSettings()->value("astro/meteor_zhr QSettings* conf = StelApp::getInstance().getSettings();
", 10).toInt()); setZHR(conf->value("astro/meteor_zhr", 10).toInt());
setFlagForcedMeteorsActivity(conf->value("astro/flag_forced_meteor_a
ctivity", false).toBool());
} }
double SporadicMeteorMgr::getCallOrder(StelModuleActionName actionName) con st double SporadicMeteorMgr::getCallOrder(StelModuleActionName actionName) con st
{ {
if (actionName == StelModule::ActionDraw) if (actionName == StelModule::ActionDraw)
{ {
return GETSTELMODULE(SolarSystem)->getCallOrder(actionName) + 10.; return GETSTELMODULE(SolarSystem)->getCallOrder(actionName) + 10.;
} }
return 0; return 0;
} }
skipping to change at line 120 skipping to change at line 123
else else
{ {
delete m; delete m;
} }
} }
} }
} }
void SporadicMeteorMgr::draw(StelCore* core) void SporadicMeteorMgr::draw(StelCore* core)
{ {
if (!m_flagShow || !core->getSkyDrawer()->getFlagHasAtmosphere()) if (!m_flagShow || (!core->getSkyDrawer()->getFlagHasAtmosphere() && !getFlagForcedMeteorsActivity()))
{ {
return; return;
} }
LandscapeMgr* landmgr = GETSTELMODULE(LandscapeMgr); LandscapeMgr* landmgr = GETSTELMODULE(LandscapeMgr);
if (landmgr->getFlagAtmosphere() && landmgr->getLuminance() > 5.f) if (landmgr->getFlagAtmosphere() && landmgr->getLuminance() > 5.f)
{ {
return; return;
} }
 End of changes. 3 change blocks. 
3 lines changed or deleted 6 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/