FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #124 from LaurensVoerman/Submissions3

Browse Source 
RigTransformHardware fix: warn; don't crash if MAX_MATRIX not found
This commit is contained in:
OpenSceneGraph git repository 2016-09-02 17:28:40 +01:00 committed by GitHub
commit 0873a69ff5
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/osgAnimation/RigTransformHardware.cpp
View File

@ -251,10 +251,16 @@ bool RigTransformHardware::init(RigGeometry& geom)
std::string str = _shader->getShaderSource();
std::string toreplace = std::string("MAX_MATRIX");
std::size_t start = str.find(toreplace);
std::stringstream ss;
ss << getMatrixPaletteUniform()->getNumElements();
str.replace(start, toreplace.size(), ss.str());
_shader->setShaderSource(str);
if (std::string::npos != start) {
std::stringstream ss;
ss << getMatrixPaletteUniform()->getNumElements();
str.replace(start, toreplace.size(), ss.str());
_shader->setShaderSource(str);
}
else
{
OSG_WARN << "MAX_MATRIX not found in Shader! " << str << std::endl;
}
OSG_INFO << "Shader " << str << std::endl;
}