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

Jim Wilson:

Browse Source 
Fix a couple of loose ends and missed edits on the earlier patch.  For the
most part no change in functionality.
This commit is contained in:
ehofman
2005-01-31 18:21:12 +00:00
parent 9ab77d65f4
commit e39e6893e0
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
simgear/scene/model/animation.cxx
View File

@@ -1117,14 +1117,14 @@ void SGAlphaTestAnimation::setAlphaClampToBranch(ssgBranch *b, float clamp)
SGEmissionAnimation::SGEmissionAnimation( SGPropertyNode *prop_root, SGPropertyNode_ptr props)
: SGAnimation(props, new ssgBranch),
_prop((SGPropertyNode *)prop_root->getNode(props->getStringValue("property", "/null"), true))
_prop((SGPropertyNode *)prop_root->getNode(props->getStringValue("property", "/null"), true)),
_color0(props->getFloatValue("emiss-red", 0.0)),
_color1(props->getFloatValue("emiss-green", 0.0)),
_color2(props->getFloatValue("emiss-blue", 0.0)),
_old_brightness(0.0),
_cached_material(0),
_cloned_material(0)
{
_color0 = props->getFloatValue("emiss-red", 0.0);
_color1 = props->getFloatValue("emiss-green", 0.0);
_color2 = props->getFloatValue("emiss-blue", 0.0);
_old_brightness = 0;
ssgSimpleState* _cached_material;
ssgSimpleState* _cloned_material;
}
SGEmissionAnimation::~SGEmissionAnimation ()
@@ -1193,7 +1193,6 @@ void SGEmissionAnimation::setEmissionBranch(ssgBranch *b, float color0, float co
ssgEntity *e = b->getKid(i);
if (e->isAKindOf(ssgTypeLeaf())) {
ssgSimpleState*s = (ssgSimpleState*)((ssgLeaf*)e)->getState();
s->enable( GL_ALPHA_TEST );
s->setMaterial( GL_EMISSION, color0, color1, color2, 0.0 );
} else if (e->isAKindOf(ssgTypeBranch())) {
setEmissionBranch((ssgBranch*)e, color0, color1, color2);