diff --git a/src/Environment/environment_mgr.cxx b/src/Environment/environment_mgr.cxx index 97c81b9b9..0f1b201df 100644 --- a/src/Environment/environment_mgr.cxx +++ b/src/Environment/environment_mgr.cxx @@ -47,6 +47,42 @@ class SGSky; extern SGSky *thesky; +class FG3DCloudsListener : public SGPropertyChangeListener { +public: + FG3DCloudsListener( FGClouds * fgClouds ); + virtual ~FG3DCloudsListener(); + + virtual void valueChanged (SGPropertyNode * node); + +private: + FGClouds * _fgClouds; + SGPropertyNode_ptr _shaderNode; + SGPropertyNode_ptr _enableNode; +}; + +FG3DCloudsListener::FG3DCloudsListener( FGClouds * fgClouds ) : + _fgClouds( fgClouds ) +{ + _shaderNode = fgGetNode( "/sim/rendering/shader-effects", true ); + _shaderNode->addChangeListener( this ); + + _enableNode = fgGetNode( "/sim/rendering/clouds3d-enable", true ); + _enableNode->addChangeListener( this ); + + valueChanged( _enableNode ); +} + +FG3DCloudsListener::~FG3DCloudsListener() +{ + _enableNode->removeChangeListener( this ); + _shaderNode->removeChangeListener( this ); +} + +void FG3DCloudsListener::valueChanged( SGPropertyNode * node ) +{ + _fgClouds->set_3dClouds( _enableNode->getBoolValue() && _shaderNode->getBoolValue() ); +} + FGEnvironmentMgr::FGEnvironmentMgr () : _environment(new FGEnvironment()), fgClouds(new FGClouds()), @@ -54,7 +90,8 @@ FGEnvironmentMgr::FGEnvironmentMgr () : _altitude_n(fgGetNode("/position/altitude-ft", true)), _longitude_n(fgGetNode( "/position/longitude-deg", true )), _latitude_n( fgGetNode( "/position/latitude-deg", true )), - _positionTimeToLive(0.0) + _positionTimeToLive(0.0), + _3dCloudsEnableListener(new FG3DCloudsListener(fgClouds) ) { set_subsystem("controller", Environment::LayerInterpolateController::createInstance( fgGetNode("/environment/config", true ) )); set_subsystem("realwx", Environment::RealWxController::createInstance( fgGetNode("/environment/realwx", true ) ), 1.0 ); @@ -90,6 +127,8 @@ FGEnvironmentMgr::~FGEnvironmentMgr () delete fgClouds; delete _environment; + + delete _3dCloudsEnableListener; } void @@ -172,10 +211,6 @@ FGEnvironmentMgr::bind () _tiedProperties.setRoot( fgGetNode("/sim/rendering", true ) ); - _tiedProperties.Tie( "clouds3d-enable", fgClouds, - &FGClouds::get_3dClouds, - &FGClouds::set_3dClouds); - _tiedProperties.Tie( "clouds3d-density", thesky, &SGSky::get_3dCloudDensity, &SGSky::set_3dCloudDensity); diff --git a/src/Environment/environment_mgr.hxx b/src/Environment/environment_mgr.hxx index 18b1668bc..de669fd36 100644 --- a/src/Environment/environment_mgr.hxx +++ b/src/Environment/environment_mgr.hxx @@ -100,6 +100,7 @@ private: SGPropertyNode_ptr _latitude_n; double _positionTimeToLive; simgear::TiedPropertyList _tiedProperties; + SGPropertyChangeListener * _3dCloudsEnableListener; }; #endif // _ENVIRONMENT_MGR_HXX diff --git a/src/Main/WindowBuilder.cxx b/src/Main/WindowBuilder.cxx index 2ca83cfc6..ceb23b461 100644 --- a/src/Main/WindowBuilder.cxx +++ b/src/Main/WindowBuilder.cxx @@ -53,12 +53,8 @@ WindowBuilder::makeDefaultTraits(bool stencil) GraphicsContext::WindowingSystemInterface* wsi = osg::GraphicsContext::getWindowingSystemInterface(); GraphicsContext::Traits* traits = new osg::GraphicsContext::Traits; + traits->readDISPLAY(); - - unsigned screenwidth = 0; - unsigned screenheight = 0; - wsi->getScreenResolution(*traits, screenwidth, screenheight); - if (traits->displayNum < 0) traits->displayNum = 0; if (traits->screenNum < 0) @@ -76,6 +72,10 @@ WindowBuilder::makeDefaultTraits(bool stencil) if (stencil) traits->stencil = 8; + unsigned screenwidth = 0; + unsigned screenheight = 0; + wsi->getScreenResolution(*traits, screenwidth, screenheight); + traits->doubleBuffer = true; traits->mipMapGeneration = true; traits->windowName = "FlightGear"; diff --git a/src/Main/main.cxx b/src/Main/main.cxx index 59737e5fa..bc17b04b0 100644 --- a/src/Main/main.cxx +++ b/src/Main/main.cxx @@ -612,16 +612,17 @@ int fgMainInit( int argc, char **argv ) { fgInitFGRoot(argc, argv); // Check for the correct base package version - static char required_version[] = "2.0.0"; + static char required_version[] = "2.3.0"; string base_version = fgBasePackageVersion(); if ( !(base_version == required_version) ) { // tell the operator how to use this application SG_LOG( SG_GENERAL, SG_ALERT, "" ); // To popup the console on windows - cerr << endl << "Base package check failed ... " \ - << "Found version " << base_version << " at: " \ - << globals->get_fg_root() << endl; - cerr << "Please upgrade to version: " << required_version << endl; + cerr << endl << "Base package check failed:" << endl \ + << " Version " << base_version << " found at: " \ + << globals->get_fg_root() << endl \ + << " Version " << required_version << " is required." << endl \ + << "Please upgrade/downgrade base package." << endl; #ifdef _MSC_VER cerr << "Hit a key to continue..." << endl; cin.get(); diff --git a/src/Time/light.cxx b/src/Time/light.cxx index 79259c03c..861c496e9 100644 --- a/src/Time/light.cxx +++ b/src/Time/light.cxx @@ -77,6 +77,7 @@ FGLight::FGLight () _adj_fog_color(0, 0, 0, 0), _adj_sky_color(0, 0, 0, 0), _saturation(1.0), + _scattering(0.8), _dt_total(0) { } @@ -140,8 +141,13 @@ void FGLight::reinit () { void FGLight::bind () { SGPropertyNode *prop = globals->get_props(); - prop->tie("/sim/time/sun-angle-rad",SGRawValuePointer(&_sun_angle)); + + // Write Only prop->tie("/rendering/scene/saturation",SGRawValuePointer(&_saturation)); + prop->tie("/rendering/scene/scattering",SGRawValuePointer(&_scattering)); + + // Read Only + prop->tie("/sim/time/sun-angle-rad",SGRawValuePointer(&_sun_angle)); prop->tie("/rendering/scene/ambient/red",SGRawValuePointer(&_scene_ambient[0])); prop->tie("/rendering/scene/ambient/green",SGRawValuePointer(&_scene_ambient[1])); prop->tie("/rendering/scene/ambient/blue",SGRawValuePointer(&_scene_ambient[2])); @@ -170,8 +176,11 @@ void FGLight::bind () { void FGLight::unbind () { SGPropertyNode *prop = globals->get_props(); - prop->untie("/sim/time/sun-angle-rad"); prop->untie("/rendering/scene/saturation"); + prop->untie("/rendering/scene/scattering"); + prop->untie("/environment/relative-humidity"); + + prop->untie("/sim/time/sun-angle-rad"); prop->untie("/rendering/scene/ambient/red"); prop->untie("/rendering/scene/ambient/green"); prop->untie("/rendering/scene/ambient/blue"); @@ -224,6 +233,8 @@ void FGLight::update_sky_color () { if (_saturation < 0.0) _saturation = 0.0; else if (_saturation > 1.0) _saturation = 1.0; + if (_scattering < 0.0) _scattering = 0.0; + else if (_scattering > 1.0) _scattering = 1.0; float ambient = _ambient_tbl->interpolate( deg ) + visibility_inv/10; float diffuse = _diffuse_tbl->interpolate( deg ); @@ -242,7 +253,7 @@ void FGLight::update_sky_color () { // sky_brightness = 0.15; // used to force a dark sky (when testing) // set fog and cloud color - float sqrt_sky_brightness = 1.0 - sqrt(1.0 - sky_brightness); + float sqrt_sky_brightness = (1.0 - sqrt(1.0 - sky_brightness))*_scattering; _fog_color[0] = base_fog_color[0] * sqrt_sky_brightness; _fog_color[1] = base_fog_color[1] * sqrt_sky_brightness; _fog_color[2] = base_fog_color[2] * sqrt_sky_brightness; @@ -373,11 +384,10 @@ void FGLight::update_adj_fog_color () { 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 * _saturation; + float rf2 = avf * pow(rf1*rf1, 1/sif) * 1.0639 * _saturation * _scattering; 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; @@ -399,23 +409,19 @@ void FGLight::updateSunPos() 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); + fgSunPositionGST(t->getGst(), &_sun_lon, &_sun_lat); // 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, + SGVec3d sunpos(SGVec3d::fromGeoc(SGGeoc::fromRadM(_sun_lon, _sun_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 ); + " Sun Geocentric lat = " << _sun_lat + << " Geodcentric lat = " << _sun_lat ); // update the sun light vector sun_vec() = SGVec4f(toVec3f(normalize(sunpos)), 0); @@ -431,15 +437,16 @@ void FGLight::updateSunPos() // cout << "nsun = " << nsun[0] << "," << nsun[1] << "," // << nsun[2] << endl; - set_sun_angle( acos( dot ( world_up, nsun ) ) ); + _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; + _sun_rotation = atan2(local_sun_vec.x(), -local_sun_vec.y()); + + // cout << " Sky needs to rotate = " << _sun_rotation << " rads = " + // << _sun_rotation * SGD_RADIANS_TO_DEGREES << " degrees." << endl; } diff --git a/src/Time/light.hxx b/src/Time/light.hxx index 42a9f27d8..69987d337 100644 --- a/src/Time/light.hxx +++ b/src/Time/light.hxx @@ -96,7 +96,10 @@ private: // clear sky and fog color adjusted for sunset effects SGVec4f _adj_fog_color; SGVec4f _adj_sky_color; + + // input parameters affected by the weather system float _saturation; + float _scattering; double _dt_total; diff --git a/utils/fgpanel/FGGLApplication.cxx b/utils/fgpanel/FGGLApplication.cxx index 54550ad4b..b0f58d250 100644 --- a/utils/fgpanel/FGGLApplication.cxx +++ b/utils/fgpanel/FGGLApplication.cxx @@ -21,12 +21,19 @@ #endif #include "FGGLApplication.hxx" +#include + #ifdef HAVE_WINDOWS_H #include -#define snprintf sprintf_s +#define snprintf sprintf_s #endif +#if defined (SG_MAC) +#include +#include +#else #include #include +#endif #include #include diff --git a/utils/fgpanel/FGPNGTextureLoader.cxx b/utils/fgpanel/FGPNGTextureLoader.cxx index 1d18e4190..a8a8baef4 100644 --- a/utils/fgpanel/FGPNGTextureLoader.cxx +++ b/utils/fgpanel/FGPNGTextureLoader.cxx @@ -22,7 +22,11 @@ #endif #include "FGPNGTextureLoader.hxx" -#include +#if defined (SG_MAC) +#include +#else +#include +#endif #include #include #include diff --git a/utils/fgpanel/FGPanelApplication.cxx b/utils/fgpanel/FGPanelApplication.cxx index a57b8f6a3..0477be7e2 100644 --- a/utils/fgpanel/FGPanelApplication.cxx +++ b/utils/fgpanel/FGPanelApplication.cxx @@ -26,8 +26,13 @@ #include "FGGLApplication.hxx" #include "FGPanelApplication.hxx" +#if defined (SG_MAC) +#include +#include +#else #include #include +#endif #include #include diff --git a/utils/fgpanel/FGRGBTextureLoader.cxx b/utils/fgpanel/FGRGBTextureLoader.cxx index e9ef556ab..e5dbe6e03 100644 --- a/utils/fgpanel/FGRGBTextureLoader.cxx +++ b/utils/fgpanel/FGRGBTextureLoader.cxx @@ -26,8 +26,13 @@ #endif #include "FGRGBTextureLoader.hxx" +#if defined (SG_MAC) +#include +#include +#else #include -#include +#include +#endif #include #include diff --git a/utils/fgpanel/FGTextureLoaderInterface.hxx b/utils/fgpanel/FGTextureLoaderInterface.hxx index 58c15b853..09009309c 100644 --- a/utils/fgpanel/FGTextureLoaderInterface.hxx +++ b/utils/fgpanel/FGTextureLoaderInterface.hxx @@ -17,8 +17,12 @@ // #ifndef __FGTEXTURELOADERINTERFACE_HXX #define __FGTEXTURELOADERINTERFACE_HXX - +#include +#if defined (SG_MAC) +#include +#else #include +#endif #include class FGTextureLoaderInterface { public: diff --git a/utils/fgpanel/panel.cxx b/utils/fgpanel/panel.cxx index ff8cdc634..70c40876b 100644 --- a/utils/fgpanel/panel.cxx +++ b/utils/fgpanel/panel.cxx @@ -31,7 +31,11 @@ #include +#if defined (SG_MAC) +#include +#else #include +#endif #include