#include <simgear/misc/sg_path.hxx>
#include <simgear/scene/sky/sky.hxx>
#include <simgear/screen/colors.hxx>
+#include <simgear/timing/sg_time.hxx>
+#include <simgear/structure/event_mgr.hxx>
#include <Main/main.hxx>
#include <Main/globals.hxx>
#include <Main/viewer.hxx>
#include "light.hxx"
-#include "tmp.hxx"
-
+#include "sunsolver.hxx"
// Constructor
FGLight::FGLight ()
_cloud_color(0, 0, 0, 0),
_adj_fog_color(0, 0, 0, 0),
_adj_sky_color(0, 0, 0, 0),
+ _saturation(1.0),
_dt_total(0)
{
}
SGPath sky_path = path;
sky_path.append( "Lighting/sky" );
_sky_tbl = new SGInterpTable( sky_path.str() );
+
+ globals->get_event_mgr()->addTask("updateSunPos", this,
+ &FGLight::updateSunPos, 0.5 );
}
init();
- fgUpdateSunPos();
-
+ updateSunPos();
update_sky_color();
update_adj_fog_color();
}
void FGLight::bind () {
SGPropertyNode *prop = globals->get_props();
prop->tie("/sim/time/sun-angle-rad",SGRawValuePointer<double>(&_sun_angle));
+ prop->tie("/rendering/scene/saturation",SGRawValuePointer<float>(&_saturation));
prop->tie("/rendering/scene/ambient/red",SGRawValuePointer<float>(&_scene_ambient[0]));
prop->tie("/rendering/scene/ambient/green",SGRawValuePointer<float>(&_scene_ambient[1]));
prop->tie("/rendering/scene/ambient/blue",SGRawValuePointer<float>(&_scene_ambient[2]));
void FGLight::unbind () {
SGPropertyNode *prop = globals->get_props();
prop->untie("/sim/time/sun-angle-rad");
+ prop->untie("/rendering/scene/saturation");
prop->untie("/rendering/scene/ambient/red");
prop->untie("/rendering/scene/ambient/green");
prop->untie("/rendering/scene/ambient/blue");
// update lighting parameters based on current sun position
-void FGLight::update( double dt ) {
-
- _dt_total += dt;
- if (_dt_total >= 0.5) {
- _dt_total -= 0.5;
- fgUpdateSunPos();
- }
-
+void FGLight::update( double dt )
+{
update_adj_fog_color();
if (_prev_sun_angle != _sun_angle) {
- _prev_sun_angle = _sun_angle;
+ _prev_sun_angle = _sun_angle;
update_sky_color();
}
}
float deg = _sun_angle * SGD_RADIANS_TO_DEGREES;
SG_LOG( SG_EVENT, SG_DEBUG, " Sun angle = " << deg );
+ if (_saturation < 0.0) _saturation = 0.0;
+ else if (_saturation > 1.0) _saturation = 1.0;
+
float ambient = _ambient_tbl->interpolate( deg ) + visibility_inv/10;
float diffuse = _diffuse_tbl->interpolate( deg );
float specular = _specular_tbl->interpolate( deg ) * visibility_log;
float sky_brightness = _sky_tbl->interpolate( deg );
+ ambient *= _saturation;
+ diffuse *= _saturation;
+ specular *= _saturation;
+ sky_brightness *= _saturation;
+
SG_LOG( SG_EVENT, SG_DEBUG,
" ambient = " << ambient << " diffuse = " << diffuse
<< " specular = " << specular << " sky = " << sky_brightness );
}
double hor_rotation, vert_rotation;
+ static float gamma = system_gamma;
// first determine the difference between our view angle and local
// direction to the sun
//
SGVec4f color = thesky->get_scene_color();
- gamma_restore_rgb( _fog_color.data() );
- gamma_restore_rgb( _sky_color.data() );
+ gamma_restore_rgb( _fog_color.data(), gamma );
+ gamma_restore_rgb( _sky_color.data(), gamma );
// Calculate the fog color in the direction of the sun for
// sunrise/sunset effects.
sif = 1e-4;
float rf1 = fabs((hor_rotation - SGD_PI) / SGD_PI); // 0.0 .. 1.0
- float rf2 = avf * pow(rf1*rf1, 1/sif) * 1.0639;
+ float rf2 = avf * pow(rf1*rf1, 1/sif) * 1.0639 * _saturation;
float rf3 = 1.0 - rf2;
+ gamma = system_gamma * (0.9 - sif*avf);
+
_adj_fog_color[0] = rf3 * _fog_color[0] + rf2 * s_red;
_adj_fog_color[1] = rf3 * _fog_color[1] + rf2 * s_green;
_adj_fog_color[2] = rf3 * _fog_color[2] + rf2 * s_blue;
- gamma_correct_rgb( _adj_fog_color.data() );
+ gamma_correct_rgb( _adj_fog_color.data(), gamma);
// make sure the colors have their original value before they are being
// used by the rest of the program.
//
- gamma_correct_rgb( _fog_color.data() );
- gamma_correct_rgb( _sky_color.data() );
+ gamma_correct_rgb( _fog_color.data(), gamma );
+ gamma_correct_rgb( _sky_color.data(), gamma );
}
+// update the cur_time_params structure with the current sun position
+void FGLight::updateSunPos()
+{
+ SGTime *t = globals->get_time_params();
+ FGViewer *v = globals->get_current_view();
+
+ SG_LOG( SG_EVENT, SG_DEBUG, " Updating Sun position" );
+ SG_LOG( SG_EVENT, SG_DEBUG, " Gst = " << t->getGst() );
+
+ double sun_l;
+ double sun_gc_lat;
+ fgSunPositionGST(t->getGst(), &sun_l, &sun_gc_lat);
+ set_sun_lon(sun_l);
+ // It might seem that sun_gc_lat needs to be converted to geodetic
+ // latitude here, but it doesn't. The sun latitude is the latitude
+ // of the point on the earth where the up vector has the same
+ // angle from geocentric Z as the sun direction. But geodetic
+ // latitude is defined as 90 - angle of up vector from Z!
+ set_sun_lat(sun_gc_lat);
+ SGVec3d sunpos(SGVec3d::fromGeoc(SGGeoc::fromRadM(sun_l, sun_gc_lat,
+ SGGeodesy::EQURAD)));
+
+ SG_LOG( SG_EVENT, SG_DEBUG, " t->cur_time = " << t->get_cur_time() );
+ SG_LOG( SG_EVENT, SG_DEBUG,
+ " Sun Geocentric lat = " << sun_gc_lat
+ << " Geodcentric lat = " << sun_gc_lat );
+
+ // update the sun light vector
+ sun_vec() = SGVec4f(toVec3f(normalize(sunpos)), 0);
+ sun_vec_inv() = - sun_vec();
+
+ // calculate the sun's relative angle to local up
+ SGVec3d viewPos = v->get_view_pos();
+ SGQuatd hlOr = SGQuatd::fromLonLat(SGGeod::fromCart(viewPos));
+ SGVec3d world_up = hlOr.backTransform(-SGVec3d::e3());
+ SGVec3d nsun = normalize(sunpos);
+ // cout << "nup = " << nup[0] << "," << nup[1] << ","
+ // << nup[2] << endl;
+ // cout << "nsun = " << nsun[0] << "," << nsun[1] << ","
+ // << nsun[2] << endl;
+
+ set_sun_angle( acos( dot ( world_up, nsun ) ) );
+ SG_LOG( SG_EVENT, SG_DEBUG, "sun angle relative to current location = "
+ << get_sun_angle() );
+
+ // Get direction to the sun in the local frame.
+ SGVec3d local_sun_vec = hlOr.transform(nsun);
+ // Angle from south. XXX Is this correct in the southern hemisphere?
+ double angle = atan2(local_sun_vec.x(), -local_sun_vec.y());
+ set_sun_rotation(angle);
+ // cout << " Sky needs to rotate = " << angle << " rads = "
+ // << angle * SGD_RADIANS_TO_DEGREES << " degrees." << endl;
+}
projects / flightgear.git / blobdiff