NebulaMgr.cpp   NebulaMgr.cpp 
skipping to change at line 451 skipping to change at line 451
// Draw all the Nebulae // Draw all the Nebulae
void NebulaMgr::draw(StelCore* core) void NebulaMgr::draw(StelCore* core)
{ {
const StelProjectorP prj = core->getProjection(StelCore::FrameJ2000) ; const StelProjectorP prj = core->getProjection(StelCore::FrameJ2000) ;
StelPainter sPainter(prj); StelPainter sPainter(prj);
StelSkyDrawer* skyDrawer = core->getSkyDrawer(); StelSkyDrawer* skyDrawer = core->getSkyDrawer();
Nebula::hintsBrightness = hintsFader.getInterstate()*flagShow.getInt erstate(); Nebula::hintsBrightness = hintsFader.getInterstate()*flagShow.getInt erstate();
sPainter.enableTexture2d(true); sPainter.setBlending(true, GL_ONE, GL_ONE);
glEnable(GL_BLEND);
glBlendFunc(GL_ONE, GL_ONE);
// Use a 1 degree margin // Use a 1 degree margin
const double margin = 1.*M_PI/180.*prj->getPixelPerRadAtCenter(); const double margin = 1.*M_PI/180.*prj->getPixelPerRadAtCenter();
const SphericalRegionP& p = prj->getViewportConvexPolygon(margin, ma rgin); const SphericalRegionP& p = prj->getViewportConvexPolygon(margin, ma rgin);
// Print all the nebulae of all the selected zones // Print all the nebulae of all the selected zones
float maxMagHints = computeMaxMagHint(skyDrawer); float maxMagHints = computeMaxMagHint(skyDrawer);
float maxMagLabels = skyDrawer->getLimitMagnitude()-2.f+(labelsAmoun t*1.2f)-2.f; float maxMagLabels = skyDrawer->getLimitMagnitude()-2.f+(labelsAmoun t*1.2f)-2.f;
sPainter.setFont(nebulaFont); sPainter.setFont(nebulaFont);
DrawNebulaFuncObject func(maxMagHints, maxMagLabels, &sPainter, core , hintsFader.getInterstate()>0.0001); DrawNebulaFuncObject func(maxMagHints, maxMagLabels, &sPainter, core , hintsFader.getInterstate()>0.0001);
skipping to change at line 486 skipping to change at line 484
{ {
const StelObjectP obj = newSelected[0]; const StelObjectP obj = newSelected[0];
Vec3d pos=obj->getJ2000EquatorialPos(core); Vec3d pos=obj->getJ2000EquatorialPos(core);
// Compute 2D pos and return if outside screen // Compute 2D pos and return if outside screen
if (!prj->projectInPlace(pos)) return; if (!prj->projectInPlace(pos)) return;
sPainter.setColor(0.4f,0.5f,0.8f); sPainter.setColor(0.4f,0.5f,0.8f);
texPointer->bind(); texPointer->bind();
sPainter.enableTexture2d(true); sPainter.setBlending(true);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // Normal
transparency mode
// Size on screen // Size on screen
float size = obj->getAngularSize(core)*M_PI/180.*prj->getPix elPerRadAtCenter(); float size = obj->getAngularSize(core)*M_PI/180.*prj->getPix elPerRadAtCenter();
if (size>120.f) // avoid oversized marker if (size>120.f) // avoid oversized marker
size = 120.f; size = 120.f;
if (Nebula::drawHintProportional) if (Nebula::drawHintProportional)
size*=1.2f; size*=1.2f;
size+=20.f + 10.f*std::sin(3.f * StelApp::getInstance().getA nimationTime()); size+=20.f + 10.f*std::sin(3.f * StelApp::getInstance().getA nimationTime());
sPainter.drawSprite2dMode(pos[0]-size/2, pos[1]-size/2, 10, 90); sPainter.drawSprite2dMode(pos[0]-size/2, pos[1]-size/2, 10, 90);
 End of changes. 2 change blocks. 
7 lines changed or deleted 2 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/