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

Replaced tabs with spaces.

Browse Source
This commit is contained in:
Robert Osfield
2005-11-17 15:03:51 +00:00
parent 0e16b64665
commit d3541b96ed
116 changed files with 6866 additions and 6855 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/osgPlugins/osg/VertexProgram.cpp
View File

@@ -52,48 +52,51 @@ bool VertexProgram_readLocalData(Object& obj, Input& fr)
{
int index;
fr[1].getInt(index);
fr += 2;
osg::Matrix matrix;
if (readMatrix(matrix,fr))
{
vertexProgram.setMatrix(index, matrix);
}
fr += 2;
osg::Matrix matrix;
if (readMatrix(matrix,fr))
{
vertexProgram.setMatrix(index, matrix);
}
iteratorAdvanced = true;
}
if (fr.matchSequence("code {")) {
std::string code;
fr += 2;
iteratorAdvanced = true;
int entry = fr[0].getNoNestedBrackets();
while (!fr.eof() && fr[0].getNoNestedBrackets() >= entry) {
if (fr[0].getStr()) {
code.append(std::string(fr[0].getStr()));
code += '\n'
;
}
++fr;
}
std::string code;
fr += 2;
iteratorAdvanced = true;
int entry = fr[0].getNoNestedBrackets();
while (!fr.eof() && fr[0].getNoNestedBrackets() >= entry)
{
if (fr[0].getStr())
{
code.append(std::string(fr[0].getStr()));
code += '\n';
}
++fr;
}
vertexProgram.setVertexProgram(code);
}
if( fr.matchSequence("file %s")) {
std::string filename = fr[1].getStr();
fr+=2;
iteratorAdvanced = true;
ifstream vfstream( filename.c_str() );
if( vfstream ) {
ostringstream vstream;
char ch;
/* xxx better way to transfer a ifstream to a string?? */
while( vfstream.get(ch)) vstream.put(ch);
vertexProgram.setVertexProgram( vstream.str() );
}
if( fr.matchSequence("file %s"))
{
std::string filename = fr[1].getStr();
fr+=2;
iteratorAdvanced = true;
ifstream vfstream( filename.c_str() );
if( vfstream )
{
ostringstream vstream;
char ch;
/* xxx better way to transfer a ifstream to a string?? */
while( vfstream.get(ch)) vstream.put(ch);
vertexProgram.setVertexProgram( vstream.str() );
}
}
return iteratorAdvanced;
@@ -116,7 +119,7 @@ bool VertexProgram_writeLocalData(const Object& obj,Output& fw)
for(mi=mpl.begin(); mi!=mpl.end(); mi++)
{
fw.indent() << "Matrix " << (*mi).first << " ";
writeMatrix((*mi).second,fw);
writeMatrix((*mi).second,fw);
}
@@ -124,7 +127,7 @@ bool VertexProgram_writeLocalData(const Object& obj,Output& fw)
std::istringstream iss(vertexProgram.getVertexProgram());
std::string line;
while (std::getline(iss, line)) {
lines.push_back(line);
lines.push_back(line);
}
fw.indent() << "code {\n";
@@ -132,7 +135,7 @@ bool VertexProgram_writeLocalData(const Object& obj,Output& fw)
std::vector<std::string>::const_iterator j;
for (j=lines.begin(); j!=lines.end(); ++j) {
fw.indent() << "\"" << *j << "\"\n";
fw.indent() << "\"" << *j << "\"\n";
}
fw.moveOut();