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

From Terry Welsh, added support for reading and writing osg::FragmentProgram

Browse Source 
local parameters.
This commit is contained in:
Robert Osfield
2004-06-28 10:00:21 +00:00
parent 9de43e833f
commit 20de9666dd
3 changed files with 74 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/osg/FragmentProgram
View File

@@ -166,12 +166,20 @@ class SG_EXPORT FragmentProgram : public StateAttribute
/** Get the fragment program.*/
inline const std::string& getFragmentProgram() const { return _fragmentProgram; }
/** Program Parameters */
/** Set Program Parameters */
inline void setProgramLocalParameter(const GLuint index, const Vec4& p)
{
_programLocalParameters[index] = p;
}
typedef std::map<GLuint,Vec4> LocalParamList;
/** Get list of Program Parameters */
inline LocalParamList& getLocalParamList() { return _programLocalParameters; }
/** Get const list of Program Parameters */
inline const LocalParamList& getLocalParamList() const { return _programLocalParameters; }
/** Matrix */
inline void setMatrix(const GLenum mode, const Matrix& matrix)
{
@@ -255,7 +263,6 @@ class SG_EXPORT FragmentProgram : public StateAttribute
std::string _fragmentProgram;
typedef std::map<GLuint,Vec4> LocalParamList;
LocalParamList _programLocalParameters;
typedef std::map<GLenum,Matrix> MatrixList;

13
src/osgPlugins/ive/FragmentProgram.cpp
View File

@@ -34,6 +34,14 @@ void FragmentProgram::write( DataOutputStream* out )
}
// Write FragmentProgram properties.
FragmentProgram::LocalParamList lpl = getLocalParamList();
out->writeInt(lpl.size());
for(FragmentProgram::LocalParamList::iterator i=lpl.begin(); i!=lpl.end(); ++i)
{
out->writeInt(i->first);
out->writeVec4(i->second);
}
// Write program.
out->writeString( this->getFragmentProgram() );
}
@@ -58,6 +66,11 @@ void FragmentProgram::read(DataInputStream* in){
}
// Read data
int i, size;
size = in->readInt();
for(i=0; i<size; i++)
this->setProgramLocalParameter( in->readInt(), in->readVec4() );
std::string fp = in->readString();
this->setFragmentProgram( fp );
}

80
src/osgPlugins/osg/FragmentProgram.cpp
View File

@@ -31,37 +31,53 @@ bool FragmentProgram_readLocalData(Object& obj, Input& fr)
FragmentProgram& fragmentProgram = static_cast<FragmentProgram&>(obj);
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;
}
if (fr[0].matchWord("ProgramLocalParameter"))
{
int index;
Vec4 vec;
fr[1].getInt(index);
fr[2].getFloat(vec[0]);
fr[3].getFloat(vec[1]);
fr[4].getFloat(vec[2]);
fr[5].getFloat(vec[3]);
fr += 6;
iteratorAdvanced = true;
fragmentProgram.setProgramLocalParameter(index, vec);
}
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;
}
fragmentProgram.setFragmentProgram(code);
}
if( fr.matchSequence("file %s")) {
std::string filename = fr[1].getStr();
fr += 2;
iteratorAdvanced = true;
if( fr.matchSequence("file %s"))
{
std::string filename = fr[1].getStr();
fr += 2;
iteratorAdvanced = true;
ifstream vfstream( filename.c_str() );
ifstream vfstream( filename.c_str() );
if( vfstream ) {
ostringstream vstream;
char ch;
if( vfstream ) {
ostringstream vstream;
char ch;
/* xxx better way to transfer a ifstream to a string?? */
while( vfstream.get(ch)) vstream.put(ch);
/* xxx better way to transfer a ifstream to a string?? */
while( vfstream.get(ch)) vstream.put(ch);
fragmentProgram.setFragmentProgram( vstream.str() );
}
fragmentProgram.setFragmentProgram( vstream.str() );
}
}
return iteratorAdvanced;
@@ -72,19 +88,27 @@ bool FragmentProgram_writeLocalData(const Object& obj,Output& fw)
{
const FragmentProgram& fragmentProgram = static_cast<const FragmentProgram&>(obj);
const FragmentProgram::LocalParamList& lpl = fragmentProgram.getLocalParamList();
FragmentProgram::LocalParamList::const_iterator i;
for(i=lpl.begin(); i!=lpl.end(); i++)
{
fw.indent() << "ProgramLocalParameter " << (*i).first << " " << (*i).second << std::endl;
}
std::vector<std::string> lines;
std::istringstream iss(fragmentProgram.getFragmentProgram());
std::string line;
while (std::getline(iss, line)) {
lines.push_back(line);
while (std::getline(iss, line))
{
lines.push_back(line);
}
fw.indent() << "code {\n";
fw.moveIn();
std::vector<std::string>::const_iterator j;
for (j=lines.begin(); j!=lines.end(); ++j) {
fw.indent() << "\"" << *j << "\"\n";
for (j=lines.begin(); j!=lines.end(); ++j)
{
fw.indent() << "\"" << *j << "\"\n";
}
fw.moveOut();