Nebula.cpp   Nebula.cpp 
skipping to change at line 185 skipping to change at line 185
double Nebula::getCloseViewFov(const StelCore*) const double Nebula::getCloseViewFov(const StelCore*) const
{ {
return angularSize>0 ? angularSize * 4 : 1; return angularSize>0 ? angularSize * 4 : 1;
} }
void Nebula::drawHints(StelRenderer* renderer, float maxMagHints, NebulaHin tTextures& hintTextures) void Nebula::drawHints(StelRenderer* renderer, float maxMagHints, NebulaHin tTextures& hintTextures)
{ {
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
if (getEnglishName().contains("Pleiades"))
lim = 5.f;
if (lim>maxMagHints) if (lim>maxMagHints)
return; return;
renderer->setBlendMode(BlendMode_Add); renderer->setBlendMode(BlendMode_Add);
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);
if (StelApp::getInstance().getVisionModeNight()) if (StelApp::getInstance().getVisionModeNight())
col = StelUtils::getNightColor(col); col = StelUtils::getNightColor(col);
renderer->setGlobalColor(col[0], col[1], col[2], 1); renderer->setGlobalColor(col[0], col[1], col[2], 1);
/* /*
skipping to change at line 233 skipping to change at line 238
hintTextures.texCircle->bind(); hintTextures.texCircle->bind();
} }
renderer->drawTexturedRect(XY[0] - 6, XY[1] - 6, 12, 12); renderer->drawTexturedRect(XY[0] - 6, XY[1] - 6, 12, 12);
} }
void Nebula::drawLabel(StelRenderer* renderer, StelProjectorP projector, fl oat maxMagLabel) void Nebula::drawLabel(StelRenderer* renderer, StelProjectorP projector, fl oat maxMagLabel)
{ {
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
if (getEnglishName().contains("Pleiades"))
lim = 5.f;
if (lim>maxMagLabel) if (lim>maxMagLabel)
return; return;
Vec3f col(labelColor[0], labelColor[1], labelColor[2]); Vec3f col(labelColor[0], labelColor[1], labelColor[2]);
if (StelApp::getInstance().getVisionModeNight()) if (StelApp::getInstance().getVisionModeNight())
col = StelUtils::getNightColor(col); col = StelUtils::getNightColor(col);
renderer->setGlobalColor(col[0], col[1], col[2], hintsBrightness); renderer->setGlobalColor(col[0], col[1], col[2], hintsBrightness);
QString str; QString str;
if (!nameI18.isEmpty()) if (!nameI18.isEmpty())
 End of changes. 2 change blocks. 
0 lines changed or deleted 12 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/