fly/flightgear
1
0
Fork 0
Code Activity

Update with changes in simgear.

Browse source 
Modified Files:
 	src/Main/renderer.cxx src/Main/main.cxx
This commit is contained in:
frohlich 2009-03-17 12:26:27 +00:00 • committed by Tim Moore
parent 183b871b48
commit 5168166a9f
2 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Main/main.cxx
View file

@ -799,10 +799,7 @@ static void fgIdleFunction ( void ) {
// Sun diameter: 1,390,000 kilometers // Sun diameter: 1,390,000 kilometers
thesky->build( 80000.0, 80000.0, thesky->build( 80000.0, 80000.0,
463.3, 361.8, 463.3, 361.8,
globals->get_ephem()->getNumPlanets(), *globals->get_ephem(),
globals->get_ephem()->getPlanets(),
globals->get_ephem()->getNumStars(),
globals->get_ephem()->getStars(),
fgGetNode("/environment", true)); fgGetNode("/environment", true));
// Initialize MagVar model // Initialize MagVar model

16
src/Main/renderer.cxx
View file

@ -621,7 +621,7 @@ FGRenderer::update( bool refresh_camera_settings ) {
sun_horiz_eff = moon_horiz_eff = 1.0; sun_horiz_eff = moon_horiz_eff = 1.0;
} }
static SGSkyState sstate; SGSkyState sstate;
SGVec3d viewPos = current__view->getViewPosition(); SGVec3d viewPos = current__view->getViewPosition();
sstate.view_pos = toVec3f(viewPos); sstate.view_pos = toVec3f(viewPos);
@ -635,11 +635,7 @@ FGRenderer::update( bool refresh_camera_settings ) {
sstate.alt = geodViewPos.getElevationM(); sstate.alt = geodViewPos.getElevationM();
sstate.spin = l->get_sun_rotation(); sstate.spin = l->get_sun_rotation();
sstate.gst = globals->get_time_params()->getGst(); sstate.gst = globals->get_time_params()->getGst();
sstate.sun_ra = globals->get_ephem()->getSunRightAscension();
sstate.sun_dec = globals->get_ephem()->getSunDeclination();
sstate.sun_dist = 50000.0 * sun_horiz_eff; sstate.sun_dist = 50000.0 * sun_horiz_eff;
sstate.moon_ra = globals->get_ephem()->getMoonRightAscension();
sstate.moon_dec = globals->get_ephem()->getMoonDeclination();
sstate.moon_dist = 40000.0 * moon_horiz_eff; sstate.moon_dist = 40000.0 * moon_horiz_eff;
sstate.sun_angle = l->get_sun_angle(); sstate.sun_angle = l->get_sun_angle();
@ -660,20 +656,16 @@ FGRenderer::update( bool refresh_camera_settings ) {
<< " moon_angle = " << l->moon_angle ); << " moon_angle = " << l->moon_angle );
*/ */
static SGSkyColor scolor; SGSkyColor scolor;
scolor.sky_color = SGVec3f(l->sky_color().data()); scolor.sky_color = SGVec3f(l->sky_color().data());
scolor.fog_color = SGVec3f(l->adj_fog_color().data()); scolor.fog_color = SGVec3f(l->adj_fog_color().data());
scolor.cloud_color = SGVec3f(l->cloud_color().data()); scolor.cloud_color = SGVec3f(l->cloud_color().data());
scolor.sun_angle = l->get_sun_angle(); scolor.sun_angle = l->get_sun_angle();
scolor.moon_angle = l->get_moon_angle(); scolor.moon_angle = l->get_moon_angle();
scolor.nplanets = globals->get_ephem()->getNumPlanets();
scolor.nstars = globals->get_ephem()->getNumStars();
scolor.planet_data = globals->get_ephem()->getPlanets();
scolor.star_data = globals->get_ephem()->getStars();
thesky->reposition( sstate, delta_time_sec ); thesky->reposition( sstate, *globals->get_ephem(), delta_time_sec );
thesky->repaint( scolor ); thesky->repaint( scolor, *globals->get_ephem() );
/* /*
SG_LOG( SG_GENERAL, SG_BULK, SG_LOG( SG_GENERAL, SG_BULK,