diff --git a/src/osgWrappers/osg/AnimationPath.cpp b/src/osgWrappers/osg/AnimationPath.cpp index 5ecb44567..7fc9c144d 100644 --- a/src/osgWrappers/osg/AnimationPath.cpp +++ b/src/osgWrappers/osg/AnimationPath.cpp @@ -28,7 +28,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::map< double COMMA osg::AnimationPath::ControlPoint >, osg::AnimationPath::TimeControlPointMap); +TYPE_NAME_ALIAS(std::map< double COMMA osg::AnimationPath::ControlPoint >, osg::AnimationPath::TimeControlPointMap) BEGIN_ENUM_REFLECTOR(osg::AnimationPath::LoopMode) I_EnumLabel(osg::AnimationPath::SWING); @@ -414,5 +414,5 @@ BEGIN_OBJECT_REFLECTOR(osg::AnimationPathCallback) I_PublicMemberProperty(double, _pauseTime); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< double COMMA osg::AnimationPath::ControlPoint >); +STD_MAP_REFLECTOR(std::map< double COMMA osg::AnimationPath::ControlPoint >) diff --git a/src/osgWrappers/osg/ApplicationUsage.cpp b/src/osgWrappers/osg/ApplicationUsage.cpp index a631ee170..9c02c8334 100644 --- a/src/osgWrappers/osg/ApplicationUsage.cpp +++ b/src/osgWrappers/osg/ApplicationUsage.cpp @@ -20,7 +20,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::map< std::string COMMA std::string >, osg::ApplicationUsage::UsageMap); +TYPE_NAME_ALIAS(std::map< std::string COMMA std::string >, osg::ApplicationUsage::UsageMap) BEGIN_ENUM_REFLECTOR(osg::ApplicationUsage::Type) I_EnumLabel(osg::ApplicationUsage::COMMAND_LINE_OPTION); @@ -195,5 +195,5 @@ BEGIN_VALUE_REFLECTOR(osg::ApplicationUsageProxy) ""); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< std::string COMMA std::string >); +STD_MAP_REFLECTOR(std::map< std::string COMMA std::string >) diff --git a/src/osgWrappers/osg/ArgumentParser.cpp b/src/osgWrappers/osg/ArgumentParser.cpp index 13531eb2c..e271d5be9 100644 --- a/src/osgWrappers/osg/ArgumentParser.cpp +++ b/src/osgWrappers/osg/ArgumentParser.cpp @@ -21,7 +21,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::map< std::string COMMA osg::ArgumentParser::ErrorSeverity >, osg::ArgumentParser::ErrorMessageMap); +TYPE_NAME_ALIAS(std::map< std::string COMMA osg::ArgumentParser::ErrorSeverity >, osg::ArgumentParser::ErrorMessageMap) BEGIN_ENUM_REFLECTOR(osg::ArgumentParser::ErrorSeverity) I_EnumLabel(osg::ArgumentParser::BENIGN); @@ -292,5 +292,5 @@ BEGIN_VALUE_REFLECTOR(osg::ArgumentParser::Parameter) ""); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< std::string COMMA osg::ArgumentParser::ErrorSeverity >); +STD_MAP_REFLECTOR(std::map< std::string COMMA osg::ArgumentParser::ErrorSeverity >) diff --git a/src/osgWrappers/osg/Array.cpp b/src/osgWrappers/osg/Array.cpp index dbb9a1fbd..33f66f55e 100644 --- a/src/osgWrappers/osg/Array.cpp +++ b/src/osgWrappers/osg/Array.cpp @@ -569,39 +569,39 @@ BEGIN_VALUE_REFLECTOR(osg::ValueVisitor) ""); END_REFLECTOR -TYPE_NAME_ALIAS(osg::TemplateIndexArray< GLbyte COMMA osg::Array::ByteArrayType COMMA 1 COMMA GL_BYTE >, osg::ByteArray); +TYPE_NAME_ALIAS(osg::TemplateIndexArray< GLbyte COMMA osg::Array::ByteArrayType COMMA 1 COMMA GL_BYTE >, osg::ByteArray) -TYPE_NAME_ALIAS(osg::TemplateIndexArray< GLshort COMMA osg::Array::ShortArrayType COMMA 1 COMMA GL_SHORT >, osg::ShortArray); +TYPE_NAME_ALIAS(osg::TemplateIndexArray< GLshort COMMA osg::Array::ShortArrayType COMMA 1 COMMA GL_SHORT >, osg::ShortArray) -TYPE_NAME_ALIAS(osg::TemplateIndexArray< GLint COMMA osg::Array::IntArrayType COMMA 1 COMMA GL_INT >, osg::IntArray); +TYPE_NAME_ALIAS(osg::TemplateIndexArray< GLint COMMA osg::Array::IntArrayType COMMA 1 COMMA GL_INT >, osg::IntArray) -TYPE_NAME_ALIAS(osg::TemplateIndexArray< GLubyte COMMA osg::Array::UByteArrayType COMMA 1 COMMA GL_UNSIGNED_BYTE >, osg::UByteArray); +TYPE_NAME_ALIAS(osg::TemplateIndexArray< GLubyte COMMA osg::Array::UByteArrayType COMMA 1 COMMA GL_UNSIGNED_BYTE >, osg::UByteArray) -TYPE_NAME_ALIAS(osg::TemplateIndexArray< GLushort COMMA osg::Array::UShortArrayType COMMA 1 COMMA GL_UNSIGNED_SHORT >, osg::UShortArray); +TYPE_NAME_ALIAS(osg::TemplateIndexArray< GLushort COMMA osg::Array::UShortArrayType COMMA 1 COMMA GL_UNSIGNED_SHORT >, osg::UShortArray) -TYPE_NAME_ALIAS(osg::TemplateIndexArray< GLuint COMMA osg::Array::UIntArrayType COMMA 1 COMMA GL_UNSIGNED_INT >, osg::UIntArray); +TYPE_NAME_ALIAS(osg::TemplateIndexArray< GLuint COMMA osg::Array::UIntArrayType COMMA 1 COMMA GL_UNSIGNED_INT >, osg::UIntArray) -TYPE_NAME_ALIAS(osg::TemplateArray< GLfloat COMMA osg::Array::FloatArrayType COMMA 1 COMMA GL_FLOAT >, osg::FloatArray); +TYPE_NAME_ALIAS(osg::TemplateArray< GLfloat COMMA osg::Array::FloatArrayType COMMA 1 COMMA GL_FLOAT >, osg::FloatArray) -TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec2 COMMA osg::Array::Vec2ArrayType COMMA 2 COMMA GL_FLOAT >, osg::Vec2Array); +TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec2 COMMA osg::Array::Vec2ArrayType COMMA 2 COMMA GL_FLOAT >, osg::Vec2Array) -TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec3 COMMA osg::Array::Vec3ArrayType COMMA 3 COMMA GL_FLOAT >, osg::Vec3Array); +TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec3 COMMA osg::Array::Vec3ArrayType COMMA 3 COMMA GL_FLOAT >, osg::Vec3Array) -TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec4 COMMA osg::Array::Vec4ArrayType COMMA 4 COMMA GL_FLOAT >, osg::Vec4Array); +TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec4 COMMA osg::Array::Vec4ArrayType COMMA 4 COMMA GL_FLOAT >, osg::Vec4Array) -TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec4ub COMMA osg::Array::Vec4ubArrayType COMMA 4 COMMA GL_UNSIGNED_BYTE >, osg::Vec4ubArray); +TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec4ub COMMA osg::Array::Vec4ubArrayType COMMA 4 COMMA GL_UNSIGNED_BYTE >, osg::Vec4ubArray) -TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec2s COMMA osg::Array::Vec2sArrayType COMMA 2 COMMA GL_SHORT >, osg::Vec2sArray); +TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec2s COMMA osg::Array::Vec2sArrayType COMMA 2 COMMA GL_SHORT >, osg::Vec2sArray) -TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec3s COMMA osg::Array::Vec3sArrayType COMMA 3 COMMA GL_SHORT >, osg::Vec3sArray); +TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec3s COMMA osg::Array::Vec3sArrayType COMMA 3 COMMA GL_SHORT >, osg::Vec3sArray) -TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec4s COMMA osg::Array::Vec4sArrayType COMMA 4 COMMA GL_SHORT >, osg::Vec4sArray); +TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec4s COMMA osg::Array::Vec4sArrayType COMMA 4 COMMA GL_SHORT >, osg::Vec4sArray) -TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec2b COMMA osg::Array::Vec2bArrayType COMMA 2 COMMA GL_BYTE >, osg::Vec2bArray); +TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec2b COMMA osg::Array::Vec2bArrayType COMMA 2 COMMA GL_BYTE >, osg::Vec2bArray) -TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec3b COMMA osg::Array::Vec3bArrayType COMMA 3 COMMA GL_BYTE >, osg::Vec3bArray); +TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec3b COMMA osg::Array::Vec3bArrayType COMMA 3 COMMA GL_BYTE >, osg::Vec3bArray) -TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec4b COMMA osg::Array::Vec4bArrayType COMMA 4 COMMA GL_BYTE >, osg::Vec4bArray); +TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec4b COMMA osg::Array::Vec4bArrayType COMMA 4 COMMA GL_BYTE >, osg::Vec4bArray) BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< GLfloat COMMA osg::Array::FloatArrayType COMMA 1 COMMA GL_FLOAT >) I_BaseType(osg::Array); diff --git a/src/osgWrappers/osg/Billboard.cpp b/src/osgWrappers/osg/Billboard.cpp index bdc5b4c4b..7fd065405 100644 --- a/src/osgWrappers/osg/Billboard.cpp +++ b/src/osgWrappers/osg/Billboard.cpp @@ -27,7 +27,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osg::Billboard::PositionList); +TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osg::Billboard::PositionList) BEGIN_ENUM_REFLECTOR(osg::Billboard::Mode) I_EnumLabel(osg::Billboard::POINT_ROT_EYE); @@ -178,5 +178,5 @@ BEGIN_OBJECT_REFLECTOR(osg::Billboard) __void__setPositionList__PositionList_R1); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osg::Vec3 >); +STD_VECTOR_REFLECTOR(std::vector< osg::Vec3 >) diff --git a/src/osgWrappers/osg/BufferObject.cpp b/src/osgWrappers/osg/BufferObject.cpp index 540cf2226..61e629950 100644 --- a/src/osgWrappers/osg/BufferObject.cpp +++ b/src/osgWrappers/osg/BufferObject.cpp @@ -219,7 +219,7 @@ BEGIN_OBJECT_REFLECTOR(osg::BufferObject::Extensions) END_REFLECTOR -TYPE_NAME_ALIAS(std::pair< osg::BufferObject::BufferEntry COMMA osg::Image * >, osg::PixelBufferObject::BufferEntryImagePair); +TYPE_NAME_ALIAS(std::pair< osg::BufferObject::BufferEntry COMMA osg::Image * >, osg::PixelBufferObject::BufferEntryImagePair) BEGIN_OBJECT_REFLECTOR(osg::PixelBufferObject) I_BaseType(osg::BufferObject); @@ -292,5 +292,5 @@ BEGIN_OBJECT_REFLECTOR(osg::PixelBufferObject) __void__setImage__osg_Image_P1); END_REFLECTOR -STD_PAIR_REFLECTOR(std::pair< osg::BufferObject::BufferEntry COMMA osg::Image * >); +STD_PAIR_REFLECTOR(std::pair< osg::BufferObject::BufferEntry COMMA osg::Image * >) diff --git a/src/osgWrappers/osg/Camera.cpp b/src/osgWrappers/osg/Camera.cpp index eaeb84dac..0c885d5e0 100644 --- a/src/osgWrappers/osg/Camera.cpp +++ b/src/osgWrappers/osg/Camera.cpp @@ -37,7 +37,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::map< osg::Camera::BufferComponent COMMA osg::Camera::Attachment >, osg::Camera::BufferAttachmentMap); +TYPE_NAME_ALIAS(std::map< osg::Camera::BufferComponent COMMA osg::Camera::Attachment >, osg::Camera::BufferAttachmentMap) BEGIN_ENUM_REFLECTOR(osg::Camera::TransformOrder) I_EnumLabel(osg::Camera::PRE_MULTIPLY); @@ -627,5 +627,5 @@ BEGIN_OBJECT_REFLECTOR(osg::Camera::DrawCallback) "Must be defined by derived classes. "); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< osg::Camera::BufferComponent COMMA osg::Camera::Attachment >); +STD_MAP_REFLECTOR(std::map< osg::Camera::BufferComponent COMMA osg::Camera::Attachment >) diff --git a/src/osgWrappers/osg/CameraNode.cpp b/src/osgWrappers/osg/CameraNode.cpp index 06e2e219e..7fb194751 100644 --- a/src/osgWrappers/osg/CameraNode.cpp +++ b/src/osgWrappers/osg/CameraNode.cpp @@ -20,5 +20,5 @@ #undef OUT #endif -TYPE_NAME_ALIAS(osg::Camera, osg::CameraNode); +TYPE_NAME_ALIAS(osg::Camera, osg::CameraNode) diff --git a/src/osgWrappers/osg/ClipNode.cpp b/src/osgWrappers/osg/ClipNode.cpp index 0d4515a79..c8f6e7894 100644 --- a/src/osgWrappers/osg/ClipNode.cpp +++ b/src/osgWrappers/osg/ClipNode.cpp @@ -28,7 +28,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::ClipPlane > >, osg::ClipNode::ClipPlaneList); +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::ClipPlane > >, osg::ClipNode::ClipPlaneList) BEGIN_OBJECT_REFLECTOR(osg::ClipNode) I_BaseType(osg::Group); @@ -188,5 +188,5 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::ClipPlane >) 0); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::ClipPlane > >); +STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::ClipPlane > >) diff --git a/src/osgWrappers/osg/CollectOccludersVisitor.cpp b/src/osgWrappers/osg/CollectOccludersVisitor.cpp index 35569e116..b7605c60e 100644 --- a/src/osgWrappers/osg/CollectOccludersVisitor.cpp +++ b/src/osgWrappers/osg/CollectOccludersVisitor.cpp @@ -27,7 +27,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::set< osg::ShadowVolumeOccluder >, osg::CollectOccludersVisitor::ShadowVolumeOccluderSet); +TYPE_NAME_ALIAS(std::set< osg::ShadowVolumeOccluder >, osg::CollectOccludersVisitor::ShadowVolumeOccluderSet) BEGIN_OBJECT_REFLECTOR(osg::CollectOccludersVisitor) I_BaseType(osg::NodeVisitor); @@ -169,5 +169,5 @@ BEGIN_OBJECT_REFLECTOR(osg::CollectOccludersVisitor) __void__setMinimumShadowOccluderVolume__float); END_REFLECTOR -STD_SET_REFLECTOR(std::set< osg::ShadowVolumeOccluder >); +STD_SET_REFLECTOR(std::set< osg::ShadowVolumeOccluder >) diff --git a/src/osgWrappers/osg/ConvexPlanarOccluder.cpp b/src/osgWrappers/osg/ConvexPlanarOccluder.cpp index 6bcaa1f22..9972c2b11 100644 --- a/src/osgWrappers/osg/ConvexPlanarOccluder.cpp +++ b/src/osgWrappers/osg/ConvexPlanarOccluder.cpp @@ -23,7 +23,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::ConvexPlanarPolygon >, osg::ConvexPlanarOccluder::HoleList); +TYPE_NAME_ALIAS(std::vector< osg::ConvexPlanarPolygon >, osg::ConvexPlanarOccluder::HoleList) BEGIN_OBJECT_REFLECTOR(osg::ConvexPlanarOccluder) I_BaseType(osg::Object); @@ -102,5 +102,5 @@ BEGIN_OBJECT_REFLECTOR(osg::ConvexPlanarOccluder) __void__setOccluder__C5_ConvexPlanarPolygon_R1); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osg::ConvexPlanarPolygon >); +STD_VECTOR_REFLECTOR(std::vector< osg::ConvexPlanarPolygon >) diff --git a/src/osgWrappers/osg/ConvexPlanarPolygon.cpp b/src/osgWrappers/osg/ConvexPlanarPolygon.cpp index e1c495a74..14fb33055 100644 --- a/src/osgWrappers/osg/ConvexPlanarPolygon.cpp +++ b/src/osgWrappers/osg/ConvexPlanarPolygon.cpp @@ -21,7 +21,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osg::ConvexPlanarPolygon::VertexList); +TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osg::ConvexPlanarPolygon::VertexList) BEGIN_VALUE_REFLECTOR(osg::ConvexPlanarPolygon) I_Constructor0(____ConvexPlanarPolygon, diff --git a/src/osgWrappers/osg/CoordinateSystemNode.cpp b/src/osgWrappers/osg/CoordinateSystemNode.cpp index d895ceb16..0d454a594 100644 --- a/src/osgWrappers/osg/CoordinateSystemNode.cpp +++ b/src/osgWrappers/osg/CoordinateSystemNode.cpp @@ -223,5 +223,5 @@ BEGIN_OBJECT_REFLECTOR(osg::EllipsoidModel) __void__setRadiusPolar__double); END_REFLECTOR -TYPE_NAME_ALIAS(osg::Matrixd, osg::CoordinateFrame); +TYPE_NAME_ALIAS(osg::Matrixd, osg::CoordinateFrame) diff --git a/src/osgWrappers/osg/CopyOp.cpp b/src/osgWrappers/osg/CopyOp.cpp index a25343cd7..fd1408729 100644 --- a/src/osgWrappers/osg/CopyOp.cpp +++ b/src/osgWrappers/osg/CopyOp.cpp @@ -32,7 +32,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(unsigned int, osg::CopyOp::CopyFlags); +TYPE_NAME_ALIAS(unsigned int, osg::CopyOp::CopyFlags) BEGIN_ENUM_REFLECTOR(osg::CopyOp::Options) I_EnumLabel(osg::CopyOp::SHALLOW_COPY); diff --git a/src/osgWrappers/osg/CullSettings.cpp b/src/osgWrappers/osg/CullSettings.cpp index 5b04cda77..37f6ed3cc 100644 --- a/src/osgWrappers/osg/CullSettings.cpp +++ b/src/osgWrappers/osg/CullSettings.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(unsigned int, osg::CullSettings::CullingMode); +TYPE_NAME_ALIAS(unsigned int, osg::CullSettings::CullingMode) BEGIN_ENUM_REFLECTOR(osg::CullSettings::VariablesMask) I_EnumLabel(osg::CullSettings::COMPUTE_NEAR_FAR_MODE); diff --git a/src/osgWrappers/osg/CullStack.cpp b/src/osgWrappers/osg/CullStack.cpp index dd8d0500f..a9e59c32c 100644 --- a/src/osgWrappers/osg/CullStack.cpp +++ b/src/osgWrappers/osg/CullStack.cpp @@ -29,11 +29,290 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::ShadowVolumeOccluder >, osg::CullStack::OccluderList); +TYPE_NAME_ALIAS(std::vector< osg::ShadowVolumeOccluder >, osg::CullStack::OccluderList) -TYPE_NAME_ALIAS(std::vector< osg::CullingSet >, osg::CullStack::CullingStack); +TYPE_NAME_ALIAS(std::vector< osg::CullingSet >, osg::CullStack::CullingStack) -STD_VECTOR_REFLECTOR(std::vector< osg::CullingSet >); +BEGIN_OBJECT_REFLECTOR(osg::CullStack) + I_BaseType(osg::CullSettings); + I_Constructor0(____CullStack, + "", + ""); + I_Method0(void, reset, + Properties::NON_VIRTUAL, + __void__reset, + "", + ""); + I_Method1(void, setOccluderList, IN, const osg::ShadowVolumeOccluderList &, svol, + Properties::NON_VIRTUAL, + __void__setOccluderList__C5_ShadowVolumeOccluderList_R1, + "", + ""); + I_Method0(osg::ShadowVolumeOccluderList &, getOccluderList, + Properties::NON_VIRTUAL, + __ShadowVolumeOccluderList_R1__getOccluderList, + "", + ""); + I_Method0(const osg::ShadowVolumeOccluderList &, getOccluderList, + Properties::NON_VIRTUAL, + __C5_ShadowVolumeOccluderList_R1__getOccluderList, + "", + ""); + I_Method1(void, pushViewport, IN, osg::Viewport *, viewport, + Properties::NON_VIRTUAL, + __void__pushViewport__osg_Viewport_P1, + "", + ""); + I_Method0(void, popViewport, + Properties::NON_VIRTUAL, + __void__popViewport, + "", + ""); + I_Method1(void, pushProjectionMatrix, IN, osg::RefMatrix *, matrix, + Properties::NON_VIRTUAL, + __void__pushProjectionMatrix__osg_RefMatrix_P1, + "", + ""); + I_Method0(void, popProjectionMatrix, + Properties::NON_VIRTUAL, + __void__popProjectionMatrix, + "", + ""); + I_Method2(void, pushModelViewMatrix, IN, osg::RefMatrix *, matrix, IN, osg::Transform::ReferenceFrame, referenceFrame, + Properties::NON_VIRTUAL, + __void__pushModelViewMatrix__osg_RefMatrix_P1__Transform_ReferenceFrame, + "", + ""); + I_Method0(void, popModelViewMatrix, + Properties::NON_VIRTUAL, + __void__popModelViewMatrix, + "", + ""); + I_Method0(float, getFrustumVolume, + Properties::NON_VIRTUAL, + __float__getFrustumVolume, + "", + ""); + I_Method2(float, pixelSize, IN, const osg::Vec3 &, v, IN, float, radius, + Properties::NON_VIRTUAL, + __float__pixelSize__C5_Vec3_R1__float, + "Compute the pixel size of an object at position v, with specified radius. ", + ""); + I_Method1(float, pixelSize, IN, const osg::BoundingSphere &, bs, + Properties::NON_VIRTUAL, + __float__pixelSize__C5_BoundingSphere_R1, + "Compute the pixel size of the bounding sphere. ", + ""); + I_Method2(float, clampedPixelSize, IN, const osg::Vec3 &, v, IN, float, radius, + Properties::NON_VIRTUAL, + __float__clampedPixelSize__C5_Vec3_R1__float, + "Compute the pixel size of an object at position v, with specified radius. ", + "fabs()ed to always be positive. "); + I_Method1(float, clampedPixelSize, IN, const osg::BoundingSphere &, bs, + Properties::NON_VIRTUAL, + __float__clampedPixelSize__C5_BoundingSphere_R1, + "Compute the pixel size of the bounding sphere. ", + "fabs()ed to always be positive. "); + I_Method1(void, disableAndPushOccludersCurrentMask, IN, osg::NodePath &, nodePath, + Properties::NON_VIRTUAL, + __void__disableAndPushOccludersCurrentMask__NodePath_R1, + "", + ""); + I_Method1(void, popOccludersCurrentMask, IN, osg::NodePath &, nodePath, + Properties::NON_VIRTUAL, + __void__popOccludersCurrentMask__NodePath_R1, + "", + ""); + I_Method1(bool, isCulled, IN, const std::vector< osg::Vec3 > &, vertices, + Properties::NON_VIRTUAL, + __bool__isCulled__C5_std_vectorT1_Vec3__R1, + "", + ""); + I_Method1(bool, isCulled, IN, const osg::BoundingBox &, bb, + Properties::NON_VIRTUAL, + __bool__isCulled__C5_BoundingBox_R1, + "", + ""); + I_Method1(bool, isCulled, IN, const osg::BoundingSphere &, bs, + Properties::NON_VIRTUAL, + __bool__isCulled__C5_BoundingSphere_R1, + "", + ""); + I_Method1(bool, isCulled, IN, const osg::Node &, node, + Properties::NON_VIRTUAL, + __bool__isCulled__C5_osg_Node_R1, + "", + ""); + I_Method0(void, pushCurrentMask, + Properties::NON_VIRTUAL, + __void__pushCurrentMask, + "", + ""); + I_Method0(void, popCurrentMask, + Properties::NON_VIRTUAL, + __void__popCurrentMask, + "", + ""); + I_Method0(osg::CullStack::CullingStack &, getClipSpaceCullingStack, + Properties::NON_VIRTUAL, + __CullingStack_R1__getClipSpaceCullingStack, + "", + ""); + I_Method0(osg::CullStack::CullingStack &, getProjectionCullingStack, + Properties::NON_VIRTUAL, + __CullingStack_R1__getProjectionCullingStack, + "", + ""); + I_Method0(osg::CullStack::CullingStack &, getModelViewCullingStack, + Properties::NON_VIRTUAL, + __CullingStack_R1__getModelViewCullingStack, + "", + ""); + I_Method0(osg::CullingSet &, getCurrentCullingSet, + Properties::NON_VIRTUAL, + __CullingSet_R1__getCurrentCullingSet, + "", + ""); + I_Method0(const osg::CullingSet &, getCurrentCullingSet, + Properties::NON_VIRTUAL, + __C5_CullingSet_R1__getCurrentCullingSet, + "", + ""); + I_Method0(osg::Viewport *, getViewport, + Properties::NON_VIRTUAL, + __osg_Viewport_P1__getViewport, + "", + ""); + I_Method0(osg::RefMatrix *, getModelViewMatrix, + Properties::NON_VIRTUAL, + __osg_RefMatrix_P1__getModelViewMatrix, + "", + ""); + I_Method0(osg::RefMatrix *, getProjectionMatrix, + Properties::NON_VIRTUAL, + __osg_RefMatrix_P1__getProjectionMatrix, + "", + ""); + I_Method0(osg::Matrix, getWindowMatrix, + Properties::NON_VIRTUAL, + __osg_Matrix__getWindowMatrix, + "", + ""); + I_Method0(const osg::RefMatrix *, getMVPW, + Properties::NON_VIRTUAL, + __C5_osg_RefMatrix_P1__getMVPW, + "", + ""); + I_Method0(const osg::Vec3 &, getReferenceViewPoint, + Properties::NON_VIRTUAL, + __C5_osg_Vec3_R1__getReferenceViewPoint, + "", + ""); + I_Method1(void, pushReferenceViewPoint, IN, const osg::Vec3 &, viewPoint, + Properties::NON_VIRTUAL, + __void__pushReferenceViewPoint__C5_osg_Vec3_R1, + "", + ""); + I_Method0(void, popReferenceViewPoint, + Properties::NON_VIRTUAL, + __void__popReferenceViewPoint, + "", + ""); + I_Method0(const osg::Vec3 &, getEyeLocal, + Properties::NON_VIRTUAL, + __C5_osg_Vec3_R1__getEyeLocal, + "", + ""); + I_Method0(const osg::Vec3 &, getViewPointLocal, + Properties::NON_VIRTUAL, + __C5_osg_Vec3_R1__getViewPointLocal, + "", + ""); + I_Method0(const osg::Vec3, getUpLocal, + Properties::NON_VIRTUAL, + __C5_osg_Vec3__getUpLocal, + "", + ""); + I_Method0(const osg::Vec3, getLookVectorLocal, + Properties::NON_VIRTUAL, + __C5_osg_Vec3__getLookVectorLocal, + "", + ""); + I_ProtectedMethod0(void, pushCullingSet, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__pushCullingSet, + "", + ""); + I_ProtectedMethod0(void, popCullingSet, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__popCullingSet, + "", + ""); + I_ProtectedMethod0(void, computeFrustumVolume, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__computeFrustumVolume, + "", + ""); + I_ProtectedMethod1(osg::RefMatrix *, createOrReuseMatrix, IN, const osg::Matrix &, value, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __osg_RefMatrix_P1__createOrReuseMatrix__C5_osg_Matrix_R1, + "", + ""); + I_SimpleProperty(osg::CullStack::CullingStack &, ClipSpaceCullingStack, + __CullingStack_R1__getClipSpaceCullingStack, + 0); + I_SimpleProperty(osg::CullingSet &, CurrentCullingSet, + __CullingSet_R1__getCurrentCullingSet, + 0); + I_SimpleProperty(const osg::Vec3 &, EyeLocal, + __C5_osg_Vec3_R1__getEyeLocal, + 0); + I_SimpleProperty(float, FrustumVolume, + __float__getFrustumVolume, + 0); + I_SimpleProperty(const osg::Vec3, LookVectorLocal, + __C5_osg_Vec3__getLookVectorLocal, + 0); + I_SimpleProperty(const osg::RefMatrix *, MVPW, + __C5_osg_RefMatrix_P1__getMVPW, + 0); + I_SimpleProperty(osg::CullStack::CullingStack &, ModelViewCullingStack, + __CullingStack_R1__getModelViewCullingStack, + 0); + I_SimpleProperty(osg::RefMatrix *, ModelViewMatrix, + __osg_RefMatrix_P1__getModelViewMatrix, + 0); + I_SimpleProperty(const osg::ShadowVolumeOccluderList &, OccluderList, + __C5_ShadowVolumeOccluderList_R1__getOccluderList, + __void__setOccluderList__C5_ShadowVolumeOccluderList_R1); + I_SimpleProperty(osg::CullStack::CullingStack &, ProjectionCullingStack, + __CullingStack_R1__getProjectionCullingStack, + 0); + I_SimpleProperty(osg::RefMatrix *, ProjectionMatrix, + __osg_RefMatrix_P1__getProjectionMatrix, + 0); + I_SimpleProperty(const osg::Vec3 &, ReferenceViewPoint, + __C5_osg_Vec3_R1__getReferenceViewPoint, + 0); + I_SimpleProperty(const osg::Vec3, UpLocal, + __C5_osg_Vec3__getUpLocal, + 0); + I_SimpleProperty(const osg::Vec3 &, ViewPointLocal, + __C5_osg_Vec3_R1__getViewPointLocal, + 0); + I_SimpleProperty(osg::Viewport *, Viewport, + __osg_Viewport_P1__getViewport, + 0); + I_SimpleProperty(osg::Matrix, WindowMatrix, + __osg_Matrix__getWindowMatrix, + 0); +END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osg::ShadowVolumeOccluder >); +STD_VECTOR_REFLECTOR(std::vector< osg::CullingSet >) + +STD_VECTOR_REFLECTOR(std::vector< osg::ShadowVolumeOccluder >) diff --git a/src/osgWrappers/osg/CullingSet.cpp b/src/osgWrappers/osg/CullingSet.cpp index 405ae0753..b9afa5f45 100644 --- a/src/osgWrappers/osg/CullingSet.cpp +++ b/src/osgWrappers/osg/CullingSet.cpp @@ -30,13 +30,13 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::pair< osg::ref_ptr< osg::StateSet > COMMA osg::Polytope >, osg::CullingSet::StateFrustumPair); +TYPE_NAME_ALIAS(std::pair< osg::ref_ptr< osg::StateSet > COMMA osg::Polytope >, osg::CullingSet::StateFrustumPair) -TYPE_NAME_ALIAS(std::vector< osg::CullingSet::StateFrustumPair >, osg::CullingSet::StateFrustumList); +TYPE_NAME_ALIAS(std::vector< osg::CullingSet::StateFrustumPair >, osg::CullingSet::StateFrustumList) -TYPE_NAME_ALIAS(std::vector< osg::ShadowVolumeOccluder >, osg::CullingSet::OccluderList); +TYPE_NAME_ALIAS(std::vector< osg::ShadowVolumeOccluder >, osg::CullingSet::OccluderList) -TYPE_NAME_ALIAS(unsigned int, osg::CullingSet::Mask); +TYPE_NAME_ALIAS(unsigned int, osg::CullingSet::Mask) BEGIN_ENUM_REFLECTOR(osg::CullingSet::MaskValues) I_EnumLabel(osg::CullingSet::NO_CULLING); @@ -264,7 +264,7 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::StateSet >) 0); END_REFLECTOR -STD_PAIR_REFLECTOR(std::pair< osg::ref_ptr< osg::StateSet > COMMA osg::Polytope >); +STD_PAIR_REFLECTOR(std::pair< osg::ref_ptr< osg::StateSet > COMMA osg::Polytope >) -STD_VECTOR_REFLECTOR(std::vector< osg::CullingSet::StateFrustumPair >); +STD_VECTOR_REFLECTOR(std::vector< osg::CullingSet::StateFrustumPair >) diff --git a/src/osgWrappers/osg/DeleteHandler.cpp b/src/osgWrappers/osg/DeleteHandler.cpp index bca125018..5356c45b0 100644 --- a/src/osgWrappers/osg/DeleteHandler.cpp +++ b/src/osgWrappers/osg/DeleteHandler.cpp @@ -21,9 +21,9 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::pair< int COMMA const osg::Referenced * >, osg::DeleteHandler::FrameNumberObjectPair); +TYPE_NAME_ALIAS(std::pair< int COMMA const osg::Referenced * >, osg::DeleteHandler::FrameNumberObjectPair) -TYPE_NAME_ALIAS(std::list< osg::DeleteHandler::FrameNumberObjectPair >, osg::DeleteHandler::ObjectsToDeleteList); +TYPE_NAME_ALIAS(std::list< osg::DeleteHandler::FrameNumberObjectPair >, osg::DeleteHandler::ObjectsToDeleteList) BEGIN_OBJECT_REFLECTOR(osg::DeleteHandler) I_ConstructorWithDefaults1(IN, int, numberOfFramesToRetainObjects, 0, @@ -84,7 +84,7 @@ BEGIN_OBJECT_REFLECTOR(osg::DeleteHandler) __void__setNumFramesToRetainObjects__int); END_REFLECTOR -STD_LIST_REFLECTOR(std::list< osg::DeleteHandler::FrameNumberObjectPair >); +STD_LIST_REFLECTOR(std::list< osg::DeleteHandler::FrameNumberObjectPair >) -STD_PAIR_REFLECTOR(std::pair< int COMMA const osg::Referenced * >); +STD_PAIR_REFLECTOR(std::pair< int COMMA const osg::Referenced * >) diff --git a/src/osgWrappers/osg/Drawable.cpp b/src/osgWrappers/osg/Drawable.cpp index dd5e3e590..ae20982d9 100644 --- a/src/osgWrappers/osg/Drawable.cpp +++ b/src/osgWrappers/osg/Drawable.cpp @@ -35,9 +35,9 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::Node * >, osg::Drawable::ParentList); +TYPE_NAME_ALIAS(std::vector< osg::Node * >, osg::Drawable::ParentList) -TYPE_NAME_ALIAS(unsigned int, osg::Drawable::AttributeType); +TYPE_NAME_ALIAS(unsigned int, osg::Drawable::AttributeType) BEGIN_ENUM_REFLECTOR(osg::Drawable::AttributeTypes) I_EnumLabel(osg::Drawable::VERTICES); @@ -1207,5 +1207,5 @@ BEGIN_OBJECT_REFLECTOR(osg::Drawable::UpdateCallback) ""); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osg::Node * >); +STD_VECTOR_REFLECTOR(std::vector< osg::Node * >) diff --git a/src/osgWrappers/osg/FragmentProgram.cpp b/src/osgWrappers/osg/FragmentProgram.cpp index 6a3526bf0..cbd516e76 100644 --- a/src/osgWrappers/osg/FragmentProgram.cpp +++ b/src/osgWrappers/osg/FragmentProgram.cpp @@ -26,9 +26,9 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::map< GLuint COMMA osg::Vec4 >, osg::FragmentProgram::LocalParamList); +TYPE_NAME_ALIAS(std::map< GLuint COMMA osg::Vec4 >, osg::FragmentProgram::LocalParamList) -TYPE_NAME_ALIAS(std::map< GLenum COMMA osg::Matrix >, osg::FragmentProgram::MatrixList); +TYPE_NAME_ALIAS(std::map< GLenum COMMA osg::Matrix >, osg::FragmentProgram::MatrixList) BEGIN_OBJECT_REFLECTOR(osg::FragmentProgram) I_BaseType(osg::StateAttribute); @@ -256,7 +256,7 @@ BEGIN_OBJECT_REFLECTOR(osg::FragmentProgram::Extensions) __void__setFragmentProgramSupported__bool); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< GLenum COMMA osg::Matrix >); +STD_MAP_REFLECTOR(std::map< GLenum COMMA osg::Matrix >) -STD_MAP_REFLECTOR(std::map< GLuint COMMA osg::Vec4 >); +STD_MAP_REFLECTOR(std::map< GLuint COMMA osg::Vec4 >) diff --git a/src/osgWrappers/osg/FrameBufferObject.cpp b/src/osgWrappers/osg/FrameBufferObject.cpp index 444825cbb..3d1382603 100644 --- a/src/osgWrappers/osg/FrameBufferObject.cpp +++ b/src/osgWrappers/osg/FrameBufferObject.cpp @@ -30,31 +30,31 @@ #undef OUT #endif -TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglBindRenderbufferEXT); +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglBindRenderbufferEXT) -TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglDeleteRenderbuffersEXT); +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglDeleteRenderbuffersEXT) -TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglGenRenderbuffersEXT); +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglGenRenderbuffersEXT) -TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglRenderbufferStorageEXT); +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglRenderbufferStorageEXT) -TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglBindFramebufferEXT); +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglBindFramebufferEXT) -TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglDeleteFramebuffersEXT); +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglDeleteFramebuffersEXT) -TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglGenFramebuffersEXT); +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglGenFramebuffersEXT) -TYPE_NAME_ALIAS(GLenum , osg::FBOExtensions::TglCheckFramebufferStatusEXT); +TYPE_NAME_ALIAS(GLenum , osg::FBOExtensions::TglCheckFramebufferStatusEXT) -TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferTexture1DEXT); +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferTexture1DEXT) -TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferTexture2DEXT); +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferTexture2DEXT) -TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferTexture3DEXT); +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferTexture3DEXT) -TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferRenderbufferEXT); +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferRenderbufferEXT) -TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglGenerateMipmapEXT); +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglGenerateMipmapEXT) BEGIN_OBJECT_REFLECTOR(osg::FBOExtensions) I_BaseType(osg::Referenced); @@ -144,7 +144,7 @@ BEGIN_VALUE_REFLECTOR(osg::FrameBufferAttachment) ""); END_REFLECTOR -TYPE_NAME_ALIAS(std::map< GLenum COMMA osg::FrameBufferAttachment >, osg::FrameBufferObject::AttachmentMap); +TYPE_NAME_ALIAS(std::map< GLenum COMMA osg::FrameBufferAttachment >, osg::FrameBufferObject::AttachmentMap) BEGIN_OBJECT_REFLECTOR(osg::FrameBufferObject) I_BaseType(osg::StateAttribute); @@ -349,5 +349,5 @@ BEGIN_OBJECT_REFLECTOR(osg::RenderBuffer) __void__setWidth__int); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< GLenum COMMA osg::FrameBufferAttachment >); +STD_MAP_REFLECTOR(std::map< GLenum COMMA osg::FrameBufferAttachment >) diff --git a/src/osgWrappers/osg/Geode.cpp b/src/osgWrappers/osg/Geode.cpp index 09535d4a8..ba3ed2dc0 100644 --- a/src/osgWrappers/osg/Geode.cpp +++ b/src/osgWrappers/osg/Geode.cpp @@ -28,7 +28,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Drawable > >, osg::Geode::DrawableList); +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Drawable > >, osg::Geode::DrawableList) BEGIN_OBJECT_REFLECTOR(osg::Geode) I_BaseType(osg::Node); @@ -211,5 +211,5 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Drawable >) 0); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::Drawable > >); +STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::Drawable > >) diff --git a/src/osgWrappers/osg/Geometry.cpp b/src/osgWrappers/osg/Geometry.cpp index bfa915651..3bad82ed8 100644 --- a/src/osgWrappers/osg/Geometry.cpp +++ b/src/osgWrappers/osg/Geometry.cpp @@ -26,9 +26,9 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::Geometry::ArrayData >, osg::Geometry::ArrayList); +TYPE_NAME_ALIAS(std::vector< osg::Geometry::ArrayData >, osg::Geometry::ArrayList) -TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::PrimitiveSet > >, osg::Geometry::PrimitiveSetList); +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::PrimitiveSet > >, osg::Geometry::PrimitiveSetList) BEGIN_ENUM_REFLECTOR(osg::Geometry::AttributeBinding) I_EnumLabel(osg::Geometry::BIND_OFF); @@ -921,7 +921,7 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::PrimitiveSet >) 0); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osg::Geometry::ArrayData >); +STD_VECTOR_REFLECTOR(std::vector< osg::Geometry::ArrayData >) -STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::PrimitiveSet > >); +STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::PrimitiveSet > >) diff --git a/src/osgWrappers/osg/GraphicsContext.cpp b/src/osgWrappers/osg/GraphicsContext.cpp index 831857060..a87a2b4e8 100644 --- a/src/osgWrappers/osg/GraphicsContext.cpp +++ b/src/osgWrappers/osg/GraphicsContext.cpp @@ -25,11 +25,11 @@ #include -TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::Operation > >, osg::GraphicsContext::OperationQueue); +TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::Operation > >, osg::GraphicsContext::OperationQueue) -TYPE_NAME_ALIAS(std::list< osg::Camera * >, osg::GraphicsContext::Cameras); +TYPE_NAME_ALIAS(std::list< osg::Camera * >, osg::GraphicsContext::Cameras) -BEGIN_OBJECT_REFLECTOR(osg::GraphicsContext) +BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext) I_BaseType(osg::Object); I_Method1(void, add, IN, osg::Operation *, operation, Properties::NON_VIRTUAL, @@ -515,7 +515,7 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Operation >) 0); END_REFLECTOR -STD_LIST_REFLECTOR(std::list< osg::Camera * >); +STD_LIST_REFLECTOR(std::list< osg::Camera * >) -STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osg::Operation > >); +STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osg::Operation > >) diff --git a/src/osgWrappers/osg/Group.cpp b/src/osgWrappers/osg/Group.cpp index 1f607e6c5..93835fa89 100644 --- a/src/osgWrappers/osg/Group.cpp +++ b/src/osgWrappers/osg/Group.cpp @@ -184,7 +184,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Group) __void__setThreadSafeRefUnref__bool); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Node > >, osg::NodeList); +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Node > >, osg::NodeList) BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Node >) I_Constructor0(____ref_ptr, @@ -225,5 +225,5 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Node >) 0); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::Node > >); +STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::Node > >) diff --git a/src/osgWrappers/osg/Image.cpp b/src/osgWrappers/osg/Image.cpp index f08d97c86..2c6597c1f 100644 --- a/src/osgWrappers/osg/Image.cpp +++ b/src/osgWrappers/osg/Image.cpp @@ -23,7 +23,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< unsigned int >, osg::Image::MipmapDataType); +TYPE_NAME_ALIAS(std::vector< unsigned int >, osg::Image::MipmapDataType) BEGIN_ENUM_REFLECTOR(osg::Image::AllocationMode) I_EnumLabel(osg::Image::NO_DELETE); @@ -395,5 +395,5 @@ BEGIN_OBJECT_REFLECTOR(osg::Image) 0); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< unsigned int >); +STD_VECTOR_REFLECTOR(std::vector< unsigned int >) diff --git a/src/osgWrappers/osg/LOD.cpp b/src/osgWrappers/osg/LOD.cpp index e8bd0fa20..8a99f9926 100644 --- a/src/osgWrappers/osg/LOD.cpp +++ b/src/osgWrappers/osg/LOD.cpp @@ -26,9 +26,9 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::pair< float COMMA float >, osg::LOD::MinMaxPair); +TYPE_NAME_ALIAS(std::pair< float COMMA float >, osg::LOD::MinMaxPair) -TYPE_NAME_ALIAS(std::vector< osg::LOD::MinMaxPair >, osg::LOD::RangeList); +TYPE_NAME_ALIAS(std::vector< osg::LOD::MinMaxPair >, osg::LOD::RangeList) BEGIN_ENUM_REFLECTOR(osg::LOD::CenterMode) I_EnumLabel(osg::LOD::USE_BOUNDING_SPHERE_CENTER); @@ -191,7 +191,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LOD) __void__setRangeMode__RangeMode); END_REFLECTOR -STD_PAIR_REFLECTOR(std::pair< float COMMA float >); +STD_PAIR_REFLECTOR(std::pair< float COMMA float >) -STD_VECTOR_REFLECTOR(std::vector< osg::LOD::MinMaxPair >); +STD_VECTOR_REFLECTOR(std::vector< osg::LOD::MinMaxPair >) diff --git a/src/osgWrappers/osg/Matrix.cpp b/src/osgWrappers/osg/Matrix.cpp index 2c7d5a8fc..5980916f4 100644 --- a/src/osgWrappers/osg/Matrix.cpp +++ b/src/osgWrappers/osg/Matrix.cpp @@ -20,7 +20,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(osg::Matrixd, osg::Matrix); +TYPE_NAME_ALIAS(osg::Matrixd, osg::Matrix) -TYPE_NAME_ALIAS(osg::RefMatrixd, osg::RefMatrix); +TYPE_NAME_ALIAS(osg::RefMatrixd, osg::RefMatrix) diff --git a/src/osgWrappers/osg/Matrixd.cpp b/src/osgWrappers/osg/Matrixd.cpp index f7663c634..d67a0198e 100644 --- a/src/osgWrappers/osg/Matrixd.cpp +++ b/src/osgWrappers/osg/Matrixd.cpp @@ -28,7 +28,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(double, osg::Matrixd::value_type); +TYPE_NAME_ALIAS(double, osg::Matrixd::value_type) BEGIN_VALUE_REFLECTOR(osg::Matrixd) I_Constructor0(____Matrixd, diff --git a/src/osgWrappers/osg/Matrixf.cpp b/src/osgWrappers/osg/Matrixf.cpp index 543b15c13..d332c13da 100644 --- a/src/osgWrappers/osg/Matrixf.cpp +++ b/src/osgWrappers/osg/Matrixf.cpp @@ -28,7 +28,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(float, osg::Matrixf::value_type); +TYPE_NAME_ALIAS(float, osg::Matrixf::value_type) BEGIN_VALUE_REFLECTOR(osg::Matrixf) I_Constructor0(____Matrixf, diff --git a/src/osgWrappers/osg/Node.cpp b/src/osgWrappers/osg/Node.cpp index 98cc903b3..5391295e6 100644 --- a/src/osgWrappers/osg/Node.cpp +++ b/src/osgWrappers/osg/Node.cpp @@ -29,11 +29,11 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::Group * >, osg::Node::ParentList); +TYPE_NAME_ALIAS(std::vector< osg::Group * >, osg::Node::ParentList) -TYPE_NAME_ALIAS(unsigned int, osg::Node::NodeMask); +TYPE_NAME_ALIAS(unsigned int, osg::Node::NodeMask) -TYPE_NAME_ALIAS(std::vector< std::string >, osg::Node::DescriptionList); +TYPE_NAME_ALIAS(std::vector< std::string >, osg::Node::DescriptionList) BEGIN_OBJECT_REFLECTOR(osg::Node) I_BaseType(osg::Object); @@ -473,17 +473,17 @@ BEGIN_OBJECT_REFLECTOR(osg::Node::ComputeBoundingSphereCallback) ""); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::Node * >, osg::NodePath); +TYPE_NAME_ALIAS(std::vector< osg::Node * >, osg::NodePath) -TYPE_NAME_ALIAS(std::vector< osg::NodePath >, osg::NodePathList); +TYPE_NAME_ALIAS(std::vector< osg::NodePath >, osg::NodePathList) -TYPE_NAME_ALIAS(std::vector< osg::Matrix >, osg::MatrixList); +TYPE_NAME_ALIAS(std::vector< osg::Matrix >, osg::MatrixList) -STD_VECTOR_REFLECTOR(std::vector< osg::Group * >); +STD_VECTOR_REFLECTOR(std::vector< osg::Group * >) -STD_VECTOR_REFLECTOR(std::vector< osg::Matrix >); +STD_VECTOR_REFLECTOR(std::vector< osg::Matrix >) -STD_VECTOR_REFLECTOR(std::vector< osg::NodePath >); +STD_VECTOR_REFLECTOR(std::vector< osg::NodePath >) -STD_VECTOR_REFLECTOR(std::vector< std::string >); +STD_VECTOR_REFLECTOR(std::vector< std::string >) diff --git a/src/osgWrappers/osg/NodeTrackerCallback.cpp b/src/osgWrappers/osg/NodeTrackerCallback.cpp index d18ff7ae1..ebb14755b 100644 --- a/src/osgWrappers/osg/NodeTrackerCallback.cpp +++ b/src/osgWrappers/osg/NodeTrackerCallback.cpp @@ -22,7 +22,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::observer_ptr< osg::Node > >, osg::NodeTrackerCallback::ObserveredNodePath); +TYPE_NAME_ALIAS(std::vector< osg::observer_ptr< osg::Node > >, osg::NodeTrackerCallback::ObserveredNodePath) BEGIN_OBJECT_REFLECTOR(osg::NodeTrackerCallback) I_BaseType(osg::NodeCallback); @@ -117,5 +117,5 @@ BEGIN_OBJECT_REFLECTOR(osg::observer_ptr< osg::Node >) 0); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osg::observer_ptr< osg::Node > >); +STD_VECTOR_REFLECTOR(std::vector< osg::observer_ptr< osg::Node > >) diff --git a/src/osgWrappers/osg/PagedLOD.cpp b/src/osgWrappers/osg/PagedLOD.cpp index d018b3ccb..34c38a330 100644 --- a/src/osgWrappers/osg/PagedLOD.cpp +++ b/src/osgWrappers/osg/PagedLOD.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::PagedLOD::PerRangeData >, osg::PagedLOD::PerRangeDataList); +TYPE_NAME_ALIAS(std::vector< osg::PagedLOD::PerRangeData >, osg::PagedLOD::PerRangeDataList) BEGIN_OBJECT_REFLECTOR(osg::PagedLOD) I_BaseType(osg::LOD); @@ -246,5 +246,5 @@ BEGIN_VALUE_REFLECTOR(osg::PagedLOD::PerRangeData) I_PublicMemberProperty(double, _timeStamp); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osg::PagedLOD::PerRangeData >); +STD_VECTOR_REFLECTOR(std::vector< osg::PagedLOD::PerRangeData >) diff --git a/src/osgWrappers/osg/Plane.cpp b/src/osgWrappers/osg/Plane.cpp index 3e4dcec8a..b0c7edbc2 100644 --- a/src/osgWrappers/osg/Plane.cpp +++ b/src/osgWrappers/osg/Plane.cpp @@ -30,11 +30,11 @@ #include -TYPE_NAME_ALIAS(double, osg::Plane::value_type); +TYPE_NAME_ALIAS(double, osg::Plane::value_type) -TYPE_NAME_ALIAS(osg::Vec3d, osg::Plane::Vec3_type); +TYPE_NAME_ALIAS(osg::Vec3d, osg::Plane::Vec3_type) -TYPE_NAME_ALIAS(osg::Vec4d, osg::Plane::Vec4_type); +TYPE_NAME_ALIAS(osg::Vec4d, osg::Plane::Vec4_type) BEGIN_VALUE_REFLECTOR(osg::Plane) I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined diff --git a/src/osgWrappers/osg/Polytope.cpp b/src/osgWrappers/osg/Polytope.cpp index 528d69996..097791ad4 100644 --- a/src/osgWrappers/osg/Polytope.cpp +++ b/src/osgWrappers/osg/Polytope.cpp @@ -25,13 +25,13 @@ #undef OUT #endif -TYPE_NAME_ALIAS(unsigned int, osg::Polytope::ClippingMask); +TYPE_NAME_ALIAS(unsigned int, osg::Polytope::ClippingMask) -TYPE_NAME_ALIAS(std::vector< osg::Plane >, osg::Polytope::PlaneList); +TYPE_NAME_ALIAS(std::vector< osg::Plane >, osg::Polytope::PlaneList) -TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osg::Polytope::VertexList); +TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osg::Polytope::VertexList) -TYPE_NAME_ALIAS(osg::fast_back_stack< osg::Polytope::ClippingMask >, osg::Polytope::MaskStack); +TYPE_NAME_ALIAS(osg::fast_back_stack< osg::Polytope::ClippingMask >, osg::Polytope::MaskStack) BEGIN_VALUE_REFLECTOR(osg::Polytope) I_Constructor0(____Polytope, @@ -268,5 +268,5 @@ BEGIN_VALUE_REFLECTOR(osg::fast_back_stack< osg::Polytope::ClippingMask >) I_PublicMemberProperty(unsigned int, _size); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osg::Plane >); +STD_VECTOR_REFLECTOR(std::vector< osg::Plane >) diff --git a/src/osgWrappers/osg/PrimitiveSet.cpp b/src/osgWrappers/osg/PrimitiveSet.cpp index e5a2aaf8f..92211abd5 100644 --- a/src/osgWrappers/osg/PrimitiveSet.cpp +++ b/src/osgWrappers/osg/PrimitiveSet.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(osg::VectorGLsizei, osg::DrawArrayLengths::vector_type); +TYPE_NAME_ALIAS(osg::VectorGLsizei, osg::DrawArrayLengths::vector_type) BEGIN_OBJECT_REFLECTOR(osg::DrawArrayLengths) I_BaseType(osg::PrimitiveSet); @@ -230,7 +230,7 @@ BEGIN_OBJECT_REFLECTOR(osg::DrawArrays) __void__setFirst__GLint); END_REFLECTOR -TYPE_NAME_ALIAS(osg::VectorGLubyte, osg::DrawElementsUByte::vector_type); +TYPE_NAME_ALIAS(osg::VectorGLubyte, osg::DrawElementsUByte::vector_type) BEGIN_OBJECT_REFLECTOR(osg::DrawElementsUByte) I_BaseType(osg::PrimitiveSet); @@ -345,7 +345,7 @@ BEGIN_OBJECT_REFLECTOR(osg::DrawElementsUByte) 0); END_REFLECTOR -TYPE_NAME_ALIAS(osg::VectorGLuint, osg::DrawElementsUInt::vector_type); +TYPE_NAME_ALIAS(osg::VectorGLuint, osg::DrawElementsUInt::vector_type) BEGIN_OBJECT_REFLECTOR(osg::DrawElementsUInt) I_BaseType(osg::PrimitiveSet); @@ -460,7 +460,7 @@ BEGIN_OBJECT_REFLECTOR(osg::DrawElementsUInt) 0); END_REFLECTOR -TYPE_NAME_ALIAS(osg::VectorGLushort, osg::DrawElementsUShort::vector_type); +TYPE_NAME_ALIAS(osg::VectorGLushort, osg::DrawElementsUShort::vector_type) BEGIN_OBJECT_REFLECTOR(osg::DrawElementsUShort) I_BaseType(osg::PrimitiveSet); diff --git a/src/osgWrappers/osg/Program.cpp b/src/osgWrappers/osg/Program.cpp index 9b2dfb0b2..f7a41df6c 100644 --- a/src/osgWrappers/osg/Program.cpp +++ b/src/osgWrappers/osg/Program.cpp @@ -26,9 +26,9 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::map< std::string COMMA GLuint >, osg::Program::AttribBindingList); +TYPE_NAME_ALIAS(std::map< std::string COMMA GLuint >, osg::Program::AttribBindingList) -TYPE_NAME_ALIAS(std::map< std::string COMMA osg::Program::ActiveVarInfo >, osg::Program::ActiveVarInfoMap); +TYPE_NAME_ALIAS(std::map< std::string COMMA osg::Program::ActiveVarInfo >, osg::Program::ActiveVarInfoMap) BEGIN_OBJECT_REFLECTOR(osg::Program) I_BaseType(osg::StateAttribute); @@ -295,7 +295,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Program::PerContextProgram) 0); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< std::string COMMA GLuint >); +STD_MAP_REFLECTOR(std::map< std::string COMMA GLuint >) -STD_MAP_REFLECTOR(std::map< std::string COMMA osg::Program::ActiveVarInfo >); +STD_MAP_REFLECTOR(std::map< std::string COMMA osg::Program::ActiveVarInfo >) diff --git a/src/osgWrappers/osg/ProxyNode.cpp b/src/osgWrappers/osg/ProxyNode.cpp index f63e86e30..2f718737f 100644 --- a/src/osgWrappers/osg/ProxyNode.cpp +++ b/src/osgWrappers/osg/ProxyNode.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< std::string >, osg::ProxyNode::FileNameList); +TYPE_NAME_ALIAS(std::vector< std::string >, osg::ProxyNode::FileNameList) BEGIN_ENUM_REFLECTOR(osg::ProxyNode::CenterMode) I_EnumLabel(osg::ProxyNode::USE_BOUNDING_SPHERE_CENTER); diff --git a/src/osgWrappers/osg/Quat.cpp b/src/osgWrappers/osg/Quat.cpp index dc806d967..ca2b59595 100644 --- a/src/osgWrappers/osg/Quat.cpp +++ b/src/osgWrappers/osg/Quat.cpp @@ -28,7 +28,7 @@ #include -TYPE_NAME_ALIAS(double, osg::Quat::value_type); +TYPE_NAME_ALIAS(double, osg::Quat::value_type) BEGIN_VALUE_REFLECTOR(osg::Quat) I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined diff --git a/src/osgWrappers/osg/ShadeModel.cpp b/src/osgWrappers/osg/ShadeModel.cpp index 461716516..98fcf695d 100644 --- a/src/osgWrappers/osg/ShadeModel.cpp +++ b/src/osgWrappers/osg/ShadeModel.cpp @@ -31,7 +31,7 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::ShadeModel) I_BaseType(osg::StateAttribute); - I_ConstructorWithDefaults1(IN, osg::ShadeModel::Mode, mode, osg::ShadeModel::FLAT, + I_ConstructorWithDefaults1(IN, osg::ShadeModel::Mode, mode, osg::ShadeModel::SMOOTH, Properties::NON_EXPLICIT, ____ShadeModel__Mode, "", diff --git a/src/osgWrappers/osg/ShadowVolumeOccluder.cpp b/src/osgWrappers/osg/ShadowVolumeOccluder.cpp index 45fb6e5a0..153f091be 100644 --- a/src/osgWrappers/osg/ShadowVolumeOccluder.cpp +++ b/src/osgWrappers/osg/ShadowVolumeOccluder.cpp @@ -28,7 +28,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::Polytope >, osg::ShadowVolumeOccluder::HoleList); +TYPE_NAME_ALIAS(std::vector< osg::Polytope >, osg::ShadowVolumeOccluder::HoleList) BEGIN_VALUE_REFLECTOR(osg::ShadowVolumeOccluder) I_Constructor1(IN, const osg::ShadowVolumeOccluder &, svo, @@ -138,7 +138,7 @@ BEGIN_VALUE_REFLECTOR(osg::ShadowVolumeOccluder) 0); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::ShadowVolumeOccluder >, osg::ShadowVolumeOccluderList); +TYPE_NAME_ALIAS(std::vector< osg::ShadowVolumeOccluder >, osg::ShadowVolumeOccluderList) -STD_VECTOR_REFLECTOR(std::vector< osg::Polytope >); +STD_VECTOR_REFLECTOR(std::vector< osg::Polytope >) diff --git a/src/osgWrappers/osg/Shape.cpp b/src/osgWrappers/osg/Shape.cpp index 2e81acc52..78cb1849d 100644 --- a/src/osgWrappers/osg/Shape.cpp +++ b/src/osgWrappers/osg/Shape.cpp @@ -262,7 +262,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Capsule) __void__setRotation__C5_Quat_R1); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Shape > >, osg::CompositeShape::ChildList); +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Shape > >, osg::CompositeShape::ChildList) BEGIN_OBJECT_REFLECTOR(osg::CompositeShape) I_BaseType(osg::Shape); @@ -727,7 +727,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Cylinder) __void__setRotation__C5_Quat_R1); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< float >, osg::HeightField::HeightList); +TYPE_NAME_ALIAS(std::vector< float >, osg::HeightField::HeightList) BEGIN_OBJECT_REFLECTOR(osg::HeightField) I_BaseType(osg::Shape); @@ -1255,7 +1255,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TriangleMesh) __void__setVertices__Vec3Array_P1); END_REFLECTOR -TYPE_NAME_ALIAS(osg::HeightField, osg::Grid); +TYPE_NAME_ALIAS(osg::HeightField, osg::Grid) BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Shape >) I_Constructor0(____ref_ptr, @@ -1296,7 +1296,7 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Shape >) 0); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< float >); +STD_VECTOR_REFLECTOR(std::vector< float >) -STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::Shape > >); +STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::Shape > >) diff --git a/src/osgWrappers/osg/State.cpp b/src/osgWrappers/osg/State.cpp index cfc8223b5..15f7d10b1 100644 --- a/src/osgWrappers/osg/State.cpp +++ b/src/osgWrappers/osg/State.cpp @@ -29,7 +29,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< const osg::StateSet * >, osg::State::StateSetStack); +TYPE_NAME_ALIAS(std::vector< const osg::StateSet * >, osg::State::StateSetStack) BEGIN_ENUM_REFLECTOR(osg::State::CheckForGLErrors) I_EnumLabel(osg::State::NEVER_CHECK_GL_ERRORS); @@ -729,5 +729,5 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::State::DynamicObjectRenderingCompletedCallb ""); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< const osg::StateSet * >); +STD_VECTOR_REFLECTOR(std::vector< const osg::StateSet * >) diff --git a/src/osgWrappers/osg/StateAttribute.cpp b/src/osgWrappers/osg/StateAttribute.cpp index e5d01d830..256c5d489 100644 --- a/src/osgWrappers/osg/StateAttribute.cpp +++ b/src/osgWrappers/osg/StateAttribute.cpp @@ -25,15 +25,15 @@ #undef OUT #endif -TYPE_NAME_ALIAS(GLenum, osg::StateAttribute::GLMode); +TYPE_NAME_ALIAS(GLenum, osg::StateAttribute::GLMode) -TYPE_NAME_ALIAS(unsigned int, osg::StateAttribute::GLModeValue); +TYPE_NAME_ALIAS(unsigned int, osg::StateAttribute::GLModeValue) -TYPE_NAME_ALIAS(unsigned int, osg::StateAttribute::OverrideValue); +TYPE_NAME_ALIAS(unsigned int, osg::StateAttribute::OverrideValue) -TYPE_NAME_ALIAS(std::pair< osg::StateAttribute::Type COMMA unsigned int >, osg::StateAttribute::TypeMemberPair); +TYPE_NAME_ALIAS(std::pair< osg::StateAttribute::Type COMMA unsigned int >, osg::StateAttribute::TypeMemberPair) -TYPE_NAME_ALIAS(std::vector< osg::StateSet * >, osg::StateAttribute::ParentList); +TYPE_NAME_ALIAS(std::vector< osg::StateSet * >, osg::StateAttribute::ParentList) BEGIN_ENUM_REFLECTOR(osg::StateAttribute::Values) I_EnumLabel(osg::StateAttribute::OFF); @@ -323,7 +323,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateAttribute::ModeUsage) ""); END_REFLECTOR -STD_PAIR_REFLECTOR(std::pair< osg::StateAttribute::Type COMMA unsigned int >); +STD_PAIR_REFLECTOR(std::pair< osg::StateAttribute::Type COMMA unsigned int >) -STD_VECTOR_REFLECTOR(std::vector< osg::StateSet * >); +STD_VECTOR_REFLECTOR(std::vector< osg::StateSet * >) diff --git a/src/osgWrappers/osg/StateSet.cpp b/src/osgWrappers/osg/StateSet.cpp index 69dae2f87..0b874db5a 100644 --- a/src/osgWrappers/osg/StateSet.cpp +++ b/src/osgWrappers/osg/StateSet.cpp @@ -26,21 +26,21 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::Object * >, osg::StateSet::ParentList); +TYPE_NAME_ALIAS(std::vector< osg::Object * >, osg::StateSet::ParentList) -TYPE_NAME_ALIAS(std::map< osg::StateAttribute::GLMode COMMA osg::StateAttribute::GLModeValue >, osg::StateSet::ModeList); +TYPE_NAME_ALIAS(std::map< osg::StateAttribute::GLMode COMMA osg::StateAttribute::GLModeValue >, osg::StateSet::ModeList) -TYPE_NAME_ALIAS(std::pair< osg::ref_ptr< osg::StateAttribute > COMMA osg::StateAttribute::OverrideValue >, osg::StateSet::RefAttributePair); +TYPE_NAME_ALIAS(std::pair< osg::ref_ptr< osg::StateAttribute > COMMA osg::StateAttribute::OverrideValue >, osg::StateSet::RefAttributePair) -TYPE_NAME_ALIAS(std::map< osg::StateAttribute::TypeMemberPair COMMA osg::StateSet::RefAttributePair >, osg::StateSet::AttributeList); +TYPE_NAME_ALIAS(std::map< osg::StateAttribute::TypeMemberPair COMMA osg::StateSet::RefAttributePair >, osg::StateSet::AttributeList) -TYPE_NAME_ALIAS(std::vector< osg::StateSet::ModeList >, osg::StateSet::TextureModeList); +TYPE_NAME_ALIAS(std::vector< osg::StateSet::ModeList >, osg::StateSet::TextureModeList) -TYPE_NAME_ALIAS(std::vector< osg::StateSet::AttributeList >, osg::StateSet::TextureAttributeList); +TYPE_NAME_ALIAS(std::vector< osg::StateSet::AttributeList >, osg::StateSet::TextureAttributeList) -TYPE_NAME_ALIAS(std::pair< osg::ref_ptr< osg::Uniform > COMMA osg::StateAttribute::OverrideValue >, osg::StateSet::RefUniformPair); +TYPE_NAME_ALIAS(std::pair< osg::ref_ptr< osg::Uniform > COMMA osg::StateAttribute::OverrideValue >, osg::StateSet::RefUniformPair) -TYPE_NAME_ALIAS(std::map< std::string COMMA osg::StateSet::RefUniformPair >, osg::StateSet::UniformList); +TYPE_NAME_ALIAS(std::map< std::string COMMA osg::StateSet::RefUniformPair >, osg::StateSet::UniformList) BEGIN_ENUM_REFLECTOR(osg::StateSet::RenderingHint) I_EnumLabel(osg::StateSet::DEFAULT_BIN); @@ -762,17 +762,17 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Uniform >) END_REFLECTOR STD_MAP_REFLECTOR_WITH_TYPES(std::map< osg::StateAttribute::GLMode COMMA osg::StateAttribute::GLModeValue >, osg::StateAttribute::GLMode, osg::StateAttribute::Values); -STD_MAP_REFLECTOR(std::map< osg::StateAttribute::TypeMemberPair COMMA osg::StateSet::RefAttributePair >); +STD_MAP_REFLECTOR(std::map< osg::StateAttribute::TypeMemberPair COMMA osg::StateSet::RefAttributePair >) -STD_MAP_REFLECTOR(std::map< std::string COMMA osg::StateSet::RefUniformPair >); +STD_MAP_REFLECTOR(std::map< std::string COMMA osg::StateSet::RefUniformPair >) -STD_PAIR_REFLECTOR(std::pair< osg::ref_ptr< osg::StateAttribute > COMMA osg::StateAttribute::OverrideValue >); +STD_PAIR_REFLECTOR(std::pair< osg::ref_ptr< osg::StateAttribute > COMMA osg::StateAttribute::OverrideValue >) -STD_PAIR_REFLECTOR(std::pair< osg::ref_ptr< osg::Uniform > COMMA osg::StateAttribute::OverrideValue >); +STD_PAIR_REFLECTOR(std::pair< osg::ref_ptr< osg::Uniform > COMMA osg::StateAttribute::OverrideValue >) -STD_VECTOR_REFLECTOR(std::vector< osg::Object * >); +STD_VECTOR_REFLECTOR(std::vector< osg::Object * >) -STD_VECTOR_REFLECTOR(std::vector< osg::StateSet::AttributeList >); +STD_VECTOR_REFLECTOR(std::vector< osg::StateSet::AttributeList >) -STD_VECTOR_REFLECTOR(std::vector< osg::StateSet::ModeList >); +STD_VECTOR_REFLECTOR(std::vector< osg::StateSet::ModeList >) diff --git a/src/osgWrappers/osg/Stats.cpp b/src/osgWrappers/osg/Stats.cpp index c0139aa04..7da3f9a54 100644 --- a/src/osgWrappers/osg/Stats.cpp +++ b/src/osgWrappers/osg/Stats.cpp @@ -20,11 +20,11 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::map< std::string COMMA double >, osg::Stats::AttributeMap); +TYPE_NAME_ALIAS(std::map< std::string COMMA double >, osg::Stats::AttributeMap) -TYPE_NAME_ALIAS(std::vector< osg::Stats::AttributeMap >, osg::Stats::AttributeMapList); +TYPE_NAME_ALIAS(std::vector< osg::Stats::AttributeMap >, osg::Stats::AttributeMapList) -TYPE_NAME_ALIAS(std::map< std::string COMMA bool >, osg::Stats::CollectMap); +TYPE_NAME_ALIAS(std::map< std::string COMMA bool >, osg::Stats::CollectMap) BEGIN_OBJECT_REFLECTOR(osg::Stats) I_BaseType(osg::Referenced); @@ -147,9 +147,9 @@ BEGIN_OBJECT_REFLECTOR(osg::Stats) __void__setName__C5_std_string_R1); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< std::string COMMA bool >); +STD_MAP_REFLECTOR(std::map< std::string COMMA bool >) -STD_MAP_REFLECTOR(std::map< std::string COMMA double >); +STD_MAP_REFLECTOR(std::map< std::string COMMA double >) -STD_VECTOR_REFLECTOR(std::vector< osg::Stats::AttributeMap >); +STD_VECTOR_REFLECTOR(std::vector< osg::Stats::AttributeMap >) diff --git a/src/osgWrappers/osg/Switch.cpp b/src/osgWrappers/osg/Switch.cpp index 0e2ffc6a1..0afbb9ca8 100644 --- a/src/osgWrappers/osg/Switch.cpp +++ b/src/osgWrappers/osg/Switch.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< bool >, osg::Switch::ValueList); +TYPE_NAME_ALIAS(std::vector< bool >, osg::Switch::ValueList) BEGIN_OBJECT_REFLECTOR(osg::Switch) I_BaseType(osg::Group); @@ -175,5 +175,5 @@ BEGIN_OBJECT_REFLECTOR(osg::Switch) __void__setValueList__C5_ValueList_R1); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< bool >); +STD_VECTOR_REFLECTOR(std::vector< bool >) diff --git a/src/osgWrappers/osg/Texture.cpp b/src/osgWrappers/osg/Texture.cpp index 083fc733b..700732fe7 100644 --- a/src/osgWrappers/osg/Texture.cpp +++ b/src/osgWrappers/osg/Texture.cpp @@ -27,9 +27,9 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::Texture::TextureObject > >, osg::Texture::TextureObjectList); +TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::Texture::TextureObject > >, osg::Texture::TextureObjectList) -TYPE_NAME_ALIAS(osg::buffered_object< osg::Texture::TextureObjectList >, osg::Texture::TextureObjectListMap); +TYPE_NAME_ALIAS(osg::buffered_object< osg::Texture::TextureObjectList >, osg::Texture::TextureObjectListMap) BEGIN_ENUM_REFLECTOR(osg::Texture::WrapParameter) I_EnumLabel(osg::Texture::WRAP_S); @@ -936,5 +936,5 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Texture::TextureObject >) 0); END_REFLECTOR -STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osg::Texture::TextureObject > >); +STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osg::Texture::TextureObject > >) diff --git a/src/osgWrappers/osg/Timer.cpp b/src/osgWrappers/osg/Timer.cpp index d1de5bee7..c92d32d03 100644 --- a/src/osgWrappers/osg/Timer.cpp +++ b/src/osgWrappers/osg/Timer.cpp @@ -101,5 +101,5 @@ BEGIN_VALUE_REFLECTOR(osg::Timer) __void__setStartTick__Timer_t); END_REFLECTOR -TYPE_NAME_ALIAS(unsigned long long, osg::Timer_t); +TYPE_NAME_ALIAS(unsigned long long, osg::Timer_t) diff --git a/src/osgWrappers/osg/Uniform.cpp b/src/osgWrappers/osg/Uniform.cpp index aa53ced4d..ad1a1c225 100644 --- a/src/osgWrappers/osg/Uniform.cpp +++ b/src/osgWrappers/osg/Uniform.cpp @@ -121,7 +121,7 @@ BEGIN_VALUE_REFLECTOR(osg::Matrix3) ""); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::StateSet * >, osg::Uniform::ParentList); +TYPE_NAME_ALIAS(std::vector< osg::StateSet * >, osg::Uniform::ParentList) BEGIN_ENUM_REFLECTOR(osg::Uniform::Type) I_EnumLabel(osg::Uniform::FLOAT); diff --git a/src/osgWrappers/osg/Vec2.cpp b/src/osgWrappers/osg/Vec2.cpp index 2b959106d..98d26f6b4 100644 --- a/src/osgWrappers/osg/Vec2.cpp +++ b/src/osgWrappers/osg/Vec2.cpp @@ -20,5 +20,5 @@ #undef OUT #endif -TYPE_NAME_ALIAS(osg::Vec2f, osg::Vec2); +TYPE_NAME_ALIAS(osg::Vec2f, osg::Vec2) diff --git a/src/osgWrappers/osg/Vec2b.cpp b/src/osgWrappers/osg/Vec2b.cpp index 5f3cbabb2..48f83081d 100644 --- a/src/osgWrappers/osg/Vec2b.cpp +++ b/src/osgWrappers/osg/Vec2b.cpp @@ -22,7 +22,7 @@ #include -TYPE_NAME_ALIAS(char, osg::Vec2b::value_type); +TYPE_NAME_ALIAS(char, osg::Vec2b::value_type) BEGIN_VALUE_REFLECTOR(osg::Vec2b) I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined diff --git a/src/osgWrappers/osg/Vec2d.cpp b/src/osgWrappers/osg/Vec2d.cpp index b29153730..cfeca456a 100644 --- a/src/osgWrappers/osg/Vec2d.cpp +++ b/src/osgWrappers/osg/Vec2d.cpp @@ -23,7 +23,7 @@ #include -TYPE_NAME_ALIAS(double, osg::Vec2d::value_type); +TYPE_NAME_ALIAS(double, osg::Vec2d::value_type) BEGIN_VALUE_REFLECTOR(osg::Vec2d) I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined diff --git a/src/osgWrappers/osg/Vec2f.cpp b/src/osgWrappers/osg/Vec2f.cpp index 35f7efdb6..ef6c96496 100644 --- a/src/osgWrappers/osg/Vec2f.cpp +++ b/src/osgWrappers/osg/Vec2f.cpp @@ -22,7 +22,7 @@ #include -TYPE_NAME_ALIAS(float, osg::Vec2f::value_type); +TYPE_NAME_ALIAS(float, osg::Vec2f::value_type) BEGIN_VALUE_REFLECTOR(osg::Vec2f) I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined diff --git a/src/osgWrappers/osg/Vec2s.cpp b/src/osgWrappers/osg/Vec2s.cpp index 3dfd01d01..00d2516e9 100644 --- a/src/osgWrappers/osg/Vec2s.cpp +++ b/src/osgWrappers/osg/Vec2s.cpp @@ -20,7 +20,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(short, osg::Vec2s::value_type); +TYPE_NAME_ALIAS(short, osg::Vec2s::value_type) BEGIN_VALUE_REFLECTOR(osg::Vec2s) I_Constructor0(____Vec2s, diff --git a/src/osgWrappers/osg/Vec3.cpp b/src/osgWrappers/osg/Vec3.cpp index d76b9a823..b3dcb02f2 100644 --- a/src/osgWrappers/osg/Vec3.cpp +++ b/src/osgWrappers/osg/Vec3.cpp @@ -20,5 +20,5 @@ #undef OUT #endif -TYPE_NAME_ALIAS(osg::Vec3f, osg::Vec3); +TYPE_NAME_ALIAS(osg::Vec3f, osg::Vec3) diff --git a/src/osgWrappers/osg/Vec3b.cpp b/src/osgWrappers/osg/Vec3b.cpp index 8fbb9ea0c..67d44de5e 100644 --- a/src/osgWrappers/osg/Vec3b.cpp +++ b/src/osgWrappers/osg/Vec3b.cpp @@ -22,7 +22,7 @@ #include -TYPE_NAME_ALIAS(char, osg::Vec3b::value_type); +TYPE_NAME_ALIAS(char, osg::Vec3b::value_type) BEGIN_VALUE_REFLECTOR(osg::Vec3b) I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined diff --git a/src/osgWrappers/osg/Vec3d.cpp b/src/osgWrappers/osg/Vec3d.cpp index 3c1538058..6b94532ee 100644 --- a/src/osgWrappers/osg/Vec3d.cpp +++ b/src/osgWrappers/osg/Vec3d.cpp @@ -24,7 +24,7 @@ #include -TYPE_NAME_ALIAS(double, osg::Vec3d::value_type); +TYPE_NAME_ALIAS(double, osg::Vec3d::value_type) BEGIN_VALUE_REFLECTOR(osg::Vec3d) I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined diff --git a/src/osgWrappers/osg/Vec3f.cpp b/src/osgWrappers/osg/Vec3f.cpp index c3978e212..31dde19c5 100644 --- a/src/osgWrappers/osg/Vec3f.cpp +++ b/src/osgWrappers/osg/Vec3f.cpp @@ -23,7 +23,7 @@ #include -TYPE_NAME_ALIAS(float, osg::Vec3f::value_type); +TYPE_NAME_ALIAS(float, osg::Vec3f::value_type) BEGIN_VALUE_REFLECTOR(osg::Vec3f) I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined diff --git a/src/osgWrappers/osg/Vec3s.cpp b/src/osgWrappers/osg/Vec3s.cpp index d84b7339c..bb3d54d76 100644 --- a/src/osgWrappers/osg/Vec3s.cpp +++ b/src/osgWrappers/osg/Vec3s.cpp @@ -20,7 +20,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(short, osg::Vec3s::value_type); +TYPE_NAME_ALIAS(short, osg::Vec3s::value_type) BEGIN_VALUE_REFLECTOR(osg::Vec3s) I_Constructor0(____Vec3s, diff --git a/src/osgWrappers/osg/Vec4.cpp b/src/osgWrappers/osg/Vec4.cpp index 54f8a96fc..671ce35e6 100644 --- a/src/osgWrappers/osg/Vec4.cpp +++ b/src/osgWrappers/osg/Vec4.cpp @@ -20,5 +20,5 @@ #undef OUT #endif -TYPE_NAME_ALIAS(osg::Vec4f, osg::Vec4); +TYPE_NAME_ALIAS(osg::Vec4f, osg::Vec4) diff --git a/src/osgWrappers/osg/Vec4b.cpp b/src/osgWrappers/osg/Vec4b.cpp index 1d92302ec..acd3a1970 100644 --- a/src/osgWrappers/osg/Vec4b.cpp +++ b/src/osgWrappers/osg/Vec4b.cpp @@ -22,7 +22,7 @@ #include -TYPE_NAME_ALIAS(char, osg::Vec4b::value_type); +TYPE_NAME_ALIAS(char, osg::Vec4b::value_type) BEGIN_VALUE_REFLECTOR(osg::Vec4b) I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined diff --git a/src/osgWrappers/osg/Vec4d.cpp b/src/osgWrappers/osg/Vec4d.cpp index 4dd6bdfae..f49bf2894 100644 --- a/src/osgWrappers/osg/Vec4d.cpp +++ b/src/osgWrappers/osg/Vec4d.cpp @@ -24,7 +24,7 @@ #include -TYPE_NAME_ALIAS(double, osg::Vec4d::value_type); +TYPE_NAME_ALIAS(double, osg::Vec4d::value_type) BEGIN_VALUE_REFLECTOR(osg::Vec4d) I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined diff --git a/src/osgWrappers/osg/Vec4f.cpp b/src/osgWrappers/osg/Vec4f.cpp index 7bce7ec93..1c825b31d 100644 --- a/src/osgWrappers/osg/Vec4f.cpp +++ b/src/osgWrappers/osg/Vec4f.cpp @@ -23,7 +23,7 @@ #include -TYPE_NAME_ALIAS(float, osg::Vec4f::value_type); +TYPE_NAME_ALIAS(float, osg::Vec4f::value_type) BEGIN_VALUE_REFLECTOR(osg::Vec4f) I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined diff --git a/src/osgWrappers/osg/Vec4s.cpp b/src/osgWrappers/osg/Vec4s.cpp index 2246d21ed..c46d20cf9 100644 --- a/src/osgWrappers/osg/Vec4s.cpp +++ b/src/osgWrappers/osg/Vec4s.cpp @@ -20,7 +20,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(short, osg::Vec4s::value_type); +TYPE_NAME_ALIAS(short, osg::Vec4s::value_type) BEGIN_VALUE_REFLECTOR(osg::Vec4s) I_Constructor0(____Vec4s, diff --git a/src/osgWrappers/osg/Vec4ub.cpp b/src/osgWrappers/osg/Vec4ub.cpp index d569b5faf..8af67299b 100644 --- a/src/osgWrappers/osg/Vec4ub.cpp +++ b/src/osgWrappers/osg/Vec4ub.cpp @@ -22,7 +22,7 @@ #include -TYPE_NAME_ALIAS(unsigned char, osg::Vec4ub::value_type); +TYPE_NAME_ALIAS(unsigned char, osg::Vec4ub::value_type) BEGIN_VALUE_REFLECTOR(osg::Vec4ub) I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined diff --git a/src/osgWrappers/osg/VertexProgram.cpp b/src/osgWrappers/osg/VertexProgram.cpp index 5ea0b2c02..4fd635ef0 100644 --- a/src/osgWrappers/osg/VertexProgram.cpp +++ b/src/osgWrappers/osg/VertexProgram.cpp @@ -26,9 +26,9 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::map< GLuint COMMA osg::Vec4 >, osg::VertexProgram::LocalParamList); +TYPE_NAME_ALIAS(std::map< GLuint COMMA osg::Vec4 >, osg::VertexProgram::LocalParamList) -TYPE_NAME_ALIAS(std::map< GLenum COMMA osg::Matrix >, osg::VertexProgram::MatrixList); +TYPE_NAME_ALIAS(std::map< GLenum COMMA osg::Matrix >, osg::VertexProgram::MatrixList) BEGIN_OBJECT_REFLECTOR(osg::VertexProgram) I_BaseType(osg::StateAttribute); diff --git a/src/osgWrappers/osg/Viewport.cpp b/src/osgWrappers/osg/Viewport.cpp index 0c4f6a108..e80d3c2cb 100644 --- a/src/osgWrappers/osg/Viewport.cpp +++ b/src/osgWrappers/osg/Viewport.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(double, osg::Viewport::value_type); +TYPE_NAME_ALIAS(double, osg::Viewport::value_type) BEGIN_OBJECT_REFLECTOR(osg::Viewport) I_BaseType(osg::StateAttribute); diff --git a/src/osgWrappers/osgDB/Archive.cpp b/src/osgWrappers/osgDB/Archive.cpp index 25aee92ed..da3dd1e5e 100644 --- a/src/osgWrappers/osgDB/Archive.cpp +++ b/src/osgWrappers/osgDB/Archive.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< std::string >, osgDB::Archive::FileNameList); +TYPE_NAME_ALIAS(std::vector< std::string >, osgDB::Archive::FileNameList) BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::Archive) I_BaseType(osgDB::ReaderWriter); diff --git a/src/osgWrappers/osgDB/DatabasePager.cpp b/src/osgWrappers/osgDB/DatabasePager.cpp index 258d41267..a53c123ec 100644 --- a/src/osgWrappers/osgDB/DatabasePager.cpp +++ b/src/osgWrappers/osgDB/DatabasePager.cpp @@ -27,19 +27,19 @@ #undef OUT #endif -TYPE_NAME_ALIAS(OpenThreads::Thread::ThreadPriority, osgDB::DatabasePager::ThreadPriority); +TYPE_NAME_ALIAS(OpenThreads::Thread::ThreadPriority, osgDB::DatabasePager::ThreadPriority) -TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::PagedLOD > >, osgDB::DatabasePager::PagedLODList); +TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::PagedLOD > >, osgDB::DatabasePager::PagedLODList) -TYPE_NAME_ALIAS(std::set< osg::ref_ptr< osg::StateSet > >, osgDB::DatabasePager::StateSetList); +TYPE_NAME_ALIAS(std::set< osg::ref_ptr< osg::StateSet > >, osgDB::DatabasePager::StateSetList) -TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Drawable > >, osgDB::DatabasePager::DrawableList); +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Drawable > >, osgDB::DatabasePager::DrawableList) -TYPE_NAME_ALIAS(std::pair< osgDB::DatabasePager::StateSetList COMMA osgDB::DatabasePager::DrawableList >, osgDB::DatabasePager::DataToCompile); +TYPE_NAME_ALIAS(std::pair< osgDB::DatabasePager::StateSetList COMMA osgDB::DatabasePager::DrawableList >, osgDB::DatabasePager::DataToCompile) -TYPE_NAME_ALIAS(std::map< unsigned int COMMA osgDB::DatabasePager::DataToCompile >, osgDB::DatabasePager::DataToCompileMap); +TYPE_NAME_ALIAS(std::map< unsigned int COMMA osgDB::DatabasePager::DataToCompile >, osgDB::DatabasePager::DataToCompileMap) -TYPE_NAME_ALIAS(std::set< unsigned int >, osgDB::DatabasePager::ActiveGraphicsContexts); +TYPE_NAME_ALIAS(std::set< unsigned int >, osgDB::DatabasePager::ActiveGraphicsContexts) BEGIN_ENUM_REFLECTOR(osgDB::DatabasePager::DrawablePolicy) I_EnumLabel(osgDB::DatabasePager::DO_NOT_MODIFY_DRAWABLE_SETTINGS); @@ -397,13 +397,13 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::PagedLOD >) 0); END_REFLECTOR -STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osg::PagedLOD > >); +STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osg::PagedLOD > >) -STD_MAP_REFLECTOR(std::map< unsigned int COMMA osgDB::DatabasePager::DataToCompile >); +STD_MAP_REFLECTOR(std::map< unsigned int COMMA osgDB::DatabasePager::DataToCompile >) -STD_PAIR_REFLECTOR(std::pair< osgDB::DatabasePager::StateSetList COMMA osgDB::DatabasePager::DrawableList >); +STD_PAIR_REFLECTOR(std::pair< osgDB::DatabasePager::StateSetList COMMA osgDB::DatabasePager::DrawableList >) -STD_SET_REFLECTOR(std::set< osg::ref_ptr< osg::StateSet > >); +STD_SET_REFLECTOR(std::set< osg::ref_ptr< osg::StateSet > >) -STD_SET_REFLECTOR(std::set< unsigned int >); +STD_SET_REFLECTOR(std::set< unsigned int >) diff --git a/src/osgWrappers/osgDB/DotOsgWrapper.cpp b/src/osgWrappers/osgDB/DotOsgWrapper.cpp index adcedad4e..ddd1884c8 100644 --- a/src/osgWrappers/osgDB/DotOsgWrapper.cpp +++ b/src/osgWrappers/osgDB/DotOsgWrapper.cpp @@ -21,7 +21,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< std::string >, osgDB::DotOsgWrapper::Associates); +TYPE_NAME_ALIAS(std::vector< std::string >, osgDB::DotOsgWrapper::Associates) TYPE_NAME_ALIAS(bool (*)(osg::Object&,osgDB::Input&), osgDB::DotOsgWrapper::ReadFunc); diff --git a/src/osgWrappers/osgDB/DynamicLibrary.cpp b/src/osgWrappers/osgDB/DynamicLibrary.cpp index 62ba39c4e..7dda8933c 100644 --- a/src/osgWrappers/osgDB/DynamicLibrary.cpp +++ b/src/osgWrappers/osgDB/DynamicLibrary.cpp @@ -20,9 +20,9 @@ #undef OUT #endif -TYPE_NAME_ALIAS(void *, osgDB::DynamicLibrary::HANDLE); +TYPE_NAME_ALIAS(void *, osgDB::DynamicLibrary::HANDLE) -TYPE_NAME_ALIAS(void *, osgDB::DynamicLibrary::PROC_ADDRESS); +TYPE_NAME_ALIAS(void *, osgDB::DynamicLibrary::PROC_ADDRESS) BEGIN_OBJECT_REFLECTOR(osgDB::DynamicLibrary) I_BaseType(osg::Referenced); diff --git a/src/osgWrappers/osgDB/FileUtils.cpp b/src/osgWrappers/osgDB/FileUtils.cpp index 3b5427093..2c3302b4c 100644 --- a/src/osgWrappers/osgDB/FileUtils.cpp +++ b/src/osgWrappers/osgDB/FileUtils.cpp @@ -20,7 +20,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< std::string >, osgDB::DirectoryContents); +TYPE_NAME_ALIAS(std::vector< std::string >, osgDB::DirectoryContents) BEGIN_ENUM_REFLECTOR(osgDB::CaseSensitivity) I_EnumLabel(osgDB::CASE_SENSITIVE); diff --git a/src/osgWrappers/osgDB/ReaderWriter.cpp b/src/osgWrappers/osgDB/ReaderWriter.cpp index dff94ba92..e3abf68e5 100644 --- a/src/osgWrappers/osgDB/ReaderWriter.cpp +++ b/src/osgWrappers/osgDB/ReaderWriter.cpp @@ -475,7 +475,7 @@ BEGIN_VALUE_REFLECTOR(osgDB::ReaderWriter::WriteResult) ""); END_REFLECTOR -TYPE_NAME_ALIAS(std::deque< std::string >, osgDB::FilePathList); +TYPE_NAME_ALIAS(std::deque< std::string >, osgDB::FilePathList) -STD_VECTOR_REFLECTOR(std::deque< std::string >); +STD_VECTOR_REFLECTOR(std::deque< std::string >) diff --git a/src/osgWrappers/osgFX/Registry.cpp b/src/osgWrappers/osgFX/Registry.cpp index aa4348925..55dddd721 100644 --- a/src/osgWrappers/osgFX/Registry.cpp +++ b/src/osgWrappers/osgFX/Registry.cpp @@ -21,7 +21,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::map< std::string COMMA osg::ref_ptr< const osgFX::Effect > >, osgFX::Registry::EffectMap); +TYPE_NAME_ALIAS(std::map< std::string COMMA osg::ref_ptr< const osgFX::Effect > >, osgFX::Registry::EffectMap) BEGIN_OBJECT_REFLECTOR(osgFX::Registry) I_BaseType(osg::Referenced); @@ -55,5 +55,5 @@ BEGIN_VALUE_REFLECTOR(osgFX::Registry::Proxy) ""); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< std::string COMMA osg::ref_ptr< const osgFX::Effect > >); +STD_MAP_REFLECTOR(std::map< std::string COMMA osg::ref_ptr< const osgFX::Effect > >) diff --git a/src/osgWrappers/osgGA/EventQueue.cpp b/src/osgWrappers/osgGA/EventQueue.cpp index 7e2a667a2..5752e02a8 100644 --- a/src/osgWrappers/osgGA/EventQueue.cpp +++ b/src/osgWrappers/osgGA/EventQueue.cpp @@ -22,7 +22,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgGA::GUIEventAdapter > >, osgGA::EventQueue::Events); +TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgGA::GUIEventAdapter > >, osgGA::EventQueue::Events) BEGIN_OBJECT_REFLECTOR(osgGA::EventQueue) I_BaseType(osg::Referenced); @@ -297,5 +297,5 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgGA::GUIEventAdapter >) 0); END_REFLECTOR -STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osgGA::GUIEventAdapter > >); +STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osgGA::GUIEventAdapter > >) diff --git a/src/osgWrappers/osgGA/EventVisitor.cpp b/src/osgWrappers/osgGA/EventVisitor.cpp index f556610f9..c914ef301 100644 --- a/src/osgWrappers/osgGA/EventVisitor.cpp +++ b/src/osgWrappers/osgGA/EventVisitor.cpp @@ -33,7 +33,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgGA::GUIEventAdapter > >, osgGA::EventVisitor::EventList); +TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgGA::GUIEventAdapter > >, osgGA::EventVisitor::EventList) BEGIN_OBJECT_REFLECTOR(osgGA::EventVisitor) I_BaseType(osg::NodeVisitor); diff --git a/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp b/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp index b36f68a6c..24b8409c9 100644 --- a/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp +++ b/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp @@ -28,9 +28,9 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::pair< std::string COMMA osg::ref_ptr< osgGA::MatrixManipulator > >, osgGA::KeySwitchMatrixManipulator::NamedManipulator); +TYPE_NAME_ALIAS(std::pair< std::string COMMA osg::ref_ptr< osgGA::MatrixManipulator > >, osgGA::KeySwitchMatrixManipulator::NamedManipulator) -TYPE_NAME_ALIAS(std::map< int COMMA osgGA::KeySwitchMatrixManipulator::NamedManipulator >, osgGA::KeySwitchMatrixManipulator::KeyManipMap); +TYPE_NAME_ALIAS(std::map< int COMMA osgGA::KeySwitchMatrixManipulator::NamedManipulator >, osgGA::KeySwitchMatrixManipulator::KeyManipMap) BEGIN_OBJECT_REFLECTOR(osgGA::KeySwitchMatrixManipulator) I_BaseType(osgGA::MatrixManipulator); @@ -269,7 +269,7 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgGA::MatrixManipulator >) 0); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< int COMMA osgGA::KeySwitchMatrixManipulator::NamedManipulator >); +STD_MAP_REFLECTOR(std::map< int COMMA osgGA::KeySwitchMatrixManipulator::NamedManipulator >) -STD_PAIR_REFLECTOR(std::pair< std::string COMMA osg::ref_ptr< osgGA::MatrixManipulator > >); +STD_PAIR_REFLECTOR(std::pair< std::string COMMA osg::ref_ptr< osgGA::MatrixManipulator > >) diff --git a/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp b/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp index 4b3c43a33..e7d4a28b9 100644 --- a/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp +++ b/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::observer_ptr< osg::Node > >, osgGA::NodeTrackerManipulator::ObserveredNodePath); +TYPE_NAME_ALIAS(std::vector< osg::observer_ptr< osg::Node > >, osgGA::NodeTrackerManipulator::ObserveredNodePath) BEGIN_ENUM_REFLECTOR(osgGA::NodeTrackerManipulator::TrackerMode) I_EnumLabel(osgGA::NodeTrackerManipulator::NODE_CENTER); diff --git a/src/osgWrappers/osgManipulator/Dragger.cpp b/src/osgWrappers/osgManipulator/Dragger.cpp index 5b85666c9..bca496463 100644 --- a/src/osgWrappers/osgManipulator/Dragger.cpp +++ b/src/osgWrappers/osgManipulator/Dragger.cpp @@ -28,7 +28,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgManipulator::Dragger > >, osgManipulator::CompositeDragger::DraggerList); +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgManipulator::Dragger > >, osgManipulator::CompositeDragger::DraggerList) BEGIN_OBJECT_REFLECTOR(osgManipulator::CompositeDragger) I_BaseType(osgManipulator::Dragger); @@ -174,9 +174,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Dragger) __void__setParentDragger__Dragger_P1); END_REFLECTOR -TYPE_NAME_ALIAS(std::pair< osg::NodePath COMMA osg::Vec3 >, osgManipulator::PointerInfo::NodePathIntersectionPair); +TYPE_NAME_ALIAS(std::pair< osg::NodePath COMMA osg::Vec3 >, osgManipulator::PointerInfo::NodePathIntersectionPair) -TYPE_NAME_ALIAS(std::list< osgManipulator::PointerInfo::NodePathIntersectionPair >, osgManipulator::PointerInfo::IntersectionList); +TYPE_NAME_ALIAS(std::list< osgManipulator::PointerInfo::NodePathIntersectionPair >, osgManipulator::PointerInfo::IntersectionList) BEGIN_VALUE_REFLECTOR(osgManipulator::PointerInfo) I_Constructor0(____PointerInfo, @@ -309,9 +309,9 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgManipulator::Dragger >) 0); END_REFLECTOR -STD_LIST_REFLECTOR(std::list< osgManipulator::PointerInfo::NodePathIntersectionPair >); +STD_LIST_REFLECTOR(std::list< osgManipulator::PointerInfo::NodePathIntersectionPair >) -STD_PAIR_REFLECTOR(std::pair< osg::NodePath COMMA osg::Vec3 >); +STD_PAIR_REFLECTOR(std::pair< osg::NodePath COMMA osg::Vec3 >) -STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgManipulator::Dragger > >); +STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgManipulator::Dragger > >) diff --git a/src/osgWrappers/osgParticle/PrecipitationEffect.cpp b/src/osgWrappers/osgParticle/PrecipitationEffect.cpp index cdcbe4d6b..3f35f9caf 100644 --- a/src/osgWrappers/osgParticle/PrecipitationEffect.cpp +++ b/src/osgWrappers/osgParticle/PrecipitationEffect.cpp @@ -298,7 +298,7 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::PrecipitationEffect) __void__setWind__C5_osg_Vec3_R1); END_REFLECTOR -TYPE_NAME_ALIAS(std::map< osgParticle::PrecipitationEffect::PrecipitationDrawable::Cell COMMA osgParticle::PrecipitationEffect::PrecipitationDrawable::DepthMatrixStartTime >, osgParticle::PrecipitationEffect::PrecipitationDrawable::CellMatrixMap); +TYPE_NAME_ALIAS(std::map< osgParticle::PrecipitationEffect::PrecipitationDrawable::Cell COMMA osgParticle::PrecipitationEffect::PrecipitationDrawable::DepthMatrixStartTime >, osgParticle::PrecipitationEffect::PrecipitationDrawable::CellMatrixMap) BEGIN_OBJECT_REFLECTOR(osgParticle::PrecipitationEffect::PrecipitationDrawable) I_BaseType(osg::Drawable); @@ -464,5 +464,5 @@ BEGIN_VALUE_REFLECTOR(osgParticle::PrecipitationEffect::PrecipitationDrawable::L ""); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< osgParticle::PrecipitationEffect::PrecipitationDrawable::Cell COMMA osgParticle::PrecipitationEffect::PrecipitationDrawable::DepthMatrixStartTime >); +STD_MAP_REFLECTOR(std::map< osgParticle::PrecipitationEffect::PrecipitationDrawable::Cell COMMA osgParticle::PrecipitationEffect::PrecipitationDrawable::DepthMatrixStartTime >) diff --git a/src/osgWrappers/osgParticle/range.cpp b/src/osgWrappers/osgParticle/range.cpp index 05ab4f276..48f6033bb 100644 --- a/src/osgWrappers/osgParticle/range.cpp +++ b/src/osgWrappers/osgParticle/range.cpp @@ -23,13 +23,13 @@ #undef OUT #endif -TYPE_NAME_ALIAS(osgParticle::range< float >, osgParticle::rangef); +TYPE_NAME_ALIAS(osgParticle::range< float >, osgParticle::rangef) -TYPE_NAME_ALIAS(osgParticle::range< osg::Vec2 >, osgParticle::rangev2); +TYPE_NAME_ALIAS(osgParticle::range< osg::Vec2 >, osgParticle::rangev2) -TYPE_NAME_ALIAS(osgParticle::range< osg::Vec3 >, osgParticle::rangev3); +TYPE_NAME_ALIAS(osgParticle::range< osg::Vec3 >, osgParticle::rangev3) -TYPE_NAME_ALIAS(osgParticle::range< osg::Vec4 >, osgParticle::rangev4); +TYPE_NAME_ALIAS(osgParticle::range< osg::Vec4 >, osgParticle::rangev4) BEGIN_VALUE_REFLECTOR(osgParticle::range< float >) I_Constructor0(____range, diff --git a/src/osgWrappers/osgShadow/OccluderGeometry.cpp b/src/osgWrappers/osgShadow/OccluderGeometry.cpp index def762fdb..f91853cfc 100644 --- a/src/osgWrappers/osgShadow/OccluderGeometry.cpp +++ b/src/osgWrappers/osgShadow/OccluderGeometry.cpp @@ -29,9 +29,9 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osgShadow::OccluderGeometry::Vec3List); +TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osgShadow::OccluderGeometry::Vec3List) -TYPE_NAME_ALIAS(std::vector< GLuint >, osgShadow::OccluderGeometry::UIntList); +TYPE_NAME_ALIAS(std::vector< GLuint >, osgShadow::OccluderGeometry::UIntList) BEGIN_OBJECT_REFLECTOR(osgShadow::OccluderGeometry) I_BaseType(osg::Drawable); @@ -161,9 +161,9 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::OccluderGeometry) __void__setBoundingPolytope__C5_osg_Polytope_R1); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osgShadow::ShadowVolumeGeometry::Vec3List); +TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osgShadow::ShadowVolumeGeometry::Vec3List) -TYPE_NAME_ALIAS(std::vector< GLuint >, osgShadow::ShadowVolumeGeometry::UIntList); +TYPE_NAME_ALIAS(std::vector< GLuint >, osgShadow::ShadowVolumeGeometry::UIntList) BEGIN_ENUM_REFLECTOR(osgShadow::ShadowVolumeGeometry::DrawMode) I_EnumLabel(osgShadow::ShadowVolumeGeometry::GEOMETRY); @@ -266,5 +266,5 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::ShadowVolumeGeometry) __void__setVertices__C5_Vec3List_R1); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< GLuint >); +STD_VECTOR_REFLECTOR(std::vector< GLuint >) diff --git a/src/osgWrappers/osgSim/ColorRange.cpp b/src/osgWrappers/osgSim/ColorRange.cpp index 41af08c0a..0d0d156ce 100644 --- a/src/osgWrappers/osgSim/ColorRange.cpp +++ b/src/osgWrappers/osgSim/ColorRange.cpp @@ -46,5 +46,5 @@ BEGIN_OBJECT_REFLECTOR(osgSim::ColorRange) __void__setColors__C5_std_vectorT1_osg_Vec4__R1); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osg::Vec4 >); +STD_VECTOR_REFLECTOR(std::vector< osg::Vec4 >) diff --git a/src/osgWrappers/osgSim/ElevationSlice.cpp b/src/osgWrappers/osgSim/ElevationSlice.cpp index 44d0dac69..87e5249ef 100644 --- a/src/osgWrappers/osgSim/ElevationSlice.cpp +++ b/src/osgWrappers/osgSim/ElevationSlice.cpp @@ -23,11 +23,11 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::Vec3d >, osgSim::ElevationSlice::Vec3dList); +TYPE_NAME_ALIAS(std::vector< osg::Vec3d >, osgSim::ElevationSlice::Vec3dList) -TYPE_NAME_ALIAS(std::pair< double COMMA double >, osgSim::ElevationSlice::DistanceHeight); +TYPE_NAME_ALIAS(std::pair< double COMMA double >, osgSim::ElevationSlice::DistanceHeight) -TYPE_NAME_ALIAS(std::vector< osgSim::ElevationSlice::DistanceHeight >, osgSim::ElevationSlice::DistanceHeightList); +TYPE_NAME_ALIAS(std::vector< osgSim::ElevationSlice::DistanceHeight >, osgSim::ElevationSlice::DistanceHeightList) BEGIN_VALUE_REFLECTOR(osgSim::ElevationSlice) I_Constructor0(____ElevationSlice, @@ -104,9 +104,9 @@ BEGIN_VALUE_REFLECTOR(osgSim::ElevationSlice) __void__setStartPoint__C5_osg_Vec3d_R1); END_REFLECTOR -STD_PAIR_REFLECTOR(std::pair< double COMMA double >); +STD_PAIR_REFLECTOR(std::pair< double COMMA double >) -STD_VECTOR_REFLECTOR(std::vector< osg::Vec3d >); +STD_VECTOR_REFLECTOR(std::vector< osg::Vec3d >) -STD_VECTOR_REFLECTOR(std::vector< osgSim::ElevationSlice::DistanceHeight >); +STD_VECTOR_REFLECTOR(std::vector< osgSim::ElevationSlice::DistanceHeight >) diff --git a/src/osgWrappers/osgSim/Impostor.cpp b/src/osgWrappers/osgSim/Impostor.cpp index 207066367..e2e4a1874 100644 --- a/src/osgWrappers/osgSim/Impostor.cpp +++ b/src/osgWrappers/osgSim/Impostor.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgSim::ImpostorSprite > >, osgSim::Impostor::ImpostorSpriteList); +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgSim::ImpostorSprite > >, osgSim::Impostor::ImpostorSpriteList) BEGIN_OBJECT_REFLECTOR(osgSim::Impostor) I_BaseType(osg::LOD); @@ -165,5 +165,5 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgSim::ImpostorSprite >) 0); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgSim::ImpostorSprite > >); +STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgSim::ImpostorSprite > >) diff --git a/src/osgWrappers/osgSim/LightPointNode.cpp b/src/osgWrappers/osgSim/LightPointNode.cpp index d9bfb43f6..c1ecc2ebb 100644 --- a/src/osgWrappers/osgSim/LightPointNode.cpp +++ b/src/osgWrappers/osgSim/LightPointNode.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osgSim::LightPoint >, osgSim::LightPointNode::LightPointList); +TYPE_NAME_ALIAS(std::vector< osgSim::LightPoint >, osgSim::LightPointNode::LightPointList) BEGIN_OBJECT_REFLECTOR(osgSim::LightPointNode) I_BaseType(osg::Node); @@ -194,5 +194,5 @@ BEGIN_OBJECT_REFLECTOR(osgSim::LightPointNode) __void__setPointSprite__bool); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osgSim::LightPoint >); +STD_VECTOR_REFLECTOR(std::vector< osgSim::LightPoint >) diff --git a/src/osgWrappers/osgSim/LineOfSight.cpp b/src/osgWrappers/osgSim/LineOfSight.cpp index dfbf20606..5f37f646b 100644 --- a/src/osgWrappers/osgSim/LineOfSight.cpp +++ b/src/osgWrappers/osgSim/LineOfSight.cpp @@ -57,7 +57,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::DatabaseCacheReadCallback) __void__setMaximumNumOfFilesToCache__unsigned_int); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::Vec3d >, osgSim::LineOfSight::Intersections); +TYPE_NAME_ALIAS(std::vector< osg::Vec3d >, osgSim::LineOfSight::Intersections) BEGIN_VALUE_REFLECTOR(osgSim::LineOfSight) I_Constructor0(____LineOfSight, diff --git a/src/osgWrappers/osgSim/MultiSwitch.cpp b/src/osgWrappers/osgSim/MultiSwitch.cpp index 09d4f6702..b97ecdc23 100644 --- a/src/osgWrappers/osgSim/MultiSwitch.cpp +++ b/src/osgWrappers/osgSim/MultiSwitch.cpp @@ -24,9 +24,9 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< bool >, osgSim::MultiSwitch::ValueList); +TYPE_NAME_ALIAS(std::vector< bool >, osgSim::MultiSwitch::ValueList) -TYPE_NAME_ALIAS(std::vector< osgSim::MultiSwitch::ValueList >, osgSim::MultiSwitch::SwitchSetList); +TYPE_NAME_ALIAS(std::vector< osgSim::MultiSwitch::ValueList >, osgSim::MultiSwitch::SwitchSetList) BEGIN_OBJECT_REFLECTOR(osgSim::MultiSwitch) I_BaseType(osg::Group); @@ -197,5 +197,5 @@ BEGIN_OBJECT_REFLECTOR(osgSim::MultiSwitch) 0); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osgSim::MultiSwitch::ValueList >); +STD_VECTOR_REFLECTOR(std::vector< osgSim::MultiSwitch::ValueList >) diff --git a/src/osgWrappers/osgSim/SphereSegment.cpp b/src/osgWrappers/osgSim/SphereSegment.cpp index 723fb15fc..d3814002b 100644 --- a/src/osgWrappers/osgSim/SphereSegment.cpp +++ b/src/osgWrappers/osgSim/SphereSegment.cpp @@ -29,7 +29,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Vec3Array > >, osgSim::SphereSegment::LineList); +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Vec3Array > >, osgSim::SphereSegment::LineList) BEGIN_ENUM_REFLECTOR(osgSim::SphereSegment::DrawMask) I_EnumLabel(osgSim::SphereSegment::SURFACE); @@ -279,5 +279,5 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Vec3Array >) 0); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::Vec3Array > >); +STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::Vec3Array > >) diff --git a/src/osgWrappers/osgText/String.cpp b/src/osgWrappers/osgText/String.cpp index d611c2b3f..773d35899 100644 --- a/src/osgWrappers/osgText/String.cpp +++ b/src/osgWrappers/osgText/String.cpp @@ -20,7 +20,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(osgText::VectorUInt, osgText::String::vector_type); +TYPE_NAME_ALIAS(osgText::VectorUInt, osgText::String::vector_type) BEGIN_ENUM_REFLECTOR(osgText::String::Encoding) I_EnumLabel(osgText::String::ENCODING_UNDEFINED); diff --git a/src/osgWrappers/osgText/Text.cpp b/src/osgWrappers/osgText/Text.cpp index 53ac28cf0..5fba370ef 100644 --- a/src/osgWrappers/osgText/Text.cpp +++ b/src/osgWrappers/osgText/Text.cpp @@ -32,7 +32,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::map< osg::ref_ptr< osgText::Font::GlyphTexture > COMMA osgText::Text::GlyphQuads >, osgText::Text::TextureGlyphQuadMap); +TYPE_NAME_ALIAS(std::map< osg::ref_ptr< osgText::Font::GlyphTexture > COMMA osgText::Text::GlyphQuads >, osgText::Text::TextureGlyphQuadMap) BEGIN_ENUM_REFLECTOR(osgText::Text::CharacterSizeMode) I_EnumLabel(osgText::Text::OBJECT_COORDS); @@ -729,17 +729,17 @@ BEGIN_OBJECT_REFLECTOR(osgText::Text) __void__setThreadSafeRefUnref__bool); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osgText::Font::Glyph * >, osgText::Text::GlyphQuads::Glyphs); +TYPE_NAME_ALIAS(std::vector< osgText::Font::Glyph * >, osgText::Text::GlyphQuads::Glyphs) -TYPE_NAME_ALIAS(std::vector< unsigned int >, osgText::Text::GlyphQuads::LineNumbers); +TYPE_NAME_ALIAS(std::vector< unsigned int >, osgText::Text::GlyphQuads::LineNumbers) -TYPE_NAME_ALIAS(std::vector< osg::Vec2 >, osgText::Text::GlyphQuads::Coords2); +TYPE_NAME_ALIAS(std::vector< osg::Vec2 >, osgText::Text::GlyphQuads::Coords2) -TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osgText::Text::GlyphQuads::Coords3); +TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osgText::Text::GlyphQuads::Coords3) -TYPE_NAME_ALIAS(std::vector< osg::Vec2 >, osgText::Text::GlyphQuads::TexCoords); +TYPE_NAME_ALIAS(std::vector< osg::Vec2 >, osgText::Text::GlyphQuads::TexCoords) -TYPE_NAME_ALIAS(std::vector< osg::Vec4 >, osgText::Text::GlyphQuads::ColorCoords); +TYPE_NAME_ALIAS(std::vector< osg::Vec4 >, osgText::Text::GlyphQuads::ColorCoords) BEGIN_VALUE_REFLECTOR(osgText::Text::GlyphQuads) I_Constructor0(____GlyphQuads, @@ -854,9 +854,9 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgText::Font::GlyphTexture >) 0); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< osg::ref_ptr< osgText::Font::GlyphTexture > COMMA osgText::Text::GlyphQuads >); +STD_MAP_REFLECTOR(std::map< osg::ref_ptr< osgText::Font::GlyphTexture > COMMA osgText::Text::GlyphQuads >) -STD_VECTOR_REFLECTOR(std::vector< osg::Vec2 >); +STD_VECTOR_REFLECTOR(std::vector< osg::Vec2 >) -STD_VECTOR_REFLECTOR(std::vector< osgText::Font::Glyph * >); +STD_VECTOR_REFLECTOR(std::vector< osgText::Font::Glyph * >) diff --git a/src/osgWrappers/osgUtil/CullVisitor.cpp b/src/osgWrappers/osgUtil/CullVisitor.cpp index 0e7ffdf26..d09d146d5 100644 --- a/src/osgWrappers/osgUtil/CullVisitor.cpp +++ b/src/osgWrappers/osgUtil/CullVisitor.cpp @@ -48,7 +48,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(osg::Matrix::value_type, osgUtil::CullVisitor::value_type); +TYPE_NAME_ALIAS(osg::Matrix::value_type, osgUtil::CullVisitor::value_type) BEGIN_OBJECT_REFLECTOR(osgUtil::CullVisitor) I_BaseType(osg::NodeVisitor); diff --git a/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp b/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp index 0049c6b1f..1181f0bae 100644 --- a/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp +++ b/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp @@ -89,7 +89,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::DelaunayConstraint) 0); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgUtil::DelaunayConstraint > >, osgUtil::DelaunayTriangulator::linelist); +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgUtil::DelaunayConstraint > >, osgUtil::DelaunayTriangulator::linelist) BEGIN_OBJECT_REFLECTOR(osgUtil::DelaunayTriangulator) I_BaseType(osg::Referenced); @@ -215,5 +215,5 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::DelaunayConstraint >) 0); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgUtil::DelaunayConstraint > >); +STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgUtil::DelaunayConstraint > >) diff --git a/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp b/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp index ea49e5e80..f7ff3e9ca 100644 --- a/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp +++ b/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(unsigned int, osgUtil::GLObjectsVisitor::Mode); +TYPE_NAME_ALIAS(unsigned int, osgUtil::GLObjectsVisitor::Mode) BEGIN_ENUM_REFLECTOR(osgUtil::GLObjectsVisitor::ModeValues) I_EnumLabel(osgUtil::GLObjectsVisitor::SWITCH_ON_DISPLAY_LISTS); diff --git a/src/osgWrappers/osgUtil/IntersectVisitor.cpp b/src/osgWrappers/osgUtil/IntersectVisitor.cpp index 3c7f664cc..328c08fe2 100644 --- a/src/osgWrappers/osgUtil/IntersectVisitor.cpp +++ b/src/osgWrappers/osgUtil/IntersectVisitor.cpp @@ -35,7 +35,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< int >, osgUtil::Hit::VecIndexList); +TYPE_NAME_ALIAS(std::vector< int >, osgUtil::Hit::VecIndexList) BEGIN_VALUE_REFLECTOR(osgUtil::Hit) I_Constructor0(____Hit, @@ -187,9 +187,9 @@ BEGIN_VALUE_REFLECTOR(osgUtil::Hit) I_PublicMemberProperty(osg::Vec3, _intersectNormal); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osgUtil::Hit >, osgUtil::IntersectVisitor::HitList); +TYPE_NAME_ALIAS(std::vector< osgUtil::Hit >, osgUtil::IntersectVisitor::HitList) -TYPE_NAME_ALIAS(std::map< const osg::LineSegment * COMMA osgUtil::IntersectVisitor::HitList >, osgUtil::IntersectVisitor::LineSegmentHitListMap); +TYPE_NAME_ALIAS(std::map< const osg::LineSegment * COMMA osgUtil::IntersectVisitor::HitList >, osgUtil::IntersectVisitor::LineSegmentHitListMap) BEGIN_ENUM_REFLECTOR(osgUtil::IntersectVisitor::LODSelectionMode) I_EnumLabel(osgUtil::IntersectVisitor::USE_HIGHEST_LEVEL_OF_DETAIL); @@ -355,9 +355,9 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::PickVisitor) ""); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< const osg::LineSegment * COMMA osgUtil::IntersectVisitor::HitList >); +STD_MAP_REFLECTOR(std::map< const osg::LineSegment * COMMA osgUtil::IntersectVisitor::HitList >) -STD_VECTOR_REFLECTOR(std::vector< int >); +STD_VECTOR_REFLECTOR(std::vector< int >) -STD_VECTOR_REFLECTOR(std::vector< osgUtil::Hit >); +STD_VECTOR_REFLECTOR(std::vector< osgUtil::Hit >) diff --git a/src/osgWrappers/osgUtil/IntersectionVisitor.cpp b/src/osgWrappers/osgUtil/IntersectionVisitor.cpp index e8921f350..cb8fa213f 100644 --- a/src/osgWrappers/osgUtil/IntersectionVisitor.cpp +++ b/src/osgWrappers/osgUtil/IntersectionVisitor.cpp @@ -319,7 +319,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Intersector) __void__setCoordinateFrame__CoordinateFrame); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgUtil::Intersector > >, osgUtil::IntersectorGroup::Intersectors); +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgUtil::Intersector > >, osgUtil::IntersectorGroup::Intersectors) BEGIN_OBJECT_REFLECTOR(osgUtil::IntersectorGroup) I_BaseType(osgUtil::Intersector); @@ -415,5 +415,5 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::Intersector >) 0); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgUtil::Intersector > >); +STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgUtil::Intersector > >) diff --git a/src/osgWrappers/osgUtil/LineSegmentIntersector.cpp b/src/osgWrappers/osgUtil/LineSegmentIntersector.cpp index 9fd973044..25827dc13 100644 --- a/src/osgWrappers/osgUtil/LineSegmentIntersector.cpp +++ b/src/osgWrappers/osgUtil/LineSegmentIntersector.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::multiset< osgUtil::LineSegmentIntersector::Intersection >, osgUtil::LineSegmentIntersector::Intersections); +TYPE_NAME_ALIAS(std::multiset< osgUtil::LineSegmentIntersector::Intersection >, osgUtil::LineSegmentIntersector::Intersections) BEGIN_OBJECT_REFLECTOR(osgUtil::LineSegmentIntersector) I_BaseType(osgUtil::Intersector); @@ -106,9 +106,9 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::LineSegmentIntersector) 0); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< unsigned int >, osgUtil::LineSegmentIntersector::Intersection::IndexList); +TYPE_NAME_ALIAS(std::vector< unsigned int >, osgUtil::LineSegmentIntersector::Intersection::IndexList) -TYPE_NAME_ALIAS(std::vector< double >, osgUtil::LineSegmentIntersector::Intersection::RatioList); +TYPE_NAME_ALIAS(std::vector< double >, osgUtil::LineSegmentIntersector::Intersection::RatioList) BEGIN_VALUE_REFLECTOR(osgUtil::LineSegmentIntersector::Intersection) I_Constructor0(____Intersection, @@ -157,7 +157,7 @@ BEGIN_VALUE_REFLECTOR(osgUtil::LineSegmentIntersector::Intersection) I_PublicMemberProperty(unsigned int, primitiveIndex); END_REFLECTOR -STD_SET_REFLECTOR(std::multiset< osgUtil::LineSegmentIntersector::Intersection >); +STD_SET_REFLECTOR(std::multiset< osgUtil::LineSegmentIntersector::Intersection >) -STD_VECTOR_REFLECTOR(std::vector< double >); +STD_VECTOR_REFLECTOR(std::vector< double >) diff --git a/src/osgWrappers/osgUtil/Optimizer.cpp b/src/osgWrappers/osgUtil/Optimizer.cpp index 840cd5870..5b6437149 100644 --- a/src/osgWrappers/osgUtil/Optimizer.cpp +++ b/src/osgWrappers/osgUtil/Optimizer.cpp @@ -200,7 +200,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::CheckGeometryVisitor) ""); END_REFLECTOR -TYPE_NAME_ALIAS(std::set< osg::Group * >, osgUtil::Optimizer::CombineLODsVisitor::GroupList); +TYPE_NAME_ALIAS(std::set< osg::Group * >, osgUtil::Optimizer::CombineLODsVisitor::GroupList) BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::CombineLODsVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); @@ -241,7 +241,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::CombineStaticTransformsVisitor) ""); END_REFLECTOR -TYPE_NAME_ALIAS(std::set< osg::Node * >, osgUtil::Optimizer::CopySharedSubgraphsVisitor::SharedNodeList); +TYPE_NAME_ALIAS(std::set< osg::Node * >, osgUtil::Optimizer::CopySharedSubgraphsVisitor::SharedNodeList) BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::CopySharedSubgraphsVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); @@ -263,9 +263,9 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::CopySharedSubgraphsVisitor) I_PublicMemberProperty(osgUtil::Optimizer::CopySharedSubgraphsVisitor::SharedNodeList, _sharedNodeList); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::NodePath >, osgUtil::Optimizer::FlattenBillboardVisitor::NodePathList); +TYPE_NAME_ALIAS(std::vector< osg::NodePath >, osgUtil::Optimizer::FlattenBillboardVisitor::NodePathList) -TYPE_NAME_ALIAS(std::map< osg::Billboard * COMMA osgUtil::Optimizer::FlattenBillboardVisitor::NodePathList >, osgUtil::Optimizer::FlattenBillboardVisitor::BillboardNodePathMap); +TYPE_NAME_ALIAS(std::map< osg::Billboard * COMMA osgUtil::Optimizer::FlattenBillboardVisitor::NodePathList >, osgUtil::Optimizer::FlattenBillboardVisitor::BillboardNodePathMap) BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::FlattenBillboardVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); @@ -453,7 +453,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::MergeGeometryVisitor) __void__setTargetMaximumNumberOfVertices__unsigned_int); END_REFLECTOR -TYPE_NAME_ALIAS(std::set< osg::Node * >, osgUtil::Optimizer::RemoveEmptyNodesVisitor::NodeList); +TYPE_NAME_ALIAS(std::set< osg::Node * >, osgUtil::Optimizer::RemoveEmptyNodesVisitor::NodeList) BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::RemoveEmptyNodesVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); @@ -480,7 +480,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::RemoveEmptyNodesVisitor) I_PublicMemberProperty(osgUtil::Optimizer::RemoveEmptyNodesVisitor::NodeList, _redundantNodeList); END_REFLECTOR -TYPE_NAME_ALIAS(std::set< osg::Node * >, osgUtil::Optimizer::RemoveLoadedProxyNodesVisitor::NodeList); +TYPE_NAME_ALIAS(std::set< osg::Node * >, osgUtil::Optimizer::RemoveLoadedProxyNodesVisitor::NodeList) BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::RemoveLoadedProxyNodesVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); @@ -502,7 +502,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::RemoveLoadedProxyNodesVisitor) I_PublicMemberProperty(osgUtil::Optimizer::RemoveLoadedProxyNodesVisitor::NodeList, _redundantNodeList); END_REFLECTOR -TYPE_NAME_ALIAS(std::set< osg::Node * >, osgUtil::Optimizer::RemoveRedundantNodesVisitor::NodeList); +TYPE_NAME_ALIAS(std::set< osg::Node * >, osgUtil::Optimizer::RemoveRedundantNodesVisitor::NodeList) BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::RemoveRedundantNodesVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); @@ -534,7 +534,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::RemoveRedundantNodesVisitor) I_PublicMemberProperty(osgUtil::Optimizer::RemoveRedundantNodesVisitor::NodeList, _redundantNodeList); END_REFLECTOR -TYPE_NAME_ALIAS(std::set< osg::Group * >, osgUtil::Optimizer::SpatializeGroupsVisitor::GroupsToDivideList); +TYPE_NAME_ALIAS(std::set< osg::Group * >, osgUtil::Optimizer::SpatializeGroupsVisitor::GroupsToDivideList) BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::SpatializeGroupsVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); @@ -627,7 +627,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::StaticObjectDetectionVisitor) ""); END_REFLECTOR -TYPE_NAME_ALIAS(std::set< osg::Group * >, osgUtil::Optimizer::TessellateVisitor::GroupList); +TYPE_NAME_ALIAS(std::set< osg::Group * >, osgUtil::Optimizer::TessellateVisitor::GroupList) BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::TessellateVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); @@ -849,9 +849,9 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::TextureVisitor) I_PublicMemberProperty(float, _valueAnisotropy); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< osg::Billboard * COMMA osgUtil::Optimizer::FlattenBillboardVisitor::NodePathList >); +STD_MAP_REFLECTOR(std::map< osg::Billboard * COMMA osgUtil::Optimizer::FlattenBillboardVisitor::NodePathList >) -STD_SET_REFLECTOR(std::set< osg::Group * >); +STD_SET_REFLECTOR(std::set< osg::Group * >) -STD_SET_REFLECTOR(std::set< osg::Node * >); +STD_SET_REFLECTOR(std::set< osg::Node * >) diff --git a/src/osgWrappers/osgUtil/PlaneIntersector.cpp b/src/osgWrappers/osgUtil/PlaneIntersector.cpp index 7d13d8e13..380123bf0 100644 --- a/src/osgWrappers/osgUtil/PlaneIntersector.cpp +++ b/src/osgWrappers/osgUtil/PlaneIntersector.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osgUtil::PlaneIntersector::Intersection >, osgUtil::PlaneIntersector::Intersections); +TYPE_NAME_ALIAS(std::vector< osgUtil::PlaneIntersector::Intersection >, osgUtil::PlaneIntersector::Intersections) BEGIN_OBJECT_REFLECTOR(osgUtil::PlaneIntersector) I_BaseType(osgUtil::Intersector); @@ -109,9 +109,9 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::PlaneIntersector) __void__setRecordHeightsAsAttributes__bool); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::Vec3d >, osgUtil::PlaneIntersector::Intersection::Polyline); +TYPE_NAME_ALIAS(std::vector< osg::Vec3d >, osgUtil::PlaneIntersector::Intersection::Polyline) -TYPE_NAME_ALIAS(std::vector< double >, osgUtil::PlaneIntersector::Intersection::Attributes); +TYPE_NAME_ALIAS(std::vector< double >, osgUtil::PlaneIntersector::Intersection::Attributes) BEGIN_VALUE_REFLECTOR(osgUtil::PlaneIntersector::Intersection) I_Constructor0(____Intersection, @@ -124,5 +124,5 @@ BEGIN_VALUE_REFLECTOR(osgUtil::PlaneIntersector::Intersection) I_PublicMemberProperty(osgUtil::PlaneIntersector::Intersection::Attributes, attributes); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osgUtil::PlaneIntersector::Intersection >); +STD_VECTOR_REFLECTOR(std::vector< osgUtil::PlaneIntersector::Intersection >) diff --git a/src/osgWrappers/osgUtil/PolytopeIntersector.cpp b/src/osgWrappers/osgUtil/PolytopeIntersector.cpp index 827ecda42..cc58bf30b 100644 --- a/src/osgWrappers/osgUtil/PolytopeIntersector.cpp +++ b/src/osgWrappers/osgUtil/PolytopeIntersector.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::set< osgUtil::PolytopeIntersector::Intersection >, osgUtil::PolytopeIntersector::Intersections); +TYPE_NAME_ALIAS(std::set< osgUtil::PolytopeIntersector::Intersection >, osgUtil::PolytopeIntersector::Intersections) BEGIN_OBJECT_REFLECTOR(osgUtil::PolytopeIntersector) I_BaseType(osgUtil::Intersector); @@ -102,5 +102,5 @@ BEGIN_VALUE_REFLECTOR(osgUtil::PolytopeIntersector::Intersection) I_PublicMemberProperty(osg::ref_ptr< osg::Drawable >, drawable); END_REFLECTOR -STD_SET_REFLECTOR(std::set< osgUtil::PolytopeIntersector::Intersection >); +STD_SET_REFLECTOR(std::set< osgUtil::PolytopeIntersector::Intersection >) diff --git a/src/osgWrappers/osgUtil/PositionalStateContainer.cpp b/src/osgWrappers/osgUtil/PositionalStateContainer.cpp index 09afee61a..b4d50dde7 100644 --- a/src/osgWrappers/osgUtil/PositionalStateContainer.cpp +++ b/src/osgWrappers/osgUtil/PositionalStateContainer.cpp @@ -26,11 +26,11 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::pair< osg::ref_ptr< const osg::StateAttribute > COMMA osg::ref_ptr< osg::RefMatrix > >, osgUtil::PositionalStateContainer::AttrMatrixPair); +TYPE_NAME_ALIAS(std::pair< osg::ref_ptr< const osg::StateAttribute > COMMA osg::ref_ptr< osg::RefMatrix > >, osgUtil::PositionalStateContainer::AttrMatrixPair) -TYPE_NAME_ALIAS(std::vector< osgUtil::PositionalStateContainer::AttrMatrixPair >, osgUtil::PositionalStateContainer::AttrMatrixList); +TYPE_NAME_ALIAS(std::vector< osgUtil::PositionalStateContainer::AttrMatrixPair >, osgUtil::PositionalStateContainer::AttrMatrixList) -TYPE_NAME_ALIAS(std::map< unsigned int COMMA osgUtil::PositionalStateContainer::AttrMatrixList >, osgUtil::PositionalStateContainer::TexUnitAttrMatrixListMap); +TYPE_NAME_ALIAS(std::map< unsigned int COMMA osgUtil::PositionalStateContainer::AttrMatrixList >, osgUtil::PositionalStateContainer::TexUnitAttrMatrixListMap) BEGIN_OBJECT_REFLECTOR(osgUtil::PositionalStateContainer) I_BaseType(osg::Object); @@ -141,9 +141,9 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::RefMatrix >) 0); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< unsigned int COMMA osgUtil::PositionalStateContainer::AttrMatrixList >); +STD_MAP_REFLECTOR(std::map< unsigned int COMMA osgUtil::PositionalStateContainer::AttrMatrixList >) -STD_PAIR_REFLECTOR(std::pair< osg::ref_ptr< const osg::StateAttribute > COMMA osg::ref_ptr< osg::RefMatrix > >); +STD_PAIR_REFLECTOR(std::pair< osg::ref_ptr< const osg::StateAttribute > COMMA osg::ref_ptr< osg::RefMatrix > >) -STD_VECTOR_REFLECTOR(std::vector< osgUtil::PositionalStateContainer::AttrMatrixPair >); +STD_VECTOR_REFLECTOR(std::vector< osgUtil::PositionalStateContainer::AttrMatrixPair >) diff --git a/src/osgWrappers/osgUtil/RenderBin.cpp b/src/osgWrappers/osgUtil/RenderBin.cpp index 82c55d97a..64b1d62cb 100644 --- a/src/osgWrappers/osgUtil/RenderBin.cpp +++ b/src/osgWrappers/osgUtil/RenderBin.cpp @@ -35,11 +35,11 @@ BEGIN_VALUE_REFLECTOR(osgUtil::RegisterRenderBinProxy) ""); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osgUtil::RenderLeaf * >, osgUtil::RenderBin::RenderLeafList); +TYPE_NAME_ALIAS(std::vector< osgUtil::RenderLeaf * >, osgUtil::RenderBin::RenderLeafList) -TYPE_NAME_ALIAS(std::vector< osgUtil::StateGraph * >, osgUtil::RenderBin::StateGraphList); +TYPE_NAME_ALIAS(std::vector< osgUtil::StateGraph * >, osgUtil::RenderBin::StateGraphList) -TYPE_NAME_ALIAS(std::map< int COMMA osg::ref_ptr< osgUtil::RenderBin > >, osgUtil::RenderBin::RenderBinList); +TYPE_NAME_ALIAS(std::map< int COMMA osg::ref_ptr< osgUtil::RenderBin > >, osgUtil::RenderBin::RenderBinList) BEGIN_ENUM_REFLECTOR(osgUtil::RenderBin::SortMode) I_EnumLabel(osgUtil::RenderBin::SORT_BY_STATE); @@ -386,9 +386,9 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::RenderBin >) 0); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< int COMMA osg::ref_ptr< osgUtil::RenderBin > >); +STD_MAP_REFLECTOR(std::map< int COMMA osg::ref_ptr< osgUtil::RenderBin > >) -STD_VECTOR_REFLECTOR(std::vector< osgUtil::RenderLeaf * >); +STD_VECTOR_REFLECTOR(std::vector< osgUtil::RenderLeaf * >) -STD_VECTOR_REFLECTOR(std::vector< osgUtil::StateGraph * >); +STD_VECTOR_REFLECTOR(std::vector< osgUtil::StateGraph * >) diff --git a/src/osgWrappers/osgUtil/SceneView.cpp b/src/osgWrappers/osgUtil/SceneView.cpp index 76aa03424..8f3423da0 100644 --- a/src/osgWrappers/osgUtil/SceneView.cpp +++ b/src/osgWrappers/osgUtil/SceneView.cpp @@ -42,7 +42,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(osgUtil::SceneView::Options, osgUtil::SceneView::LightingMode); +TYPE_NAME_ALIAS(osgUtil::SceneView::Options, osgUtil::SceneView::LightingMode) BEGIN_ENUM_REFLECTOR(osgUtil::SceneView::Options) I_EnumLabel(osgUtil::SceneView::NO_SCENEVIEW_LIGHT); diff --git a/src/osgWrappers/osgUtil/Simplifier.cpp b/src/osgWrappers/osgUtil/Simplifier.cpp index 7fe58a1a1..db16b507f 100644 --- a/src/osgWrappers/osgUtil/Simplifier.cpp +++ b/src/osgWrappers/osgUtil/Simplifier.cpp @@ -22,7 +22,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< unsigned int >, osgUtil::Simplifier::IndexList); +TYPE_NAME_ALIAS(std::vector< unsigned int >, osgUtil::Simplifier::IndexList) BEGIN_OBJECT_REFLECTOR(osgUtil::Simplifier) I_BaseType(osg::NodeVisitor); diff --git a/src/osgWrappers/osgUtil/StateGraph.cpp b/src/osgWrappers/osgUtil/StateGraph.cpp index a73e81e7f..8c12b9a76 100644 --- a/src/osgWrappers/osgUtil/StateGraph.cpp +++ b/src/osgWrappers/osgUtil/StateGraph.cpp @@ -30,9 +30,9 @@ BEGIN_VALUE_REFLECTOR(osgUtil::LessDepthSortFunctor) ""); END_REFLECTOR -TYPE_NAME_ALIAS(std::map< const osg::StateSet * COMMA osg::ref_ptr< osgUtil::StateGraph > >, osgUtil::StateGraph::ChildList); +TYPE_NAME_ALIAS(std::map< const osg::StateSet * COMMA osg::ref_ptr< osgUtil::StateGraph > >, osgUtil::StateGraph::ChildList) -TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgUtil::RenderLeaf > >, osgUtil::StateGraph::LeafList); +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgUtil::RenderLeaf > >, osgUtil::StateGraph::LeafList) BEGIN_OBJECT_REFLECTOR(osgUtil::StateGraph) I_BaseType(osg::Referenced); @@ -218,7 +218,7 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::StateGraph >) 0); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< const osg::StateSet * COMMA osg::ref_ptr< osgUtil::StateGraph > >); +STD_MAP_REFLECTOR(std::map< const osg::StateSet * COMMA osg::ref_ptr< osgUtil::StateGraph > >) -STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgUtil::RenderLeaf > >); +STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgUtil::RenderLeaf > >) diff --git a/src/osgWrappers/osgUtil/Statistics.cpp b/src/osgWrappers/osgUtil/Statistics.cpp index 3d19df5c9..29fab7595 100644 --- a/src/osgWrappers/osgUtil/Statistics.cpp +++ b/src/osgWrappers/osgUtil/Statistics.cpp @@ -30,11 +30,11 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::pair< unsigned int COMMA unsigned int >, osgUtil::Statistics::PrimitivePair); +TYPE_NAME_ALIAS(std::pair< unsigned int COMMA unsigned int >, osgUtil::Statistics::PrimitivePair) -TYPE_NAME_ALIAS(std::map< GLenum COMMA osgUtil::Statistics::PrimitivePair >, osgUtil::Statistics::PrimitiveValueMap); +TYPE_NAME_ALIAS(std::map< GLenum COMMA osgUtil::Statistics::PrimitivePair >, osgUtil::Statistics::PrimitiveValueMap) -TYPE_NAME_ALIAS(std::map< GLenum COMMA unsigned int >, osgUtil::Statistics::PrimitiveCountMap); +TYPE_NAME_ALIAS(std::map< GLenum COMMA unsigned int >, osgUtil::Statistics::PrimitiveCountMap) BEGIN_ENUM_REFLECTOR(osgUtil::Statistics::StatsType) I_EnumLabel(osgUtil::Statistics::STAT_NONE); @@ -222,11 +222,11 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Statistics) I_PublicMemberProperty(GLenum, _currentPrimitiveFunctorMode); END_REFLECTOR -TYPE_NAME_ALIAS(std::set< osg::Node * >, osgUtil::StatsVisitor::NodeSet); +TYPE_NAME_ALIAS(std::set< osg::Node * >, osgUtil::StatsVisitor::NodeSet) -TYPE_NAME_ALIAS(std::set< osg::Drawable * >, osgUtil::StatsVisitor::DrawableSet); +TYPE_NAME_ALIAS(std::set< osg::Drawable * >, osgUtil::StatsVisitor::DrawableSet) -TYPE_NAME_ALIAS(std::set< osg::StateSet * >, osgUtil::StatsVisitor::StateSetSet); +TYPE_NAME_ALIAS(std::set< osg::StateSet * >, osgUtil::StatsVisitor::StateSetSet) BEGIN_OBJECT_REFLECTOR(osgUtil::StatsVisitor) I_BaseType(osg::NodeVisitor); @@ -303,13 +303,13 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::StatsVisitor) I_PublicMemberProperty(osgUtil::Statistics, _instancedStats); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< GLenum COMMA osgUtil::Statistics::PrimitivePair >); +STD_MAP_REFLECTOR(std::map< GLenum COMMA osgUtil::Statistics::PrimitivePair >) -STD_MAP_REFLECTOR(std::map< GLenum COMMA unsigned int >); +STD_MAP_REFLECTOR(std::map< GLenum COMMA unsigned int >) -STD_PAIR_REFLECTOR(std::pair< unsigned int COMMA unsigned int >); +STD_PAIR_REFLECTOR(std::pair< unsigned int COMMA unsigned int >) -STD_SET_REFLECTOR(std::set< osg::Drawable * >); +STD_SET_REFLECTOR(std::set< osg::Drawable * >) -STD_SET_REFLECTOR(std::set< osg::StateSet * >); +STD_SET_REFLECTOR(std::set< osg::StateSet * >) diff --git a/src/osgWrappers/osgUtil/Tessellator.cpp b/src/osgWrappers/osgUtil/Tessellator.cpp index 8e04f97f8..a62fb2eef 100644 --- a/src/osgWrappers/osgUtil/Tessellator.cpp +++ b/src/osgWrappers/osgUtil/Tessellator.cpp @@ -22,9 +22,9 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::Vec3 * >, osgUtil::Tessellator::VertexPointList); +TYPE_NAME_ALIAS(std::vector< osg::Vec3 * >, osgUtil::Tessellator::VertexPointList) -TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgUtil::Tessellator::Prim > >, osgUtil::Tessellator::PrimList); +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgUtil::Tessellator::Prim > >, osgUtil::Tessellator::PrimList) BEGIN_ENUM_REFLECTOR(osgUtil::Tessellator::WindingType) I_EnumLabel(osgUtil::Tessellator::TESS_WINDING_ODD); @@ -200,7 +200,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Tessellator) __void__setWindingType__C5_WindingType); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::Vec3 * >, osgUtil::Tessellator::Prim::VecList); +TYPE_NAME_ALIAS(std::vector< osg::Vec3 * >, osgUtil::Tessellator::Prim::VecList) BEGIN_OBJECT_REFLECTOR(osgUtil::Tessellator::Prim) I_BaseType(osg::Referenced); @@ -252,7 +252,7 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::Tessellator::Prim >) 0); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osg::Vec3 * >); +STD_VECTOR_REFLECTOR(std::vector< osg::Vec3 * >) -STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgUtil::Tessellator::Prim > >); +STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgUtil::Tessellator::Prim > >) diff --git a/src/osgWrappers/osgViewer/CompositeViewer.cpp b/src/osgWrappers/osgViewer/CompositeViewer.cpp index 46e65c01f..fa87c2900 100644 --- a/src/osgWrappers/osgViewer/CompositeViewer.cpp +++ b/src/osgWrappers/osgViewer/CompositeViewer.cpp @@ -26,11 +26,11 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::GraphicsContext * >, osgViewer::CompositeViewer::Contexts); +TYPE_NAME_ALIAS(std::vector< osg::GraphicsContext * >, osgViewer::CompositeViewer::Contexts) -TYPE_NAME_ALIAS(std::vector< osgViewer::GraphicsWindow * >, osgViewer::CompositeViewer::Windows); +TYPE_NAME_ALIAS(std::vector< osgViewer::GraphicsWindow * >, osgViewer::CompositeViewer::Windows) -TYPE_NAME_ALIAS(std::vector< osgViewer::Scene * >, osgViewer::CompositeViewer::Scenes); +TYPE_NAME_ALIAS(std::vector< osgViewer::Scene * >, osgViewer::CompositeViewer::Scenes) BEGIN_ENUM_REFLECTOR(osgViewer::CompositeViewer::ThreadingModel) I_EnumLabel(osgViewer::CompositeViewer::SingleThreaded); @@ -326,9 +326,9 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::CompositeViewer) 0); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osg::GraphicsContext * >); +STD_VECTOR_REFLECTOR(std::vector< osg::GraphicsContext * >) -STD_VECTOR_REFLECTOR(std::vector< osgViewer::GraphicsWindow * >); +STD_VECTOR_REFLECTOR(std::vector< osgViewer::GraphicsWindow * >) -STD_VECTOR_REFLECTOR(std::vector< osgViewer::Scene * >); +STD_VECTOR_REFLECTOR(std::vector< osgViewer::Scene * >) diff --git a/src/osgWrappers/osgViewer/SimpleViewer.cpp b/src/osgWrappers/osgViewer/SimpleViewer.cpp index 55af613f6..bea224c0c 100644 --- a/src/osgWrappers/osgViewer/SimpleViewer.cpp +++ b/src/osgWrappers/osgViewer/SimpleViewer.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgGA::GUIEventHandler > >, osgViewer::SimpleViewer::EventHandlers); +TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgGA::GUIEventHandler > >, osgViewer::SimpleViewer::EventHandlers) BEGIN_OBJECT_REFLECTOR(osgViewer::SimpleViewer) I_VirtualBaseType(osgViewer::GraphicsWindow); @@ -212,5 +212,5 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgGA::GUIEventHandler >) 0); END_REFLECTOR -STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osgGA::GUIEventHandler > >); +STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osgGA::GUIEventHandler > >) diff --git a/src/osgWrappers/osgViewer/View.cpp b/src/osgWrappers/osgViewer/View.cpp index 73bd6d018..ab98e0edb 100644 --- a/src/osgWrappers/osgViewer/View.cpp +++ b/src/osgWrappers/osgViewer/View.cpp @@ -68,7 +68,7 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::EndOfDynamicDrawBlock) __void__setNumOfBlocks__unsigned_int); END_REFLECTOR -TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgGA::GUIEventHandler > >, osgViewer::View::EventHandlers); +TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgGA::GUIEventHandler > >, osgViewer::View::EventHandlers) BEGIN_OBJECT_REFLECTOR(osgViewer::View) I_BaseType(osg::View); diff --git a/src/osgWrappers/osgViewer/Viewer.cpp b/src/osgWrappers/osgViewer/Viewer.cpp index e4676c739..1c8173478 100644 --- a/src/osgWrappers/osgViewer/Viewer.cpp +++ b/src/osgWrappers/osgViewer/Viewer.cpp @@ -26,15 +26,15 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::GraphicsContext * >, osgViewer::Viewer::Contexts); +TYPE_NAME_ALIAS(std::vector< osg::GraphicsContext * >, osgViewer::Viewer::Contexts) -TYPE_NAME_ALIAS(std::vector< osgViewer::GraphicsWindow * >, osgViewer::Viewer::Windows); +TYPE_NAME_ALIAS(std::vector< osgViewer::GraphicsWindow * >, osgViewer::Viewer::Windows) -TYPE_NAME_ALIAS(std::vector< osg::Camera * >, osgViewer::Viewer::Cameras); +TYPE_NAME_ALIAS(std::vector< osg::Camera * >, osgViewer::Viewer::Cameras) -TYPE_NAME_ALIAS(std::vector< OpenThreads::Thread * >, osgViewer::Viewer::Threads); +TYPE_NAME_ALIAS(std::vector< OpenThreads::Thread * >, osgViewer::Viewer::Threads) -TYPE_NAME_ALIAS(std::vector< osg::OperationsThread * >, osgViewer::Viewer::OperationsThreads); +TYPE_NAME_ALIAS(std::vector< osg::OperationsThread * >, osgViewer::Viewer::OperationsThreads) BEGIN_ENUM_REFLECTOR(osgViewer::Viewer::ThreadingModel) I_EnumLabel(osgViewer::Viewer::SingleThreaded); @@ -320,9 +320,9 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Viewer) __void__setUseMainThreadForRenderingTraversals__bool); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< OpenThreads::Thread * >); +STD_VECTOR_REFLECTOR(std::vector< OpenThreads::Thread * >) -STD_VECTOR_REFLECTOR(std::vector< osg::Camera * >); +STD_VECTOR_REFLECTOR(std::vector< osg::Camera * >) -STD_VECTOR_REFLECTOR(std::vector< osg::OperationsThread * >); +STD_VECTOR_REFLECTOR(std::vector< osg::OperationsThread * >)