StelSkyDrawer.cpp   StelSkyDrawer.cpp 
skipping to change at line 82 skipping to change at line 82
QSettings* conf = StelApp::getInstance().getSettings(); QSettings* conf = StelApp::getInstance().getSettings();
initColorTableFromConfigFile(conf); initColorTableFromConfigFile(conf);
setFlagHasAtmosphere(conf->value("landscape/flag_atmosphere", true). toBool()); setFlagHasAtmosphere(conf->value("landscape/flag_atmosphere", true). toBool());
setTwinkleAmount(conf->value("stars/star_twinkle_amount",0.3).toFloa t()); setTwinkleAmount(conf->value("stars/star_twinkle_amount",0.3).toFloa t());
setFlagTwinkle(conf->value("stars/flag_star_twinkle",true).toBool()) ; setFlagTwinkle(conf->value("stars/flag_star_twinkle",true).toBool()) ;
setDrawStarsAsPoints(conf->value("stars/flag_point_star",false).toBo ol()); setDrawStarsAsPoints(conf->value("stars/flag_point_star",false).toBo ol());
setMaxAdaptFov(conf->value("stars/mag_converter_max_fov",70.0).toFlo at()); setMaxAdaptFov(conf->value("stars/mag_converter_max_fov",70.0).toFlo at());
setMinAdaptFov(conf->value("stars/mag_converter_min_fov",0.1).toFloa t()); setMinAdaptFov(conf->value("stars/mag_converter_min_fov",0.1).toFloa t());
setFlagLuminanceAdaptation(conf->value("viewing/use_luminance_adapta tion",true).toBool()); setFlagLuminanceAdaptation(conf->value("viewing/use_luminance_adapta tion",true).toBool());
setFlagStarMagnitudeLimit((conf->value("astro/flag_star_magnitude_li
mit", false).toBool()));
setCustomStarMagnitudeLimit(conf->value("astro/star_magnitude_limit"
, 6.5).toFloat());
setFlagNebulaMagnitudeLimit((conf->value("astro/flag_nebula_magnitud
e_limit", false).toBool()));
setCustomNebulaMagnitudeLimit(conf->value("astro/nebula_magnitude_li
mit", 8.5).toFloat());
// qDebug() << "drawer: clampStellarMag: " << clampStellarMagnitude
<< " , clampDSOmagnitude: " << clampDSOMagnitude;
bool ok=true; bool ok=true;
setBortleScale(conf->value("stars/init_bortle_scale",3).toInt(&ok)); setBortleScale(conf->value("stars/init_bortle_scale",3).toInt(&ok));
if (!ok) if (!ok)
{ {
conf->setValue("stars/init_bortle_scale",3); conf->setValue("stars/init_bortle_scale",3);
setBortleScale(3); setBortleScale(3);
ok = true; ok = true;
} }
skipping to change at line 473 skipping to change at line 478
projector->project(v, win); projector->project(v, win);
addStar(coronaBuffer, win[0], win[1], radius * 2, Vec3f(alpha, alpha , alpha)); addStar(coronaBuffer, win[0], win[1], radius * 2, Vec3f(alpha, alpha , alpha));
drawStars(texCorona, coronaBuffer, renderer, projector); drawStars(texCorona, coronaBuffer, renderer, projector);
} }
// Terminate drawing of a 3D model, draw the halo // Terminate drawing of a 3D model, draw the halo
void StelSkyDrawer::postDrawSky3dModel void StelSkyDrawer::postDrawSky3dModel
(StelProjectorP projector, const Vec3d& v, float illuminatedArea, (StelProjectorP projector, const Vec3d& v, float illuminatedArea,
float mag, const Vec3f& color) float mag, const Vec3f& color)
{ {
// GZ: Only draw if we did not clamp this object away.
if (flagStarMagnitudeLimit && (mag > customStarMagLimit)) return;
const float pixPerRad = projector->getPixelPerRadAtCenter(); const float pixPerRad = projector->getPixelPerRadAtCenter();
// Assume a disk shape // Assume a disk shape
float pixRadius = std::sqrt(illuminatedArea/(60.*60.)*M_PI/180.*M_PI /180.*(pixPerRad*pixPerRad))/M_PI; float pixRadius = std::sqrt(illuminatedArea/(60.*60.)*M_PI/180.*M_PI /180.*(pixPerRad*pixPerRad))/M_PI;
bool noStarHalo = false; bool noStarHalo = false;
if (mag<-15.f) if (mag<-15.f)
{ {
const float rmag = big3dModelHaloRadius*(mag+15.f)/-11.f; const float rmag = big3dModelHaloRadius*(mag+15.f)/-11.f;
float cmag = 1.f; float cmag = 1.f;
 End of changes. 2 change blocks. 
0 lines changed or deleted 13 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/