From 053ba83be66c3eb7a565b5d78ac094fa3a4ad125 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 30 Oct 2017 09:32:04 +0000
Subject: [PATCH] Merged support for StateSet::DefineList from shader_pipeline
 branch

---
 CMakeLists.txt                               |  2 +-
 src/osgWrappers/serializers/osg/StateSet.cpp | 49 ++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6625f0f86..16c20b47a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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
diff --git a/src/osgWrappers/serializers/osg/StateSet.cpp b/src/osgWrappers/serializers/osg/StateSet.cpp
index 8a94d1875..1112dbd82 100644
--- a/src/osgWrappers/serializers/osg/StateSet.cpp
+++ b/src/osgWrappers/serializers/osg/StateSet.cpp
@@ -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
+    }
 }