StelSkyDrawer.cpp   StelSkyDrawer.cpp 
skipping to change at line 71 skipping to change at line 71
limitLuminance = 0; limitLuminance = 0;
oldLum=-1.f; oldLum=-1.f;
maxLum = 0.f; maxLum = 0.f;
setMaxAdaptFov(180.f); setMaxAdaptFov(180.f);
setMinAdaptFov(0.1f); setMinAdaptFov(0.1f);
starAbsoluteScaleF = 1.f; starAbsoluteScaleF = 1.f;
starRelativeScale = 1.f; starRelativeScale = 1.f;
starLinearScale = 19.569f; starLinearScale = 19.569f;
big3dModelHaloRadius = 150.f;
QSettings* conf = StelApp::getInstance().getSettings(); QSettings* conf = StelApp::getInstance().getSettings();
initColorTableFromConfigFile(conf); initColorTableFromConfigFile(conf);
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()) ;
setFlagPointStar(conf->value("stars/flag_point_star",false).toBool() ); setFlagPointStar(conf->value("stars/flag_point_star",false).toBool() );
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());
skipping to change at line 552 skipping to change at line 554
bool noStarHalo = false; bool noStarHalo = false;
if (mag<-15.f) if (mag<-15.f)
{ {
// Sun, halo size varies in function of the magnitude becaus e sun as seen from pluto should look dimmer // Sun, halo size varies in function of the magnitude becaus e sun as seen from pluto should look dimmer
// as the sun as seen from earth // as the sun as seen from earth
texSunHalo->bind(); texSunHalo->bind();
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_ONE, GL_ONE); glBlendFunc(GL_ONE, GL_ONE);
painter->enableTexture2d(true); painter->enableTexture2d(true);
float rmag = 150.f*(mag+15.f)/-11.f; float rmag = big3dModelHaloRadius*(mag+15.f)/-11.f;
float cmag = 1.f; float cmag = 1.f;
if (rmag<pixRadius*3.f+100.) if (rmag<pixRadius*3.f+100.)
cmag = qMax(0.f, 1.f-(pixRadius*3.f+100-rmag)/100); cmag = qMax(0.f, 1.f-(pixRadius*3.f+100-rmag)/100);
painter->getProjector()->project(v, win); painter->getProjector()->project(v, win);
painter->setColor(color[0]*cmag, color[1]*cmag, color[2]*cma g); painter->setColor(color[0]*cmag, color[1]*cmag, color[2]*cma g);
painter->drawSprite2dMode(win[0], win[1], rmag); painter->drawSprite2dMode(win[0], win[1], rmag);
noStarHalo = true; noStarHalo = true;
} }
// Now draw the halo according the object brightness // Now draw the halo according the object brightness
 End of changes. 2 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/