Nebula.cpp   Nebula.cpp 
skipping to change at line 196 skipping to change at line 196
{ {
float lim = mag; float lim = mag;
if (lim > 50) lim = 15.f; if (lim > 50) lim = 15.f;
// temporary workaround of this bug: https://bugs.launchpad.net/stel larium/+bug/1115035 --AW // temporary workaround of this bug: https://bugs.launchpad.net/stel larium/+bug/1115035 --AW
if (getEnglishName().contains("Pleiades")) if (getEnglishName().contains("Pleiades"))
lim = 5.f; lim = 5.f;
if (lim>maxMagHints) if (lim>maxMagHints)
return; return;
Vec3d win;
// Check visibility of DSO hints
if (!(sPainter.getProjector()->projectCheck(XYZ, win)))
return;
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_ONE, GL_ONE); glBlendFunc(GL_ONE, GL_ONE);
float lum = 1.f;//qMin(1,4.f/getOnScreenSize(core))*0.8; float lum = 1.f;//qMin(1,4.f/getOnScreenSize(core))*0.8;
Vec3f col(circleColor[0]*lum*hintsBrightness, circleColor[1]*lum*hin tsBrightness, circleColor[2]*lum*hintsBrightness); Vec3f col(circleColor[0]*lum*hintsBrightness, circleColor[1]*lum*hin tsBrightness, circleColor[2]*lum*hintsBrightness);
sPainter.setColor(col[0], col[1], col[2], 1); sPainter.setColor(col[0], col[1], col[2], 1);
switch (nType) switch (nType)
{ {
case NebGx: case NebGx:
Nebula::texGalaxy->bind(); Nebula::texGalaxy->bind();
skipping to change at line 241 skipping to change at line 247
float lim = mag; float lim = mag;
if (lim > 50) lim = 15.f; if (lim > 50) lim = 15.f;
// temporary workaround of this bug: https://bugs.launchpad.net/stel larium/+bug/1115035 --AW // temporary workaround of this bug: https://bugs.launchpad.net/stel larium/+bug/1115035 --AW
if (getEnglishName().contains("Pleiades")) if (getEnglishName().contains("Pleiades"))
lim = 5.f; lim = 5.f;
if (lim>maxMagLabel) if (lim>maxMagLabel)
return; return;
Vec3d win;
// Check visibility of DSO labels
if (!(sPainter.getProjector()->projectCheck(XYZ, win)))
return;
Vec3f col(labelColor[0], labelColor[1], labelColor[2]); Vec3f col(labelColor[0], labelColor[1], labelColor[2]);
sPainter.setColor(col[0], col[1], col[2], hintsBrightness); sPainter.setColor(col[0], col[1], col[2], hintsBrightness);
float size = getAngularSize(NULL)*M_PI/180.*sPainter.getProjector()- >getPixelPerRadAtCenter(); float size = getAngularSize(NULL)*M_PI/180.*sPainter.getProjector()- >getPixelPerRadAtCenter();
float shift = 4.f + size/1.8f; float shift = 4.f + size/1.8f;
QString str; QString str;
if (!nameI18.isEmpty()) if (!nameI18.isEmpty())
str = getNameI18n(); str = getNameI18n();
else else
{ {
 End of changes. 2 change blocks. 
0 lines changed or deleted 11 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/