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

Implemented inplace replacement

Browse Source
This commit is contained in:
Robert Osfield 2017-10-18 10:11:43 +01:00
parent cc8a34cd14
commit 6496c304f9
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/osg/Shader.cpp
View File

@ -91,16 +91,15 @@ struct NoneOf
// Replaces all occurrences of "from" with the contents of "to"
// It does only one pass, i.e. new matches created in a position before the current match are not replaced
std::string replaceAll(const std::string& str, const std::string& from, const std::string& to)
void replaceAll(std::string& str, const std::string& from, const std::string& to)
{
std::string result = str;
std::string::size_type pos = 0;
while ((pos = result.find(from, pos)) != std::string::npos)
while ((pos = str.find(from, pos)) != std::string::npos)
{
result.replace(pos, from.length(), to);
str.replace(pos, from.length(), to);
pos += to.length();
}
return result;
}
}
@ -657,7 +656,7 @@ void Shader::PerContextShader::compileShader(osg::State& state)
else
{
// Convert all windows line endings to \n
source = replaceAll(source, "\r\n", "\n");
replaceAll(source, "\r\n", " \n");
std::string versionLine;
unsigned int lineNum = 0;