diff --git a/include/osgAnimation/UpdateUniform b/include/osgAnimation/UpdateUniform index b18da559f..ac2e3e8cb 100644 --- a/include/osgAnimation/UpdateUniform +++ b/include/osgAnimation/UpdateUniform @@ -69,6 +69,18 @@ namespace osgAnimation META_Object(osgAnimation, UpdateFloatUniform); }; + // Vec2f + struct UpdateVec2fUniform : public UpdateUniform + { + UpdateVec2fUniform(const std::string& aName = "") : UpdateUniform(aName) { } + UpdateVec2fUniform(const UpdateVec2fUniform& uv2fu, + const osg::CopyOp& copyop) : + osg::Object(uv2fu, copyop), // copy name + UpdateUniform(uv2fu, copyop) { } + + META_Object(osgAnimation, UpdateVec2fUniform); + }; + // Vec3f struct UpdateVec3fUniform : public UpdateUniform { @@ -81,6 +93,18 @@ namespace osgAnimation META_Object(osgAnimation, UpdateVec3fUniform); }; + // Vec4f + struct UpdateVec4fUniform : public UpdateUniform + { + UpdateVec4fUniform(const std::string& aName = "") : UpdateUniform(aName) { } + UpdateVec4fUniform(const UpdateVec4fUniform& uv4fu, + const osg::CopyOp& copyop) : + osg::Object(uv4fu, copyop), // copy name + UpdateUniform(uv4fu, copyop) { } + + META_Object(osgAnimation, UpdateVec4fUniform); + }; + // Matrixf struct UpdateMatrixfUniform : public UpdateUniform { diff --git a/src/osgWrappers/serializers/osgAnimation/LibraryWrapper.cpp b/src/osgWrappers/serializers/osgAnimation/LibraryWrapper.cpp index 1a793647d..237d17b1f 100644 --- a/src/osgWrappers/serializers/osgAnimation/LibraryWrapper.cpp +++ b/src/osgWrappers/serializers/osgAnimation/LibraryWrapper.cpp @@ -30,7 +30,9 @@ USE_SERIALIZER_WRAPPER(osgAnimation_UpdateMorphGeometry) USE_SERIALIZER_WRAPPER(osgAnimation_UpdateRigGeometry) USE_SERIALIZER_WRAPPER(osgAnimation_UpdateFloatUniform) USE_SERIALIZER_WRAPPER(osgAnimation_UpdateMatrixfUniform) +USE_SERIALIZER_WRAPPER(osgAnimation_UpdateVec2fUniform) USE_SERIALIZER_WRAPPER(osgAnimation_UpdateVec3fUniform) +USE_SERIALIZER_WRAPPER(osgAnimation_UpdateVec4fUniform) extern "C" void wrapper_serializer_library_osgAnimation(void) {} diff --git a/src/osgWrappers/serializers/osgAnimation/UpdateVec2fUniform.cpp b/src/osgWrappers/serializers/osgAnimation/UpdateVec2fUniform.cpp new file mode 100644 index 000000000..b5ff16f78 --- /dev/null +++ b/src/osgWrappers/serializers/osgAnimation/UpdateVec2fUniform.cpp @@ -0,0 +1,17 @@ +#undef OBJECT_CAST +#define OBJECT_CAST dynamic_cast + +#include +#include +#include +#include + +REGISTER_OBJECT_WRAPPER( osgAnimation_UpdateVec2fUniform, + new osgAnimation::UpdateVec2fUniform, + osgAnimation::UpdateVec2fUniform, + "osg::Object osg::Callback osg::UniformCallback osgAnimation::UpdateVec2fUniform" ) +{ +} + +#undef OBJECT_CAST +#define OBJECT_CAST static_cast diff --git a/src/osgWrappers/serializers/osgAnimation/UpdateVec4fUniform.cpp b/src/osgWrappers/serializers/osgAnimation/UpdateVec4fUniform.cpp new file mode 100644 index 000000000..1e3de64d7 --- /dev/null +++ b/src/osgWrappers/serializers/osgAnimation/UpdateVec4fUniform.cpp @@ -0,0 +1,17 @@ +#undef OBJECT_CAST +#define OBJECT_CAST dynamic_cast + +#include +#include +#include +#include + +REGISTER_OBJECT_WRAPPER( osgAnimation_UpdateVec4fUniform, + new osgAnimation::UpdateVec4fUniform, + osgAnimation::UpdateVec4fUniform, + "osg::Object osg::Callback osg::UniformCallback osgAnimation::UpdateVec4fUniform" ) +{ +} + +#undef OBJECT_CAST +#define OBJECT_CAST static_cast