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

Modified Files:

Browse Source 
animation.cxx animation.hxx: Fix crash on A-10 load
This commit is contained in:
frohlich
2006-11-12 10:32:42 +00:00
parent 51bb2974bc
commit d54aea0036
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/animation.cxx
+4 -4
View File
@@ -1052,6 +1052,7 @@ void SGAlphaTestAnimation::init()
alphaFunc->setReferenceValue(_alpha_clamp); alphaFunc->setReferenceValue(_alpha_clamp);
stateSet->setAttribute(alphaFunc); stateSet->setAttribute(alphaFunc);
stateSet->setMode(GL_ALPHA_TEST, osg::StateAttribute::ON); stateSet->setMode(GL_ALPHA_TEST, osg::StateAttribute::ON);
stateSet->setMode(GL_BLEND, osg::StateAttribute::ON);
stateSet->setRenderingHint(osg::StateSet::TRANSPARENT_BIN); stateSet->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
} }
@@ -1307,7 +1308,6 @@ public:
} }
void cloneMaterial(osg::StateSet* stateSet) void cloneMaterial(osg::StateSet* stateSet)
{ {
osg::StateAttribute* stateAttr; osg::StateAttribute* stateAttr;
stateAttr = stateSet->getAttribute(osg::StateAttribute::MATERIAL); stateAttr = stateSet->getAttribute(osg::StateAttribute::MATERIAL);
if (!stateAttr) if (!stateAttr)
@@ -1321,7 +1321,7 @@ public:
} }
stateSet->setAttribute(material); stateSet->setAttribute(material);
} }
std::vector<osg::Material*> materialList; std::vector<osg::ref_ptr<osg::Material> > materialList;
}; };
void SGMaterialAnimation::cloneMaterials(osg::Group *b) void SGMaterialAnimation::cloneMaterials(osg::Group *b)
@@ -1333,9 +1333,9 @@ void SGMaterialAnimation::cloneMaterials(osg::Group *b)
void SGMaterialAnimation::setMaterialBranch(osg::Group *b) void SGMaterialAnimation::setMaterialBranch(osg::Group *b)
{ {
std::vector<osg::Material*>::iterator i; std::vector<osg::ref_ptr<osg::Material> >::iterator i;
for (i = _materialList.begin(); i != _materialList.end(); ++i) { for (i = _materialList.begin(); i != _materialList.end(); ++i) {
osg::Material* material = *i; osg::Material* material = i->get();
if (_update & DIFFUSE) { if (_update & DIFFUSE) {
osg::Vec4 v = _diff.rgba(); osg::Vec4 v = _diff.rgba();
float alpha = material->getDiffuse(osg::Material::FRONT_AND_BACK)[3]; float alpha = material->getDiffuse(osg::Material::FRONT_AND_BACK)[3];
simgear/scene/model/animation.hxx
+1 -1
View File
@@ -519,7 +519,7 @@ private:
SGPropertyNode_ptr _shi_prop; SGPropertyNode_ptr _shi_prop;
SGPropertyNode_ptr _thresh_prop; SGPropertyNode_ptr _thresh_prop;
SGPropertyNode_ptr _tex_prop; SGPropertyNode_ptr _tex_prop;
std::vector<osg::Material*> _materialList; std::vector<osg::ref_ptr<osg::Material> > _materialList;
osg::ref_ptr<osg::AlphaFunc> _alphaFunc; osg::ref_ptr<osg::AlphaFunc> _alphaFunc;
osg::ref_ptr<osg::Texture2D> _texture2D; osg::ref_ptr<osg::Texture2D> _texture2D;