MeteorShower.cpp   MeteorShower.cpp 
skipping to change at line 350 skipping to change at line 350
break; break;
case ACTIVE_GENERIC: //Active, generic data case ACTIVE_GENERIC: //Active, generic data
rgb = m_mgr->getColorARG(); rgb = m_mgr->getColorARG();
break; break;
default: //Inactive default: //Inactive
rgb = m_mgr->getColorIR(); rgb = m_mgr->getColorIR();
} }
rgb /= 255.f; rgb /= 255.f;
painter.setColor(rgb[0], rgb[1], rgb[2], alpha); painter.setColor(rgb[0], rgb[1], rgb[2], alpha);
// Hide the radiant markers at during day light and make it visible
// when first stars will shine on the sky.
float mlimit = core->getSkyDrawer()->getLimitMagnitude();
float mag = 2.0f;
Vec3d win; Vec3d win;
if (m_mgr->getEnableMarker() && painter.getProjector()->projectCheck (m_position, win)) if (m_mgr->getEnableMarker() && painter.getProjector()->projectCheck (m_position, win) && mag<=mlimit)
{ {
m_mgr->getRadiantTexture()->bind(); m_mgr->getRadiantTexture()->bind();
painter.drawSprite2dMode(XY[0], XY[1], 45); painter.drawSprite2dMode(XY[0], XY[1], 45);
if (m_mgr->getEnableLabels()) if (m_mgr->getEnableLabels())
{ {
painter.setFont(m_mgr->getFont()); painter.setFont(m_mgr->getFont());
float size = getAngularSize(NULL)*M_PI/180.*painter. getProjector()->getPixelPerRadAtCenter(); float size = getAngularSize(NULL)*M_PI/180.*painter. getProjector()->getPixelPerRadAtCenter();
float shift = 8.f + size/1.8f; float shift = 8.f + size/1.8f;
painter.drawText(XY[0]+shift, XY[1]+shift, getNameI1 if ((mag+1.f)<mlimit)
8n(), 0, 0, 0, false); painter.drawText(XY[0]+shift, XY[1]+shift, g
etNameI18n(), 0, 0, 0, false);
} }
} }
} }
void MeteorShower::drawMeteors(StelCore *core) void MeteorShower::drawMeteors(StelCore *core)
{ {
if (!core->getSkyDrawer()->getFlagHasAtmosphere()) if (!core->getSkyDrawer()->getFlagHasAtmosphere())
{ {
return; return;
} }
 End of changes. 3 change blocks. 
3 lines changed or deleted 9 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/