FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Remove ambient component of additional lights" because this was Yet Another Bad Idea

Browse Source 
Ambient light is attenuated so it is possible to achieve smooth edges with it

This reverts commit fe8ba57c94.
This commit is contained in:
Frederic Bouvier
2012-04-18 19:56:31 +02:00
parent fe8ba57c94
commit 4b607d6484
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/SGLightAnimation.cxx
+11 -2
View File
@@ -45,8 +45,9 @@ static EffectMap lightEffectMap;
class SGLightAnimation::UpdateCallback : public osg::NodeCallback { class SGLightAnimation::UpdateCallback : public osg::NodeCallback {
public: public:
UpdateCallback(string k, const SGExpressiond* v, SGVec4d d, SGVec4d s) : UpdateCallback(string k, const SGExpressiond* v, SGVec4d a, SGVec4d d, SGVec4d s) :
_key(k), _key(k),
_ambient(a),
_diffuse(d), _diffuse(d),
_specular(s), _specular(s),
_animationValue(v) _animationValue(v)
@@ -63,12 +64,16 @@ public:
if (iter != lightEffectMap.end()) { if (iter != lightEffectMap.end()) {
simgear::Effect* effect = iter->second; simgear::Effect* effect = iter->second;
SGPropertyNode* params = effect->parametersProp; SGPropertyNode* params = effect->parametersProp;
params->getNode("ambient")->setValue(_ambient * dim);
params->getNode("diffuse")->setValue(_diffuse * dim); params->getNode("diffuse")->setValue(_diffuse * dim);
params->getNode("specular")->setValue(_specular * dim); params->getNode("specular")->setValue(_specular * dim);
BOOST_FOREACH(osg::ref_ptr<simgear::Technique>& technique, effect->techniques) BOOST_FOREACH(osg::ref_ptr<simgear::Technique>& technique, effect->techniques)
{ {
BOOST_FOREACH(osg::ref_ptr<simgear::Pass>& pass, technique->passes) BOOST_FOREACH(osg::ref_ptr<simgear::Pass>& pass, technique->passes)
{ {
osg::Uniform* amb = pass->getUniform("Ambient");
if (amb)
amb->set(toOsg(_ambient) * dim);
osg::Uniform* dif = pass->getUniform("Diffuse"); osg::Uniform* dif = pass->getUniform("Diffuse");
if (dif) if (dif)
dif->set(toOsg(_diffuse) * dim); dif->set(toOsg(_diffuse) * dim);
@@ -83,6 +88,7 @@ public:
} }
public: public:
string _key; string _key;
SGVec4d _ambient;
SGVec4d _diffuse; SGVec4d _diffuse;
SGVec4d _specular; SGVec4d _specular;
SGSharedPtr<SGExpressiond const> _animationValue; SGSharedPtr<SGExpressiond const> _animationValue;
@@ -102,6 +108,7 @@ SGLightAnimation::SGLightAnimation(const SGPropertyNode* configNode,
_direction = SGVec3d( getConfig()->getDoubleValue("direction/x"), getConfig()->getDoubleValue("direction/y"), getConfig()->getDoubleValue("direction/z") ); _direction = SGVec3d( getConfig()->getDoubleValue("direction/x"), getConfig()->getDoubleValue("direction/y"), getConfig()->getDoubleValue("direction/z") );
double l = length(_direction); double l = length(_direction);
if (l > 0.001) _direction /= l; if (l > 0.001) _direction /= l;
_ambient = GET_COLOR_VALUE("ambient");
_diffuse = GET_COLOR_VALUE("diffuse"); _diffuse = GET_COLOR_VALUE("diffuse");
_specular = GET_COLOR_VALUE("specular"); _specular = GET_COLOR_VALUE("specular");
_attenuation = SGVec3d( getConfig()->getDoubleValue("attenuation/c"), getConfig()->getDoubleValue("attenuation/l"), getConfig()->getDoubleValue("attenuation/q") ); _attenuation = SGVec3d( getConfig()->getDoubleValue("attenuation/c"), getConfig()->getDoubleValue("attenuation/l"), getConfig()->getDoubleValue("attenuation/q") );
@@ -123,7 +130,7 @@ SGLightAnimation::createAnimationGroup(osg::Group& parent)
osg::Group* grp = new osg::Group; osg::Group* grp = new osg::Group;
grp->setName("light animation node"); grp->setName("light animation node");
if (_animationValue.valid()) if (_animationValue.valid())
grp->setUpdateCallback(new UpdateCallback(_key, _animationValue, _diffuse, _specular)); grp->setUpdateCallback(new UpdateCallback(_key, _animationValue, _ambient, _diffuse, _specular));
parent.addChild(grp); parent.addChild(grp);
grp->setNodeMask( simgear::MODELLIGHT_BIT ); grp->setNodeMask( simgear::MODELLIGHT_BIT );
return grp; return grp;
@@ -149,6 +156,7 @@ SGLightAnimation::install(osg::Node& node)
SGPropertyNode* params = makeChild(effectProp, "parameters"); SGPropertyNode* params = makeChild(effectProp, "parameters");
params->getNode("position",true)->setValue(SGVec4d(_position.x(),_position.y(),_position.z(),1.0)); params->getNode("position",true)->setValue(SGVec4d(_position.x(),_position.y(),_position.z(),1.0));
params->getNode("direction",true)->setValue(SGVec4d(_direction.x(),_direction.y(),_direction.z(),0.0)); params->getNode("direction",true)->setValue(SGVec4d(_direction.x(),_direction.y(),_direction.z(),0.0));
params->getNode("ambient",true)->setValue(_ambient * dim);
params->getNode("diffuse",true)->setValue(_diffuse * dim); params->getNode("diffuse",true)->setValue(_diffuse * dim);
params->getNode("specular",true)->setValue(_specular * dim); params->getNode("specular",true)->setValue(_specular * dim);
params->getNode("attenuation",true)->setValue(_attenuation); params->getNode("attenuation",true)->setValue(_attenuation);
@@ -191,6 +199,7 @@ SGLightAnimation::install(osg::Node& node)
SGPropertyNode* params = makeChild(effectProp, "parameters"); SGPropertyNode* params = makeChild(effectProp, "parameters");
params->getNode("position",true)->setValue(SGVec4d(_position.x(),_position.y(),_position.z(),1.0)); params->getNode("position",true)->setValue(SGVec4d(_position.x(),_position.y(),_position.z(),1.0));
params->getNode("ambient",true)->setValue(_ambient * dim);
params->getNode("diffuse",true)->setValue(_diffuse * dim); params->getNode("diffuse",true)->setValue(_diffuse * dim);
params->getNode("specular",true)->setValue(_specular * dim); params->getNode("specular",true)->setValue(_specular * dim);
params->getNode("attenuation",true)->setValue(_attenuation); params->getNode("attenuation",true)->setValue(_attenuation);
simgear/scene/model/animation.hxx
+1
View File
@@ -360,6 +360,7 @@ private:
string _light_type; string _light_type;
SGVec3d _position; SGVec3d _position;
SGVec3d _direction; SGVec3d _direction;
SGVec4d _ambient;
SGVec4d _diffuse; SGVec4d _diffuse;
SGVec4d _specular; SGVec4d _specular;
SGVec3d _attenuation; SGVec3d _attenuation;