diff --git a/src/osgWrappers/Doxyfile.template b/src/osgWrappers/Doxyfile.template index 0547b833b..9631d29e6 100644 --- a/src/osgWrappers/Doxyfile.template +++ b/src/osgWrappers/Doxyfile.template @@ -191,7 +191,9 @@ EXPAND_AS_DEFINED = META_Object \ META_Shape \ META_Technique \ META_NodeVisitor \ - META_Effect + META_Effect \ + META_OSGMANIPULATOR_Object + PREDEFINED = SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- diff --git a/src/osgWrappers/osg/AudioStream.cpp b/src/osgWrappers/osg/AudioStream.cpp index 7fd4aeeca..c73529ca9 100644 --- a/src/osgWrappers/osg/AudioStream.cpp +++ b/src/osgWrappers/osg/AudioStream.cpp @@ -107,11 +107,6 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::AudioStream) __void__consumeAudioBuffer__void_P1C5__C5_size_t, "", ""); - I_Method0(bool, audioStream, - Properties::PURE_VIRTUAL, - __bool__audioStream, - "", - ""); I_Method0(int, audioFrequency, Properties::PURE_VIRTUAL, __int__audioFrequency, diff --git a/src/osgWrappers/osg/GraphicsContext.cpp b/src/osgWrappers/osg/GraphicsContext.cpp index 56e315a28..0e826b4b3 100644 --- a/src/osgWrappers/osg/GraphicsContext.cpp +++ b/src/osgWrappers/osg/GraphicsContext.cpp @@ -182,6 +182,11 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext) __void__clear, "Do an OpenGL clear of the full graphics context/window. ", "Note, must only be called from a thread with this context current. "); + I_Method0(double, getTimeSinceLastClear, + Properties::NON_VIRTUAL, + __double__getTimeSinceLastClear, + "", + ""); I_Method0(bool, realize, Properties::NON_VIRTUAL, __bool__realize, @@ -398,6 +403,9 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext) I_SimpleProperty(osg::State *, State, __State_P1__getState, __void__setState__State_P1); + I_SimpleProperty(double, TimeSinceLastClear, + __double__getTimeSinceLastClear, + 0); I_SimpleProperty(const osg::GraphicsContext::Traits *, Traits, __C5_Traits_P1__getTraits, 0); diff --git a/src/osgWrappers/osg/Image.cpp b/src/osgWrappers/osg/Image.cpp index a45b8b48b..99051335e 100644 --- a/src/osgWrappers/osg/Image.cpp +++ b/src/osgWrappers/osg/Image.cpp @@ -220,6 +220,16 @@ BEGIN_OBJECT_REFLECTOR(osg::Image) __unsigned_int__getPacking, "", ""); + I_Method1(void, setPixelAspectRatio, IN, float, pixelAspectRatio, + Properties::NON_VIRTUAL, + __void__setPixelAspectRatio__float, + "Set the pixel aspect ratio, defined as the pixel width divided by the pixel height. ", + ""); + I_Method0(float, getPixelAspectRatio, + Properties::NON_VIRTUAL, + __float__getPixelAspectRatio, + "Get the pixel aspect ratio. ", + ""); I_Method0(unsigned int, getPixelSizeInBits, Properties::NON_VIRTUAL, __unsigned_int__getPixelSizeInBits, @@ -351,7 +361,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Image) "", ""); I_Method0(bool, isImageTranslucent, - Properties::NON_VIRTUAL, + Properties::VIRTUAL, __bool__isImageTranslucent, "Return true if this image is translucent - i.e. ", "it has alpha values that are less 1.0 (when normalized). "); @@ -464,6 +474,9 @@ BEGIN_OBJECT_REFLECTOR(osg::Image) I_SimpleProperty(unsigned int, Packing, __unsigned_int__getPacking, __void__setPacking__unsigned_int); + I_SimpleProperty(float, PixelAspectRatio, + __float__getPixelAspectRatio, + __void__setPixelAspectRatio__float); I_SimpleProperty(osg::PixelBufferObject *, PixelBufferObject, __PixelBufferObject_P1__getPixelBufferObject, __void__setPixelBufferObject__PixelBufferObject_P1); diff --git a/src/osgWrappers/osg/ImageStream.cpp b/src/osgWrappers/osg/ImageStream.cpp index 92d72fe31..185b2c91d 100644 --- a/src/osgWrappers/osg/ImageStream.cpp +++ b/src/osgWrappers/osg/ImageStream.cpp @@ -125,6 +125,11 @@ BEGIN_OBJECT_REFLECTOR(osg::ImageStream) __double__getLength, "", ""); + I_Method0(double, getFrameRate, + Properties::VIRTUAL, + __double__getFrameRate, + "", + ""); I_Method1(void, setReferenceTime, IN, double, x, Properties::VIRTUAL, __void__setReferenceTime__double, @@ -179,6 +184,9 @@ BEGIN_OBJECT_REFLECTOR(osg::ImageStream) I_SimpleProperty(const osg::ImageStream::AudioStreams &, AudioStreams, __C5_AudioStreams_R1__getAudioStreams, __void__setAudioStreams__C5_AudioStreams_R1); + I_SimpleProperty(double, FrameRate, + __double__getFrameRate, + 0); I_SimpleProperty(double, Length, __double__getLength, 0); diff --git a/src/osgWrappers/osg/Texture.cpp b/src/osgWrappers/osg/Texture.cpp index 43fabc882..02852a25d 100644 --- a/src/osgWrappers/osg/Texture.cpp +++ b/src/osgWrappers/osg/Texture.cpp @@ -79,8 +79,14 @@ END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::Texture::ShadowCompareFunc) I_DeclaringFile("osg/Texture"); + I_EnumLabel(osg::Texture::NEVER); + I_EnumLabel(osg::Texture::LESS); + I_EnumLabel(osg::Texture::EQUAL); I_EnumLabel(osg::Texture::LEQUAL); + I_EnumLabel(osg::Texture::GREATER); + I_EnumLabel(osg::Texture::NOTEQUAL); I_EnumLabel(osg::Texture::GEQUAL); + I_EnumLabel(osg::Texture::ALWAYS); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::Texture::ShadowTextureMode) diff --git a/src/osgWrappers/osgDB/PluginQuery.cpp b/src/osgWrappers/osgDB/PluginQuery.cpp index 47835dce4..c10db0976 100644 --- a/src/osgWrappers/osgDB/PluginQuery.cpp +++ b/src/osgWrappers/osgDB/PluginQuery.cpp @@ -31,6 +31,7 @@ BEGIN_OBJECT_REFLECTOR(osgDB::ReaderWriterInfo) I_PublicMemberProperty(osgDB::ReaderWriter::FormatDescriptionMap, protocols); I_PublicMemberProperty(osgDB::ReaderWriter::FormatDescriptionMap, extensions); I_PublicMemberProperty(osgDB::ReaderWriter::FormatDescriptionMap, options); + I_PublicMemberProperty(osgDB::ReaderWriter::Features, features); END_REFLECTOR TYPE_NAME_ALIAS(std::list< std::string >, osgDB::FileNameList) diff --git a/src/osgWrappers/osgDB/ReaderWriter.cpp b/src/osgWrappers/osgDB/ReaderWriter.cpp index 674148b09..a3bca7771 100644 --- a/src/osgWrappers/osgDB/ReaderWriter.cpp +++ b/src/osgWrappers/osgDB/ReaderWriter.cpp @@ -28,6 +28,22 @@ #undef OUT #endif +BEGIN_ENUM_REFLECTOR(osgDB::ReaderWriter::Features) + I_DeclaringFile("osgDB/ReaderWriter"); + I_EnumLabel(osgDB::ReaderWriter::FEATURE_NONE); + I_EnumLabel(osgDB::ReaderWriter::FEATURE_READ_OBJECT); + I_EnumLabel(osgDB::ReaderWriter::FEATURE_READ_IMAGE); + I_EnumLabel(osgDB::ReaderWriter::FEATURE_READ_HEIGHT_FIELD); + I_EnumLabel(osgDB::ReaderWriter::FEATURE_READ_NODE); + I_EnumLabel(osgDB::ReaderWriter::FEATURE_READ_SHADER); + I_EnumLabel(osgDB::ReaderWriter::FEATURE_WRITE_OBJECT); + I_EnumLabel(osgDB::ReaderWriter::FEATURE_WRITE_IMAGE); + I_EnumLabel(osgDB::ReaderWriter::FEATURE_WRITE_HEIGHT_FIELD); + I_EnumLabel(osgDB::ReaderWriter::FEATURE_WRITE_NODE); + I_EnumLabel(osgDB::ReaderWriter::FEATURE_WRITE_SHADER); + I_EnumLabel(osgDB::ReaderWriter::FEATURE_ALL); +END_REFLECTOR + BEGIN_ENUM_REFLECTOR(osgDB::ReaderWriter::ArchiveStatus) I_DeclaringFile("osgDB/ReaderWriter"); I_EnumLabel(osgDB::ReaderWriter::READ); @@ -37,6 +53,8 @@ END_REFLECTOR TYPE_NAME_ALIAS(std::map< std::string COMMA std::string >, osgDB::ReaderWriter::FormatDescriptionMap) +TYPE_NAME_ALIAS(std::list< std::string >, osgDB::ReaderWriter::FeatureList) + BEGIN_OBJECT_REFLECTOR(osgDB::ReaderWriter) I_DeclaringFile("osgDB/ReaderWriter"); I_BaseType(osg::Object); @@ -92,6 +110,11 @@ BEGIN_OBJECT_REFLECTOR(osgDB::ReaderWriter) __bool__acceptsExtension__C5_std_string_R1, "return true if ReaderWriter accepts specified file extension. ", ""); + I_Method0(osgDB::ReaderWriter::Features, supportedFeatures, + Properties::VIRTUAL, + __Features__supportedFeatures, + "return available features ", + ""); I_MethodWithDefaults4(osgDB::ReaderWriter::ReadResult, openArchive, IN, const std::string &, x, , IN, osgDB::ReaderWriter::ArchiveStatus, x, , IN, unsigned, int, 4096, IN, const osgDB::ReaderWriter::Options *, x, NULL, Properties::VIRTUAL, __ReadResult__openArchive__C5_std_string_R1__ArchiveStatus__unsigned__C5_Options_P1, @@ -202,6 +225,10 @@ BEGIN_OBJECT_REFLECTOR(osgDB::ReaderWriter) __WriteResult__writeShader__C5_osg_Shader_R1__std_ostream_R1__C5_Options_P1, "", ""); + I_StaticMethod1(osgDB::ReaderWriter::FeatureList, featureAsString, IN, osgDB::ReaderWriter::Features, feature, + __FeatureList__featureAsString__Features_S, + "return feature as string ", + ""); I_ProtectedMethod2(void, supportsProtocol, IN, const std::string &, fmt, IN, const std::string &, description, Properties::NON_VIRTUAL, Properties::NON_CONST, @@ -382,6 +409,7 @@ END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgDB::ReaderWriter::ReadResult::ReadStatus) I_DeclaringFile("osgDB/ReaderWriter"); + I_EnumLabel(osgDB::ReaderWriter::ReadResult::NOT_IMPLEMENTED); I_EnumLabel(osgDB::ReaderWriter::ReadResult::FILE_NOT_HANDLED); I_EnumLabel(osgDB::ReaderWriter::ReadResult::FILE_NOT_FOUND); I_EnumLabel(osgDB::ReaderWriter::ReadResult::FILE_LOADED); @@ -563,6 +591,7 @@ END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgDB::ReaderWriter::WriteResult::WriteStatus) I_DeclaringFile("osgDB/ReaderWriter"); + I_EnumLabel(osgDB::ReaderWriter::WriteResult::NOT_IMPLEMENTED); I_EnumLabel(osgDB::ReaderWriter::WriteResult::FILE_NOT_HANDLED); I_EnumLabel(osgDB::ReaderWriter::WriteResult::FILE_SAVED); I_EnumLabel(osgDB::ReaderWriter::WriteResult::ERROR_IN_WRITING_FILE); diff --git a/src/osgWrappers/osgDB/Registry.cpp b/src/osgWrappers/osgDB/Registry.cpp index b6451521d..96f91c200 100644 --- a/src/osgWrappers/osgDB/Registry.cpp +++ b/src/osgWrappers/osgDB/Registry.cpp @@ -565,6 +565,16 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Registry) __void__addArchiveExtension__C5_std_string, "Add an Archive extension. ", ""); + I_Method1(void, registerProtocol, IN, const std::string &, protocol, + Properties::NON_VIRTUAL, + __void__registerProtocol__C5_std_string_R1, + "registers a protocol ", + ""); + I_Method1(bool, isProtocolRegistered, IN, const std::string &, protocol, + Properties::NON_VIRTUAL, + __bool__isProtocolRegistered__C5_std_string_R1, + "returns true, if named protocol is registered ", + ""); I_ProtectedConstructor0(____Registry, "constructor is private, as its a singleton, preventing construction other than via the instance() method and therefore ensuring only one copy is ever constructed ", ""); diff --git a/src/osgWrappers/osgGA/TrackballManipulator.cpp b/src/osgWrappers/osgGA/TrackballManipulator.cpp index faee3bd1f..657e68967 100644 --- a/src/osgWrappers/osgGA/TrackballManipulator.cpp +++ b/src/osgWrappers/osgGA/TrackballManipulator.cpp @@ -119,6 +119,16 @@ BEGIN_OBJECT_REFLECTOR(osgGA::TrackballManipulator) __double__getMinimumZoomScale, "get the minimum distance (as ratio) the eye point can be zoomed in ", ""); + I_Method1(void, setScroolWheelZoomDelta, IN, double, zoomDelta, + Properties::NON_VIRTUAL, + __void__setScroolWheelZoomDelta__double, + "set the mouse scroll wheel zoom delta. ", + "Range -1.0 to +1.0, -ve value inverts wheel direction and zero switches off scroll wheel. "); + I_Method0(double, getScroolWheelZoomDelta, + Properties::NON_VIRTUAL, + __double__getScroolWheelZoomDelta, + "get the mouse scroll wheel zoom delta. ", + ""); I_Method1(void, setCenter, IN, const osg::Vec3d &, center, Properties::NON_VIRTUAL, __void__setCenter__C5_osg_Vec3d_R1, @@ -234,6 +244,9 @@ BEGIN_OBJECT_REFLECTOR(osgGA::TrackballManipulator) I_SimpleProperty(const osg::Quat &, Rotation, __C5_osg_Quat_R1__getRotation, __void__setRotation__C5_osg_Quat_R1); + I_SimpleProperty(double, ScroolWheelZoomDelta, + __double__getScroolWheelZoomDelta, + __void__setScroolWheelZoomDelta__double); I_SimpleProperty(float, TrackballSize, __float__getTrackballSize, __void__setTrackballSize__float); diff --git a/src/osgWrappers/osgManipulator/Dragger.cpp b/src/osgWrappers/osgManipulator/Dragger.cpp index f5d69ef2f..aef89251d 100644 --- a/src/osgWrappers/osgManipulator/Dragger.cpp +++ b/src/osgWrappers/osgManipulator/Dragger.cpp @@ -12,6 +12,7 @@ #include #include +#include #include #include #include @@ -31,6 +32,21 @@ TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgManipulator::Dragger > >, osgManip BEGIN_OBJECT_REFLECTOR(osgManipulator::CompositeDragger) I_DeclaringFile("osgManipulator/Dragger"); I_BaseType(osgManipulator::Dragger); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_osg_Object_P1, + "return true if this and obj are of the same kind of object. ", + ""); + I_Method0(const char *, libraryName, + Properties::VIRTUAL, + __C5_char_P1__libraryName, + "return the name of the node's library. ", + ""); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "return the name of the node's class type. ", + ""); I_Method0(const osgManipulator::CompositeDragger *, getComposite, Properties::VIRTUAL, __C5_CompositeDragger_P1__getComposite, @@ -115,6 +131,21 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgManipulator::Dragger) I_DeclaringFile("osgManipulator/Dragger"); I_BaseType(osgManipulator::Selection); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_osg_Object_P1, + "return true if this and obj are of the same kind of object. ", + ""); + I_Method0(const char *, libraryName, + Properties::VIRTUAL, + __C5_char_P1__libraryName, + "return the name of the node's library. ", + ""); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "return the name of the node's class type. ", + ""); I_Method1(void, setCommandManager, IN, osgManipulator::CommandManager *, cm, Properties::VIRTUAL, __void__setCommandManager__CommandManager_P1, diff --git a/src/osgWrappers/osgManipulator/RotateCylinderDragger.cpp b/src/osgWrappers/osgManipulator/RotateCylinderDragger.cpp index 572313b2b..2c0c07c3a 100644 --- a/src/osgWrappers/osgManipulator/RotateCylinderDragger.cpp +++ b/src/osgWrappers/osgManipulator/RotateCylinderDragger.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -30,6 +31,21 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::RotateCylinderDragger) I_Constructor0(____RotateCylinderDragger, "", ""); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_osg_Object_P1, + "return true if this and obj are of the same kind of object. ", + ""); + I_Method0(const char *, libraryName, + Properties::VIRTUAL, + __C5_char_P1__libraryName, + "return the name of the node's library. ", + ""); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "return the name of the node's class type. ", + ""); I_Method3(bool, handle, IN, const osgManipulator::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, Properties::VIRTUAL, __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, diff --git a/src/osgWrappers/osgManipulator/RotateSphereDragger.cpp b/src/osgWrappers/osgManipulator/RotateSphereDragger.cpp index 596394a5d..3b2e75e2f 100644 --- a/src/osgWrappers/osgManipulator/RotateSphereDragger.cpp +++ b/src/osgWrappers/osgManipulator/RotateSphereDragger.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -30,6 +31,21 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::RotateSphereDragger) I_Constructor0(____RotateSphereDragger, "", ""); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_osg_Object_P1, + "return true if this and obj are of the same kind of object. ", + ""); + I_Method0(const char *, libraryName, + Properties::VIRTUAL, + __C5_char_P1__libraryName, + "return the name of the node's library. ", + ""); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "return the name of the node's class type. ", + ""); I_Method3(bool, handle, IN, const osgManipulator::PointerInfo &, x, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, Properties::VIRTUAL, __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, diff --git a/src/osgWrappers/osgManipulator/Scale1DDragger.cpp b/src/osgWrappers/osgManipulator/Scale1DDragger.cpp index d4994c45d..87b2f601b 100644 --- a/src/osgWrappers/osgManipulator/Scale1DDragger.cpp +++ b/src/osgWrappers/osgManipulator/Scale1DDragger.cpp @@ -11,6 +11,7 @@ #include #include +#include #include #include #include @@ -39,6 +40,21 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale1DDragger) ____Scale1DDragger__ScaleMode, "", ""); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_osg_Object_P1, + "return true if this and obj are of the same kind of object. ", + ""); + I_Method0(const char *, libraryName, + Properties::VIRTUAL, + __C5_char_P1__libraryName, + "return the name of the node's library. ", + ""); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "return the name of the node's class type. ", + ""); I_Method3(bool, handle, IN, const osgManipulator::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, Properties::VIRTUAL, __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, diff --git a/src/osgWrappers/osgManipulator/Scale2DDragger.cpp b/src/osgWrappers/osgManipulator/Scale2DDragger.cpp index e272185c0..c64286a92 100644 --- a/src/osgWrappers/osgManipulator/Scale2DDragger.cpp +++ b/src/osgWrappers/osgManipulator/Scale2DDragger.cpp @@ -11,6 +11,7 @@ #include #include +#include #include #include #include @@ -40,6 +41,21 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale2DDragger) ____Scale2DDragger__ScaleMode, "", ""); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_osg_Object_P1, + "return true if this and obj are of the same kind of object. ", + ""); + I_Method0(const char *, libraryName, + Properties::VIRTUAL, + __C5_char_P1__libraryName, + "return the name of the node's library. ", + ""); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "return the name of the node's class type. ", + ""); I_Method3(bool, handle, IN, const osgManipulator::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, Properties::VIRTUAL, __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, diff --git a/src/osgWrappers/osgManipulator/ScaleAxisDragger.cpp b/src/osgWrappers/osgManipulator/ScaleAxisDragger.cpp index ecdeac386..8c78a984b 100644 --- a/src/osgWrappers/osgManipulator/ScaleAxisDragger.cpp +++ b/src/osgWrappers/osgManipulator/ScaleAxisDragger.cpp @@ -10,6 +10,7 @@ #include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -26,6 +27,21 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::ScaleAxisDragger) I_Constructor0(____ScaleAxisDragger, "", ""); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_osg_Object_P1, + "return true if this and obj are of the same kind of object. ", + ""); + I_Method0(const char *, libraryName, + Properties::VIRTUAL, + __C5_char_P1__libraryName, + "return the name of the node's library. ", + ""); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "return the name of the node's class type. ", + ""); I_Method0(void, setupDefaultGeometry, Properties::NON_VIRTUAL, __void__setupDefaultGeometry, diff --git a/src/osgWrappers/osgManipulator/Selection.cpp b/src/osgWrappers/osgManipulator/Selection.cpp index fcab64818..3da4472e8 100644 --- a/src/osgWrappers/osgManipulator/Selection.cpp +++ b/src/osgWrappers/osgManipulator/Selection.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include @@ -27,6 +28,21 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Selection) I_Constructor0(____Selection, "", ""); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_osg_Object_P1, + "return true if this and obj are of the same kind of object. ", + ""); + I_Method0(const char *, libraryName, + Properties::VIRTUAL, + __C5_char_P1__libraryName, + "return the name of the node's library. ", + ""); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "return the name of the node's class type. ", + ""); I_Method1(bool, receive, IN, const osgManipulator::MotionCommand &, x, Properties::VIRTUAL, __bool__receive__C5_MotionCommand_R1, diff --git a/src/osgWrappers/osgManipulator/TabBoxDragger.cpp b/src/osgWrappers/osgManipulator/TabBoxDragger.cpp index 01ccfe474..43d0aa9d5 100644 --- a/src/osgWrappers/osgManipulator/TabBoxDragger.cpp +++ b/src/osgWrappers/osgManipulator/TabBoxDragger.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include @@ -27,6 +28,21 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::TabBoxDragger) I_Constructor0(____TabBoxDragger, "", ""); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_osg_Object_P1, + "return true if this and obj are of the same kind of object. ", + ""); + I_Method0(const char *, libraryName, + Properties::VIRTUAL, + __C5_char_P1__libraryName, + "return the name of the node's library. ", + ""); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "return the name of the node's class type. ", + ""); I_Method0(void, setupDefaultGeometry, Properties::NON_VIRTUAL, __void__setupDefaultGeometry, diff --git a/src/osgWrappers/osgManipulator/TabPlaneDragger.cpp b/src/osgWrappers/osgManipulator/TabPlaneDragger.cpp index 593256944..d89121ece 100644 --- a/src/osgWrappers/osgManipulator/TabPlaneDragger.cpp +++ b/src/osgWrappers/osgManipulator/TabPlaneDragger.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -30,6 +31,21 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::TabPlaneDragger) I_Constructor0(____TabPlaneDragger, "", ""); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_osg_Object_P1, + "return true if this and obj are of the same kind of object. ", + ""); + I_Method0(const char *, libraryName, + Properties::VIRTUAL, + __C5_char_P1__libraryName, + "return the name of the node's library. ", + ""); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "return the name of the node's class type. ", + ""); I_Method3(bool, handle, IN, const osgManipulator::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, Properties::VIRTUAL, __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, diff --git a/src/osgWrappers/osgManipulator/TabPlaneTrackballDragger.cpp b/src/osgWrappers/osgManipulator/TabPlaneTrackballDragger.cpp index 3ec9e5381..bcea1bd28 100644 --- a/src/osgWrappers/osgManipulator/TabPlaneTrackballDragger.cpp +++ b/src/osgWrappers/osgManipulator/TabPlaneTrackballDragger.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include @@ -27,6 +28,21 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::TabPlaneTrackballDragger) I_Constructor0(____TabPlaneTrackballDragger, "", ""); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_osg_Object_P1, + "return true if this and obj are of the same kind of object. ", + ""); + I_Method0(const char *, libraryName, + Properties::VIRTUAL, + __C5_char_P1__libraryName, + "return the name of the node's library. ", + ""); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "return the name of the node's class type. ", + ""); I_Method0(void, setupDefaultGeometry, Properties::NON_VIRTUAL, __void__setupDefaultGeometry, diff --git a/src/osgWrappers/osgManipulator/TrackballDragger.cpp b/src/osgWrappers/osgManipulator/TrackballDragger.cpp index d004251f7..cec2e67d3 100644 --- a/src/osgWrappers/osgManipulator/TrackballDragger.cpp +++ b/src/osgWrappers/osgManipulator/TrackballDragger.cpp @@ -10,6 +10,7 @@ #include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -28,6 +29,21 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::TrackballDragger) ____TrackballDragger__bool, "", ""); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_osg_Object_P1, + "return true if this and obj are of the same kind of object. ", + ""); + I_Method0(const char *, libraryName, + Properties::VIRTUAL, + __C5_char_P1__libraryName, + "return the name of the node's library. ", + ""); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "return the name of the node's class type. ", + ""); I_Method0(void, setupDefaultGeometry, Properties::NON_VIRTUAL, __void__setupDefaultGeometry, diff --git a/src/osgWrappers/osgManipulator/Translate1DDragger.cpp b/src/osgWrappers/osgManipulator/Translate1DDragger.cpp index 61a41b5e8..c319627fd 100644 --- a/src/osgWrappers/osgManipulator/Translate1DDragger.cpp +++ b/src/osgWrappers/osgManipulator/Translate1DDragger.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -31,6 +32,21 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Translate1DDragger) I_Constructor0(____Translate1DDragger, "", ""); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_osg_Object_P1, + "return true if this and obj are of the same kind of object. ", + ""); + I_Method0(const char *, libraryName, + Properties::VIRTUAL, + __C5_char_P1__libraryName, + "return the name of the node's library. ", + ""); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "return the name of the node's class type. ", + ""); I_Constructor2(IN, const osg::Vec3d &, s, IN, const osg::Vec3d &, e, ____Translate1DDragger__C5_osg_Vec3d_R1__C5_osg_Vec3d_R1, "", diff --git a/src/osgWrappers/osgManipulator/Translate2DDragger.cpp b/src/osgWrappers/osgManipulator/Translate2DDragger.cpp index 115446b78..506c8213b 100644 --- a/src/osgWrappers/osgManipulator/Translate2DDragger.cpp +++ b/src/osgWrappers/osgManipulator/Translate2DDragger.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -36,6 +37,21 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Translate2DDragger) ____Translate2DDragger__C5_osg_Plane_R1, "", ""); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_osg_Object_P1, + "return true if this and obj are of the same kind of object. ", + ""); + I_Method0(const char *, libraryName, + Properties::VIRTUAL, + __C5_char_P1__libraryName, + "return the name of the node's library. ", + ""); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "return the name of the node's class type. ", + ""); I_Method3(bool, handle, IN, const osgManipulator::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, Properties::VIRTUAL, __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, diff --git a/src/osgWrappers/osgManipulator/TranslateAxisDragger.cpp b/src/osgWrappers/osgManipulator/TranslateAxisDragger.cpp index 3986118ad..9765165f2 100644 --- a/src/osgWrappers/osgManipulator/TranslateAxisDragger.cpp +++ b/src/osgWrappers/osgManipulator/TranslateAxisDragger.cpp @@ -10,6 +10,7 @@ #include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -26,6 +27,21 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::TranslateAxisDragger) I_Constructor0(____TranslateAxisDragger, "", ""); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_osg_Object_P1, + "return true if this and obj are of the same kind of object. ", + ""); + I_Method0(const char *, libraryName, + Properties::VIRTUAL, + __C5_char_P1__libraryName, + "return the name of the node's library. ", + ""); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "return the name of the node's class type. ", + ""); I_Method0(void, setupDefaultGeometry, Properties::NON_VIRTUAL, __void__setupDefaultGeometry, diff --git a/src/osgWrappers/osgManipulator/TranslatePlaneDragger.cpp b/src/osgWrappers/osgManipulator/TranslatePlaneDragger.cpp index 6c7dc6437..87dbf0130 100644 --- a/src/osgWrappers/osgManipulator/TranslatePlaneDragger.cpp +++ b/src/osgWrappers/osgManipulator/TranslatePlaneDragger.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -32,6 +33,21 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::TranslatePlaneDragger) I_Constructor0(____TranslatePlaneDragger, "", ""); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_osg_Object_P1, + "return true if this and obj are of the same kind of object. ", + ""); + I_Method0(const char *, libraryName, + Properties::VIRTUAL, + __C5_char_P1__libraryName, + "return the name of the node's library. ", + ""); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "return the name of the node's class type. ", + ""); I_Method3(bool, handle, IN, const osgManipulator::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, Properties::VIRTUAL, __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, diff --git a/src/osgWrappers/osgText/Font3D.cpp b/src/osgWrappers/osgText/Font3D.cpp index 1c6c0b021..65de3562e 100644 --- a/src/osgWrappers/osgText/Font3D.cpp +++ b/src/osgWrappers/osgText/Font3D.cpp @@ -308,6 +308,11 @@ BEGIN_OBJECT_REFLECTOR(osgText::Font3D::Glyph3D) __osg_Vec3Array_P1__getVertexArray, "Get the VertexArray of the glyph. ", ""); + I_Method1(void, setNormalArray, IN, osg::Vec3Array *, na, + Properties::NON_VIRTUAL, + __void__setNormalArray__osg_Vec3Array_P1, + "Set the VertexArray of the glyph. ", + ""); I_Method0(osg::Vec3Array *, getNormalArray, Properties::NON_VIRTUAL, __osg_Vec3Array_P1__getNormalArray, @@ -382,7 +387,7 @@ BEGIN_OBJECT_REFLECTOR(osgText::Font3D::Glyph3D) 0); I_SimpleProperty(osg::Vec3Array *, NormalArray, __osg_Vec3Array_P1__getNormalArray, - 0); + __void__setNormalArray__osg_Vec3Array_P1); I_SimpleProperty(bool, ThreadSafeRefUnref, 0, __void__setThreadSafeRefUnref__bool); diff --git a/src/osgWrappers/osgText/Text3D.cpp b/src/osgWrappers/osgText/Text3D.cpp index b8e294c15..77869cd87 100644 --- a/src/osgWrappers/osgText/Text3D.cpp +++ b/src/osgWrappers/osgText/Text3D.cpp @@ -124,16 +124,26 @@ BEGIN_OBJECT_REFLECTOR(osgText::Text3D) __bool__supports__C5_osg_Drawable_ConstAttributeFunctor_R1, "return true, osgText::Text does support accept(ConstAttributeFunctor&). ", ""); + I_Method1(void, accept, IN, osg::Drawable::ConstAttributeFunctor &, af, + Properties::VIRTUAL, + __void__accept__osg_Drawable_ConstAttributeFunctor_R1, + "accept an ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. ", + ""); I_Method1(bool, supports, IN, const osg::PrimitiveFunctor &, x, Properties::VIRTUAL, __bool__supports__C5_osg_PrimitiveFunctor_R1, - "accept an ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. ", - "return true, osgText::Text does support accept(PrimitiveFunctor&) . "); + "return true, osgText::Text does support accept(PrimitiveFunctor&) . ", + ""); + I_Method1(void, accept, IN, osg::PrimitiveFunctor &, pf, + Properties::VIRTUAL, + __void__accept__osg_PrimitiveFunctor_R1, + "accept a PrimtiveFunctor and call its methods to tell it about the interal primtives that this Drawable has. ", + ""); I_Method1(void, setThreadSafeRefUnref, IN, bool, threadSafe, Properties::VIRTUAL, __void__setThreadSafeRefUnref__bool, - "accept a PrimtiveFunctor and call its methods to tell it about the interal primtives that this Drawable has. ", - "Set whether to use a mutex to ensure ref() and unref() are thread safe. "); + "Set whether to use a mutex to ensure ref() and unref() are thread safe. ", + ""); I_Method1(void, resizeGLObjectBuffers, IN, unsigned int, maxSize, Properties::VIRTUAL, __void__resizeGLObjectBuffers__unsigned_int, diff --git a/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp b/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp index 6e680d47e..7b8d6d0f3 100644 --- a/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp +++ b/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp @@ -10,17 +10,13 @@ #include #include -#include #include #include #include -#include #include -#include #include #include #include -#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -144,289 +140,3 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::GLObjectsVisitor) __void__setState__osg_State_P1); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::GraphicsContext * >, osgUtil::IncrementalCompileOperation::Contexts) - -TYPE_NAME_ALIAS(std::set< osg::GraphicsContext * >, osgUtil::IncrementalCompileOperation::ContextSet) - -TYPE_NAME_ALIAS(std::map< osg::GraphicsContext * COMMA osgUtil::IncrementalCompileOperation::CompileData >, osgUtil::IncrementalCompileOperation::CompileMap) - -TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgUtil::IncrementalCompileOperation::CompileSet > >, osgUtil::IncrementalCompileOperation::CompileSets) - -BEGIN_OBJECT_REFLECTOR(osgUtil::IncrementalCompileOperation) - I_DeclaringFile("osgUtil/GLObjectsVisitor"); - I_BaseType(osg::GraphicsOperation); - I_Constructor0(____IncrementalCompileOperation, - "", - ""); - I_Method1(void, assignContexts, IN, osgUtil::IncrementalCompileOperation::Contexts &, contexts, - Properties::NON_VIRTUAL, - __void__assignContexts__Contexts_R1, - "", - ""); - I_Method1(void, removeContexts, IN, osgUtil::IncrementalCompileOperation::Contexts &, contexts, - Properties::NON_VIRTUAL, - __void__removeContexts__Contexts_R1, - "", - ""); - I_Method1(void, addGraphicsContext, IN, osg::GraphicsContext *, gc, - Properties::NON_VIRTUAL, - __void__addGraphicsContext__osg_GraphicsContext_P1, - "", - ""); - I_Method1(void, removeGraphicsContext, IN, osg::GraphicsContext *, gc, - Properties::NON_VIRTUAL, - __void__removeGraphicsContext__osg_GraphicsContext_P1, - "", - ""); - I_Method0(void, mergeCompiledSubgraphs, - Properties::NON_VIRTUAL, - __void__mergeCompiledSubgraphs, - "Merge subgraphs that have been compiled. ", - ""); - I_Method1(void, add, IN, osg::Node *, subgraphToCompile, - Properties::NON_VIRTUAL, - __void__add__osg_Node_P1, - "Add a subgraph to be compiled. ", - ""); - I_Method2(void, add, IN, osg::Group *, attachmentPoint, IN, osg::Node *, subgraphToCompile, - Properties::NON_VIRTUAL, - __void__add__osg_Group_P1__osg_Node_P1, - "Add a subgraph to be compiled and add automatically to attachPoint on call to mergeCompiledSubgraphs. ", - ""); - I_MethodWithDefaults2(void, add, IN, osgUtil::IncrementalCompileOperation::CompileSet *, compileSet, , IN, bool, callBuildCompileMap, true, - Properties::NON_VIRTUAL, - __void__add__CompileSet_P1__bool, - "Add a CompileSet to be compiled. ", - ""); - I_Method0(OpenThreads::Mutex *, getToCompiledMutex, - Properties::NON_VIRTUAL, - __OpenThreads_Mutex_P1__getToCompiledMutex, - "", - ""); - I_Method0(osgUtil::IncrementalCompileOperation::CompileSets &, getToCompile, - Properties::NON_VIRTUAL, - __CompileSets_R1__getToCompile, - "", - ""); - I_Method0(OpenThreads::Mutex *, getCompiledMutex, - Properties::NON_VIRTUAL, - __OpenThreads_Mutex_P1__getCompiledMutex, - "", - ""); - I_Method0(osgUtil::IncrementalCompileOperation::CompileSets &, getCompiled, - Properties::NON_VIRTUAL, - __CompileSets_R1__getCompiled, - "", - ""); - I_SimpleProperty(osgUtil::IncrementalCompileOperation::CompileSets &, Compiled, - __CompileSets_R1__getCompiled, - 0); - I_SimpleProperty(OpenThreads::Mutex *, CompiledMutex, - __OpenThreads_Mutex_P1__getCompiledMutex, - 0); - I_SimpleProperty(osgUtil::IncrementalCompileOperation::CompileSets &, ToCompile, - __CompileSets_R1__getToCompile, - 0); - I_SimpleProperty(OpenThreads::Mutex *, ToCompiledMutex, - __OpenThreads_Mutex_P1__getToCompiledMutex, - 0); -END_REFLECTOR - -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::IncrementalCompileOperation::CompileCompletedCallback) - I_DeclaringFile("osgUtil/GLObjectsVisitor"); - I_BaseType(osg::Referenced); - I_Constructor0(____CompileCompletedCallback, - "", - ""); - I_Method1(bool, compileCompleted, IN, osgUtil::IncrementalCompileOperation::CompileSet *, compileSet, - Properties::PURE_VIRTUAL, - __bool__compileCompleted__CompileSet_P1, - "", - ""); -END_REFLECTOR - -TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::Drawable > >, osgUtil::IncrementalCompileOperation::CompileData::Drawables) - -TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::Texture > >, osgUtil::IncrementalCompileOperation::CompileData::Textures) - -TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::Program > >, osgUtil::IncrementalCompileOperation::CompileData::Programs) - -BEGIN_OBJECT_REFLECTOR(osgUtil::IncrementalCompileOperation::CompileData) - I_DeclaringFile("osgUtil/GLObjectsVisitor"); - I_BaseType(osg::Referenced); - I_Constructor0(____CompileData, - "", - ""); - I_Method0(bool, empty, - Properties::NON_VIRTUAL, - __bool__empty, - "", - ""); - I_PublicMemberProperty(osgUtil::IncrementalCompileOperation::CompileData::Drawables, _drawables); - I_PublicMemberProperty(osgUtil::IncrementalCompileOperation::CompileData::Textures, _textures); - I_PublicMemberProperty(osgUtil::IncrementalCompileOperation::CompileData::Programs, _programs); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osgUtil::IncrementalCompileOperation::CompileSet) - I_DeclaringFile("osgUtil/GLObjectsVisitor"); - I_BaseType(osg::Referenced); - I_Constructor0(____CompileSet, - "", - ""); - I_Constructor1(IN, osg::Node *, subgraphToCompile, - Properties::NON_EXPLICIT, - ____CompileSet__osg_Node_P1, - "", - ""); - I_Constructor2(IN, osg::Group *, attachmentPoint, IN, osg::Node *, subgraphToCompile, - ____CompileSet__osg_Group_P1__osg_Node_P1, - "", - ""); - I_MethodWithDefaults2(void, buildCompileMap, IN, osgUtil::IncrementalCompileOperation::ContextSet &, context, , IN, osgUtil::GLObjectsVisitor::Mode, mode, osgUtil::GLObjectsVisitor::COMPILE_DISPLAY_LISTS|osgUtil::GLObjectsVisitor::COMPILE_STATE_ATTRIBUTES, - Properties::NON_VIRTUAL, - __void__buildCompileMap__ContextSet_R1__GLObjectsVisitor_Mode, - "", - ""); - I_Method0(bool, compileCompleted, - Properties::NON_VIRTUAL, - __bool__compileCompleted, - "", - ""); - I_PublicMemberProperty(osg::ref_ptr< osg::Group >, _attachmentPoint); - I_PublicMemberProperty(osg::ref_ptr< osg::Node >, _subgraphToCompile); - I_PublicMemberProperty(osg::ref_ptr< osgUtil::IncrementalCompileOperation::CompileCompletedCallback >, _compileCompletedCallback); - I_PublicMemberProperty(osgUtil::IncrementalCompileOperation::CompileMap, _compileMap); -END_REFLECTOR - -BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Program >) - I_DeclaringFile("osg/ref_ptr"); - I_Constructor0(____ref_ptr, - "", - ""); - I_Constructor1(IN, osg::Program *, ptr, - Properties::NON_EXPLICIT, - ____ref_ptr__T_P1, - "", - ""); - I_Constructor1(IN, const osg::ref_ptr< osg::Program > &, rp, - Properties::NON_EXPLICIT, - ____ref_ptr__C5_ref_ptr_R1, - "", - ""); - I_Method0(osg::Program *, get, - Properties::NON_VIRTUAL, - __T_P1__get, - "", - ""); - I_Method0(bool, valid, - Properties::NON_VIRTUAL, - __bool__valid, - "", - ""); - I_Method0(osg::Program *, release, - Properties::NON_VIRTUAL, - __T_P1__release, - "", - ""); - I_Method1(void, swap, IN, osg::ref_ptr< osg::Program > &, rp, - Properties::NON_VIRTUAL, - __void__swap__ref_ptr_R1, - "", - ""); - I_SimpleProperty(osg::Program *, , - __T_P1__get, - 0); -END_REFLECTOR - -BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Texture >) - I_DeclaringFile("osg/ref_ptr"); - I_Constructor0(____ref_ptr, - "", - ""); - I_Constructor1(IN, osg::Texture *, ptr, - Properties::NON_EXPLICIT, - ____ref_ptr__T_P1, - "", - ""); - I_Constructor1(IN, const osg::ref_ptr< osg::Texture > &, rp, - Properties::NON_EXPLICIT, - ____ref_ptr__C5_ref_ptr_R1, - "", - ""); - I_Method0(osg::Texture *, get, - Properties::NON_VIRTUAL, - __T_P1__get, - "", - ""); - I_Method0(bool, valid, - Properties::NON_VIRTUAL, - __bool__valid, - "", - ""); - I_Method0(osg::Texture *, release, - Properties::NON_VIRTUAL, - __T_P1__release, - "", - ""); - I_Method1(void, swap, IN, osg::ref_ptr< osg::Texture > &, rp, - Properties::NON_VIRTUAL, - __void__swap__ref_ptr_R1, - "", - ""); - I_SimpleProperty(osg::Texture *, , - __T_P1__get, - 0); -END_REFLECTOR - -BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::IncrementalCompileOperation::CompileSet >) - I_DeclaringFile("osg/ref_ptr"); - I_Constructor0(____ref_ptr, - "", - ""); - I_Constructor1(IN, osgUtil::IncrementalCompileOperation::CompileSet *, ptr, - Properties::NON_EXPLICIT, - ____ref_ptr__T_P1, - "", - ""); - I_Constructor1(IN, const osg::ref_ptr< osgUtil::IncrementalCompileOperation::CompileSet > &, rp, - Properties::NON_EXPLICIT, - ____ref_ptr__C5_ref_ptr_R1, - "", - ""); - I_Method0(osgUtil::IncrementalCompileOperation::CompileSet *, get, - Properties::NON_VIRTUAL, - __T_P1__get, - "", - ""); - I_Method0(bool, valid, - Properties::NON_VIRTUAL, - __bool__valid, - "", - ""); - I_Method0(osgUtil::IncrementalCompileOperation::CompileSet *, release, - Properties::NON_VIRTUAL, - __T_P1__release, - "", - ""); - I_Method1(void, swap, IN, osg::ref_ptr< osgUtil::IncrementalCompileOperation::CompileSet > &, rp, - Properties::NON_VIRTUAL, - __void__swap__ref_ptr_R1, - "", - ""); - I_SimpleProperty(osgUtil::IncrementalCompileOperation::CompileSet *, , - __T_P1__get, - 0); -END_REFLECTOR - -STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osg::Drawable > >) - -STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osg::Program > >) - -STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osg::Texture > >) - -STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osgUtil::IncrementalCompileOperation::CompileSet > >) - -STD_MAP_REFLECTOR(std::map< osg::GraphicsContext * COMMA osgUtil::IncrementalCompileOperation::CompileData >) - -STD_SET_REFLECTOR(std::set< osg::GraphicsContext * >) - diff --git a/src/osgWrappers/osgUtil/Optimizer.cpp b/src/osgWrappers/osgUtil/Optimizer.cpp index 8d0918579..da757bf27 100644 --- a/src/osgWrappers/osgUtil/Optimizer.cpp +++ b/src/osgWrappers/osgUtil/Optimizer.cpp @@ -77,6 +77,7 @@ BEGIN_ENUM_REFLECTOR(osgUtil::Optimizer::OptimizationOptions) I_EnumLabel(osgUtil::Optimizer::SHARE_DUPLICATE_STATE); I_EnumLabel(osgUtil::Optimizer::MERGE_GEOMETRY); I_EnumLabel(osgUtil::Optimizer::CHECK_GEOMETRY); + I_EnumLabel(osgUtil::Optimizer::MAKE_FAST_GEOMETRY); I_EnumLabel(osgUtil::Optimizer::SPATIALIZE_GROUPS); I_EnumLabel(osgUtil::Optimizer::COPY_SHARED_NODES); I_EnumLabel(osgUtil::Optimizer::TRISTRIP_GEOMETRY); @@ -432,6 +433,26 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::IsOperationPermissibleForObjectCallba ""); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::MakeFastGeometryVisitor) + I_DeclaringFile("osgUtil/Optimizer"); + I_BaseType(osgUtil::BaseOptimizerVisitor); + I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0, + Properties::NON_EXPLICIT, + ____MakeFastGeometryVisitor__Optimizer_P1, + "default to traversing all children. ", + ""); + I_Method1(void, apply, IN, osg::Geode &, geode, + Properties::VIRTUAL, + __void__apply__osg_Geode_R1, + "", + ""); + I_Method1(void, checkGeode, IN, osg::Geode &, geode, + Properties::NON_VIRTUAL, + __void__checkGeode__osg_Geode_R1, + "", + ""); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::MergeGeodesVisitor) I_DeclaringFile("osgUtil/Optimizer"); I_BaseType(osgUtil::BaseOptimizerVisitor); diff --git a/src/osgWrappers/osgUtil/Statistics.cpp b/src/osgWrappers/osgUtil/Statistics.cpp index 7ba071784..f07d20583 100644 --- a/src/osgWrappers/osgUtil/Statistics.cpp +++ b/src/osgWrappers/osgUtil/Statistics.cpp @@ -334,6 +334,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::StatsVisitor) I_PublicMemberProperty(unsigned int, _numInstancedGeode); I_PublicMemberProperty(unsigned int, _numInstancedDrawable); I_PublicMemberProperty(unsigned int, _numInstancedGeometry); + I_PublicMemberProperty(unsigned int, _numInstancedFastGeometry); I_PublicMemberProperty(unsigned int, _numInstancedStateSet); I_PublicMemberProperty(osgUtil::StatsVisitor::NodeSet, _groupSet); I_PublicMemberProperty(osgUtil::StatsVisitor::NodeSet, _transformSet); @@ -342,6 +343,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::StatsVisitor) I_PublicMemberProperty(osgUtil::StatsVisitor::NodeSet, _geodeSet); I_PublicMemberProperty(osgUtil::StatsVisitor::DrawableSet, _drawableSet); I_PublicMemberProperty(osgUtil::StatsVisitor::DrawableSet, _geometrySet); + I_PublicMemberProperty(osgUtil::StatsVisitor::DrawableSet, _fastGeometrySet); I_PublicMemberProperty(osgUtil::StatsVisitor::StateSetSet, _statesetSet); I_PublicMemberProperty(osgUtil::Statistics, _uniqueStats); I_PublicMemberProperty(osgUtil::Statistics, _instancedStats); diff --git a/src/osgWrappers/osgViewer/View.cpp b/src/osgWrappers/osgViewer/View.cpp index 02777c02d..802da076c 100644 --- a/src/osgWrappers/osgViewer/View.cpp +++ b/src/osgWrappers/osgViewer/View.cpp @@ -196,6 +196,11 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::View) __void__addEventHandler__osgGA_GUIEventHandler_P1, "Add an EventHandler that adds handling of events to the View. ", ""); + I_Method1(void, removeEventHandler, IN, osgGA::GUIEventHandler *, eventHandler, + Properties::NON_VIRTUAL, + __void__removeEventHandler__osgGA_GUIEventHandler_P1, + "Remove an EventHandler from View. ", + ""); I_Method0(osgViewer::View::EventHandlers &, getEventHandlers, Properties::NON_VIRTUAL, __EventHandlers_R1__getEventHandlers, diff --git a/src/osgWrappers/osgViewer/ViewerBase.cpp b/src/osgWrappers/osgViewer/ViewerBase.cpp index 4ddf54366..5d39098e6 100644 --- a/src/osgWrappers/osgViewer/ViewerBase.cpp +++ b/src/osgWrappers/osgViewer/ViewerBase.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include