From fd46645ade14515d9636215f5340b5ca4bd595dc Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 3 Jun 2015 09:14:35 +0000
Subject: [PATCH] From KOS, "New classes for osgAnimation presented:
 UpdateFloatUniform, UpdateVec3fUniform and UpdateMatrixfUniform (based on
 UpdateUniform template)

Classes operate like osgAnimation::UpdateMaterial for Material's diffuse component, but change Uniform."


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14890 16af8721-9629-0410-8352-f15c8da7e697
---
 include/osgAnimation/UpdateUniform            | 97 +++++++++++++++++++
 src/osgAnimation/CMakeLists.txt               |  1 +
 .../osgAnimation/LibraryWrapper.cpp           |  4 +
 .../osgAnimation/UpdateFloatUniform.cpp       | 17 ++++
 .../osgAnimation/UpdateMatrixfUniform.cpp     | 17 ++++
 .../osgAnimation/UpdateVec3fUniform.cpp       | 17 ++++
 6 files changed, 153 insertions(+)
 create mode 100644 include/osgAnimation/UpdateUniform
 create mode 100644 src/osgWrappers/serializers/osgAnimation/UpdateFloatUniform.cpp
 create mode 100644 src/osgWrappers/serializers/osgAnimation/UpdateMatrixfUniform.cpp
 create mode 100644 src/osgWrappers/serializers/osgAnimation/UpdateVec3fUniform.cpp

diff --git a/include/osgAnimation/UpdateUniform b/include/osgAnimation/UpdateUniform
new file mode 100644
index 000000000..623a3406b
--- /dev/null
+++ b/include/osgAnimation/UpdateUniform
@@ -0,0 +1,97 @@
+#ifndef OSGANIMATION_UPDATE_UNIFORM
+#define OSGANIMATION_UPDATE_UNIFORM 1
+
+#include <osgAnimation/AnimationUpdateCallback>
+#include <osgAnimation/Export>
+#include <osg/NodeVisitor>
+#include <osg/Uniform>
+
+namespace osgAnimation
+{
+    template <typename T>
+    class OSGANIMATION_EXPORT UpdateUniform : public AnimationUpdateCallback<osg::UniformCallback>
+    {
+    protected:
+        osg::ref_ptr< TemplateTarget<T> > _uniformTarget;
+
+    public:
+        UpdateUniform(const std::string& aName = "")
+        :    AnimationUpdateCallback<osg::UniformCallback>(aName)
+        {
+            _uniformTarget = new TemplateTarget<T>();        // NOTE: initial value is undefined
+        }
+
+        UpdateUniform(const UpdateUniform& updateuniform,
+                      const osg::CopyOp& copyop) :
+            AnimationUpdateCallback<osg::UniformCallback>(updateuniform, copyop)
+        {
+            _uniformTarget = new TemplateTarget<T>(*(updateuniform._uniformTarget));
+        }
+
+        META_Object(osgAnimation, UpdateUniform<T>);
+
+        /** Callback method called by the NodeVisitor when visiting a node.*/
+        virtual void operator () (osg::Uniform* uniform, osg::NodeVisitor* nv)
+        {
+            if (nv && nv->getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR)
+                update(*uniform);
+
+            traverse(uniform, nv);
+        }
+
+        bool link(Channel* channel)
+        {
+            if (channel->getName().find("uniform") != std::string::npos)
+                return channel->setTarget(_uniformTarget);
+            else
+                OSG_WARN << "Channel " << channel->getName() << " does not contain a valid symbolic name for this class " << className() << std::endl;
+
+            return false;
+        }
+
+        void update(osg::Uniform& uniform)
+        {
+            T value = _uniformTarget->getValue();
+            uniform.set(value);
+        }
+
+    };
+
+    // float
+    struct UpdateFloatUniform : public UpdateUniform<float>
+    {
+        UpdateFloatUniform(const std::string& aName = "") : UpdateUniform<float>(aName) { }
+        UpdateFloatUniform(const UpdateFloatUniform& ufu,
+                           const osg::CopyOp& copyop) :
+            osg::Object(ufu, copyop),        // copy name
+            UpdateUniform<float>(ufu, copyop) { }
+
+        META_Object(osgAnimation, UpdateFloatUniform);
+    };
+
+    // Vec3f
+    struct UpdateVec3fUniform : public UpdateUniform<osg::Vec3f>
+    {
+        UpdateVec3fUniform(const std::string& aName = "") : UpdateUniform<osg::Vec3f>(aName) { }
+        UpdateVec3fUniform(const UpdateVec3fUniform& uv3fu,
+                           const osg::CopyOp& copyop) :
+            osg::Object(uv3fu, copyop),        // copy name
+            UpdateUniform<osg::Vec3f>(uv3fu, copyop) { }
+
+        META_Object(osgAnimation, UpdateVec3fUniform);
+    };
+
+    // Matrixf
+    struct UpdateMatrixfUniform : public UpdateUniform<osg::Matrixf>
+    {
+        UpdateMatrixfUniform(const std::string& aName = "") : UpdateUniform<osg::Matrixf>(aName) { }
+        UpdateMatrixfUniform(const UpdateMatrixfUniform& umfu,
+                           const osg::CopyOp& copyop) :
+            osg::Object(umfu, copyop),        // copy name
+            UpdateUniform<osg::Matrixf>(umfu, copyop) { }
+
+        META_Object(osgAnimation, UpdateMatrixfUniform);
+    };
+}
+
+#endif
diff --git a/src/osgAnimation/CMakeLists.txt b/src/osgAnimation/CMakeLists.txt
index ef7373d5b..b0e920544 100644
--- a/src/osgAnimation/CMakeLists.txt
+++ b/src/osgAnimation/CMakeLists.txt
@@ -51,6 +51,7 @@ SET(TARGET_H
     ${HEADER_PATH}/UpdateBone
     ${HEADER_PATH}/UpdateMaterial
     ${HEADER_PATH}/UpdateMatrixTransform
+    ${HEADER_PATH}/UpdateUniform
     ${HEADER_PATH}/Vec3Packed
     ${HEADER_PATH}/VertexInfluence
 )
diff --git a/src/osgWrappers/serializers/osgAnimation/LibraryWrapper.cpp b/src/osgWrappers/serializers/osgAnimation/LibraryWrapper.cpp
index eb0c473d2..1a793647d 100644
--- a/src/osgWrappers/serializers/osgAnimation/LibraryWrapper.cpp
+++ b/src/osgWrappers/serializers/osgAnimation/LibraryWrapper.cpp
@@ -28,6 +28,10 @@ USE_SERIALIZER_WRAPPER(osgAnimation_UpdateMorph)
 USE_SERIALIZER_WRAPPER(osgAnimation_UpdateSkeleton)
 USE_SERIALIZER_WRAPPER(osgAnimation_UpdateMorphGeometry)
 USE_SERIALIZER_WRAPPER(osgAnimation_UpdateRigGeometry)
+USE_SERIALIZER_WRAPPER(osgAnimation_UpdateFloatUniform)
+USE_SERIALIZER_WRAPPER(osgAnimation_UpdateMatrixfUniform)
+USE_SERIALIZER_WRAPPER(osgAnimation_UpdateVec3fUniform)
+
 
 extern "C" void wrapper_serializer_library_osgAnimation(void) {}
 
diff --git a/src/osgWrappers/serializers/osgAnimation/UpdateFloatUniform.cpp b/src/osgWrappers/serializers/osgAnimation/UpdateFloatUniform.cpp
new file mode 100644
index 000000000..b5cd6b45e
--- /dev/null
+++ b/src/osgWrappers/serializers/osgAnimation/UpdateFloatUniform.cpp
@@ -0,0 +1,17 @@
+#undef OBJECT_CAST
+#define OBJECT_CAST dynamic_cast
+
+#include <osgAnimation/UpdateUniform>
+#include <osgDB/ObjectWrapper>
+#include <osgDB/InputStream>
+#include <osgDB/OutputStream>
+
+REGISTER_OBJECT_WRAPPER( osgAnimation_UpdateFloatUniform,
+                         new osgAnimation::UpdateFloatUniform,
+                         osgAnimation::UpdateFloatUniform,
+                         "osg::Object osg::Callback osg::UniformCallback osgAnimation::UpdateFloatUniform" )
+{
+}
+
+#undef OBJECT_CAST
+#define OBJECT_CAST static_cast
diff --git a/src/osgWrappers/serializers/osgAnimation/UpdateMatrixfUniform.cpp b/src/osgWrappers/serializers/osgAnimation/UpdateMatrixfUniform.cpp
new file mode 100644
index 000000000..3d6a65b7c
--- /dev/null
+++ b/src/osgWrappers/serializers/osgAnimation/UpdateMatrixfUniform.cpp
@@ -0,0 +1,17 @@
+#undef OBJECT_CAST
+#define OBJECT_CAST dynamic_cast
+
+#include <osgAnimation/UpdateUniform>
+#include <osgDB/ObjectWrapper>
+#include <osgDB/InputStream>
+#include <osgDB/OutputStream>
+
+REGISTER_OBJECT_WRAPPER( osgAnimation_UpdateMatrixfUniform,
+                         new osgAnimation::UpdateMatrixfUniform,
+                         osgAnimation::UpdateMatrixfUniform,
+                         "osg::Object osg::Callback osg::UniformCallback osgAnimation::UpdateMatrixfUniform" )
+{
+}
+
+#undef OBJECT_CAST
+#define OBJECT_CAST static_cast
diff --git a/src/osgWrappers/serializers/osgAnimation/UpdateVec3fUniform.cpp b/src/osgWrappers/serializers/osgAnimation/UpdateVec3fUniform.cpp
new file mode 100644
index 000000000..06c4b1802
--- /dev/null
+++ b/src/osgWrappers/serializers/osgAnimation/UpdateVec3fUniform.cpp
@@ -0,0 +1,17 @@
+#undef OBJECT_CAST
+#define OBJECT_CAST dynamic_cast
+
+#include <osgAnimation/UpdateUniform>
+#include <osgDB/ObjectWrapper>
+#include <osgDB/InputStream>
+#include <osgDB/OutputStream>
+
+REGISTER_OBJECT_WRAPPER( osgAnimation_UpdateVec3fUniform,
+                         new osgAnimation::UpdateVec3fUniform,
+                         osgAnimation::UpdateVec3fUniform,
+                         "osg::Object osg::Callback osg::UniformCallback osgAnimation::UpdateVec3fUniform" )
+{
+}
+
+#undef OBJECT_CAST
+#define OBJECT_CAST static_cast