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

Merged support for StateSet::DefineList from shader_pipeline branch

Browse Source
This commit is contained in:
Robert Osfield
2017-10-30 09:32:04 +00:00
parent b3515d0e09
commit 053ba83be6
2 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -116,7 +116,7 @@ PROJECT(OpenSceneGraph)
SET(OPENSCENEGRAPH_MAJOR_VERSION 3)
SET(OPENSCENEGRAPH_MINOR_VERSION 5)
SET(OPENSCENEGRAPH_PATCH_VERSION 8)
SET(OPENSCENEGRAPH_SOVERSION 150)
SET(OPENSCENEGRAPH_SOVERSION 151)
# set to 0 when not a release candidate, non zero means that any generated
# git tags will be treated as release candidates of given number

49
src/osgWrappers/serializers/osg/StateSet.cpp
View File

@@ -270,6 +270,50 @@ static bool writeUniformList( osgDB::OutputStream& os, const osg::StateSet& ss )
return true;
}
// _defineList
static bool checkDefineList( const osg::StateSet& ss )
{
return ss.getDefineList().size()>0;
}
static bool readDefineList( osgDB::InputStream& is, osg::StateSet& ss )
{
unsigned int size = is.readSize(); is >> is.BEGIN_BRACKET;
for ( unsigned int i=0; i<size; ++i )
{
std::string defineName;
is.readWrappedString( defineName );
std::string defineValue;
is.readWrappedString( defineValue );
is >> is.PROPERTY("Value");
int overrideValue = readValue( is );
ss.setDefine(defineName, defineValue, overrideValue);
}
is >> is.END_BRACKET;
return true;
}
static bool writeDefineList( osgDB::OutputStream& os, const osg::StateSet& ss )
{
const osg::StateSet::DefineList& df = ss.getDefineList();
os.writeSize(df.size()); os << os.BEGIN_BRACKET << std::endl;
for ( osg::StateSet::DefineList::const_iterator itr=df.begin();
itr!=df.end(); ++itr )
{
os.writeWrappedString(itr->first);
os.writeWrappedString(itr->second.first);
os << os.PROPERTY("Value");
writeValue(os, itr->second.second);
os << std::endl;
}
os << os.END_BRACKET << std::endl;
return true;
}
REGISTER_OBJECT_WRAPPER( StateSet,
new osg::StateSet,
osg::StateSet,
@@ -295,4 +339,9 @@ REGISTER_OBJECT_WRAPPER( StateSet,
ADD_BOOL_SERIALIZER( NestRenderBins, true ); // _nestRenderBins
ADD_OBJECT_SERIALIZER( UpdateCallback, osg::StateSet::Callback, NULL ); // _updateCallback
ADD_OBJECT_SERIALIZER( EventCallback, osg::StateSet::Callback, NULL ); // _eventCallback
{
UPDATE_TO_VERSION_SCOPED( 151 )
ADD_USER_SERIALIZER( DefineList ); // _defineList
}
}