_sun_lat(0),
_moon_lon(0),
_moon_gc_lat(0),
- _sunpos(0, 0, 0),
- _moonpos(0, 0, 0),
_sun_vec(0, 0, 0, 0),
_moon_vec(0, 0, 0, 0),
_sun_vec_inv(0, 0, 0, 0),
_scene_ambient(0, 0, 0, 0),
_scene_diffuse(0, 0, 0, 0),
_scene_specular(0, 0, 0, 0),
+ _scene_chrome(0, 0, 0, 0),
_sky_color(0, 0, 0, 0),
_fog_color(0, 0, 0, 0),
_cloud_color(0, 0, 0, 0),
prop->tie("/rendering/scene/specular/red",SGRawValuePointer<float>(&_scene_specular[0]));
prop->tie("/rendering/scene/specular/green",SGRawValuePointer<float>(&_scene_specular[1]));
prop->tie("/rendering/scene/specular/blue",SGRawValuePointer<float>(&_scene_specular[2]));
+ prop->tie("/rendering/dome/sky/red",SGRawValuePointer<float>(&_sky_color[0]));
+ prop->tie("/rendering/dome/sky/green",SGRawValuePointer<float>(&_sky_color[1]));
+ prop->tie("/rendering/dome/sky/blue",SGRawValuePointer<float>(&_sky_color[2]));
+ prop->tie("/rendering/dome/fog/red",SGRawValuePointer<float>(&_fog_color[0]));
+ prop->tie("/rendering/dome/fog/green",SGRawValuePointer<float>(&_fog_color[1]));
+ prop->tie("/rendering/dome/fog/blue",SGRawValuePointer<float>(&_fog_color[2]));
+ // Properties used directly by effects
+ _chromeProps[0] = prop->getNode("/rendering/scene/chrome-light/red", true);
+ _chromeProps[1] = prop->getNode("/rendering/scene/chrome-light/green",
+ true);
+ _chromeProps[2] = prop->getNode("/rendering/scene/chrome-light/blue", true);
+ _chromeProps[3] = prop->getNode("/rendering/scene/chrome-light/alpha",
+ true);
+ for (int i = 0; i < 4; ++i)
+ _chromeProps[i]->setValue(0.0);
}
void FGLight::unbind () {
prop->untie("/rendering/scene/specular/red");
prop->untie("/rendering/scene/specular/green");
prop->untie("/rendering/scene/specular/blue");
+ prop->untie("/rendering/dome/sun/red");
+ prop->untie("/rendering/dome/sun/green");
+ prop->untie("/rendering/dome/sun/blue");
+ prop->untie("/rendering/dome/sky/red");
+ prop->untie("/rendering/dome/sky/green");
+ prop->untie("/rendering/dome/sky/blue");
+ prop->untie("/rendering/dome/fog/red");
+ prop->untie("/rendering/dome/fog/green");
+ prop->untie("/rendering/dome/fog/blue");
}
// if the 4th field is 0.0, this specifies a direction ...
// const GLfloat white[4] = { 1.0, 1.0, 1.0, 1.0 };
const GLfloat base_sky_color[4] = { 0.31, 0.43, 0.69, 1.0 };
- const GLfloat base_fog_color[4] = { 0.84, 0.87, 1.0, 1.0 };
+ const GLfloat base_fog_color[4] = { 0.63, 0.72, 0.88, 1.0 };
SG_LOG( SG_EVENT, SG_DEBUG, "Updating light parameters." );
// calculate lighting parameters based on sun's relative angle to
// local up
- float av = thesky->get_visibility();
- if (av > 45000.0) av = 45000.0;
+ static SGConstPropertyNode_ptr humidity = fgGetNode("/environment/relative-humidity");
+ float av = humidity->getFloatValue() * 45;
float visibility_log = log(av)/11.0;
float visibility_inv = (45000.0 - av)/45000.0;
_scene_ambient[3] = 1.0;
gamma_correct_rgb( _scene_ambient.data() );
- SGVec4f sun_color = thesky->get_sun_color();
- float ndiff = (ambient + specular) / 2;
- float idiff = 1.0 - ndiff;
- _scene_diffuse[0] = (sun_color[0]*ndiff + _fog_color[0]*idiff) * diffuse;
- _scene_diffuse[1] = (sun_color[1]*ndiff + _fog_color[1]*idiff) * diffuse;
- _scene_diffuse[2] = (sun_color[2]*ndiff + _fog_color[2]*idiff) * diffuse;
+ SGVec4f color = thesky->get_scene_color();
+ _scene_diffuse[0] = color[0] * diffuse;
+ _scene_diffuse[1] = color[1] * diffuse;
+ _scene_diffuse[2] = color[2] * diffuse;
_scene_diffuse[3] = 1.0;
gamma_correct_rgb( _scene_diffuse.data() );
- _scene_specular[0] = sun_color[0] * specular;
- _scene_specular[1] = sun_color[1] * specular;
- _scene_specular[2] = sun_color[2] * specular;
+ SGVec4f chrome = _scene_ambient * .4f + _scene_diffuse;
+ chrome[3] = 1.0f;
+ if (chrome != _scene_chrome) {
+ _scene_chrome = chrome;
+ for (int i = 0; i < 4; ++i)
+ _chromeProps[i]->setValue(static_cast<double>(_scene_chrome[i]));
+ }
+
+ color = thesky->get_sun_color();
+ _scene_specular[0] = color[0] * specular;
+ _scene_specular[1] = color[1] * specular;
+ _scene_specular[2] = color[2] * specular;
_scene_specular[3] = 1.0;
gamma_correct_rgb( _scene_specular.data() );
}
// revert to unmodified values before usign them.
//
- SGVec4f sun_color = thesky->get_sun_color();
+ SGVec4f color = thesky->get_scene_color();
gamma_restore_rgb( _fog_color.data() );
gamma_restore_rgb( _sky_color.data() );
// Calculate the fog color in the direction of the sun for
// sunrise/sunset effects.
//
- float s_red = (_fog_color[0] + 2 * sun_color[0]*sun_color[0]) / 3;
- float s_green = (_fog_color[1] + 2 * sun_color[1]*sun_color[1]) / 3;
- float s_blue = (_fog_color[2] + 2 * sun_color[2]) / 3;
+ float s_red = color[0]*color[0]*color[0];
+ float s_green = color[1]*color[1]*color[1];
+ float s_blue = color[2]*color[2];
// interpolate beween the sunrise/sunset color and the color
// at the opposite direction of this effect. Take in account
// the current visibility.
//
float av = thesky->get_visibility();
- if (av > 45000)
- av = 45000;
+ if (av > 45000) av = 45000;
float avf = 0.87 - (45000 - av) / 83333.33;
float sif = 0.5 - cos(_sun_angle*2)/2;
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;
float rf3 = 1.0 - rf2;
_adj_fog_color[0] = rf3 * _fog_color[0] + rf2 * s_red;
_adj_fog_color[2] = rf3 * _fog_color[2] + rf2 * s_blue;
gamma_correct_rgb( _adj_fog_color.data() );
- float hf2, hf1 = vert_rotation / SGD_PI_2;
- hf2 = 1.0 - hf1;
- _adj_sky_color[0] = hf1 * _sky_color[0] + hf2*rf2 * s_red;
- _adj_sky_color[1] = hf1 * _sky_color[1] + hf2*rf2 * s_green;
- _adj_sky_color[2] = hf1 * _sky_color[2] + hf2*rf2 * s_blue;
- gamma_correct_rgb( _adj_sky_color.data() );
-
// make sure the colors have their original value before they are being
// used by the rest of the program.
//
projects / flightgear.git / blobdiff