ZoneArray.cpp   ZoneArray.cpp 
skipping to change at line 523 skipping to change at line 523
{ {
isVisible = false; isVisible = false;
continue; continue;
} }
} }
if (!isVisible) if (!isVisible)
continue; continue;
} }
int extinctedMagIndex = s->getMag(); int extinctedMagIndex = s->getMag();
float twinkleFactor=1.0f; // allow height-dependent twinkle.
if (withExtinction) if (withExtinction)
{ {
Vec3f altAz(vf); Vec3f altAz(vf);
altAz.normalize(); altAz.normalize();
core->j2000ToAltAzInPlaceNoRefraction(&altAz); core->j2000ToAltAzInPlaceNoRefraction(&altAz);
float extMagShift=0.0f; float extMagShift=0.0f;
extinction.forward(altAz, &extMagShift); extinction.forward(altAz, &extMagShift);
extinctedMagIndex = s->getMag() + (int)(extMagShift/ k); extinctedMagIndex = s->getMag() + (int)(extMagShift/ k);
if (extinctedMagIndex >= cutoffMagStep) // i.e., if extincted it is dimmer than cutoff, so remove if (extinctedMagIndex >= cutoffMagStep) // i.e., if extincted it is dimmer than cutoff, so remove
continue; continue;
tmpRcmag = &rcmag_table[extinctedMagIndex]; tmpRcmag = &rcmag_table[extinctedMagIndex];
twinkleFactor=qMin(1.0f, 1.0f-0.9f*altAz[2]); // sup press twinkling in higher altitudes. Keep 0.1 twinkle amount in zenith.
} }
if (drawer->drawPointSource(sPainter, vf, *tmpRcmag, s->getB VIndex(), !isInsideViewport) && s->hasName() && extinctedMagIndex < maxMagS tarName && s->hasComponentID()<=1) if (drawer->drawPointSource(sPainter, vf, *tmpRcmag, s->getB VIndex(), !isInsideViewport, twinkleFactor) && s->hasName() && extinctedMag Index < maxMagStarName && s->hasComponentID()<=1)
{ {
const float offset = tmpRcmag->radius*0.7f; const float offset = tmpRcmag->radius*0.7f;
const Vec3f colorr = StelSkyDrawer::indexToColor(s-> getBVIndex())*0.75f; const Vec3f colorr = StelSkyDrawer::indexToColor(s-> getBVIndex())*0.75f;
sPainter->setColor(colorr[0], colorr[1], colorr[2],n ames_brightness); sPainter->setColor(colorr[0], colorr[1], colorr[2],n ames_brightness);
sPainter->drawText(Vec3d(vf[0], vf[1], vf[2]), s->ge tNameI18n(), 0, offset, offset, false); sPainter->drawText(Vec3d(vf[0], vf[1], vf[2]), s->ge tNameI18n(), 0, offset, offset, false);
} }
} }
} }
template<class Star> template<class Star>
 End of changes. 3 change blocks. 
1 lines changed or deleted 3 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/