diff --git a/VisualStudio/osgWrappers/osg/wrapper_osg.dsp b/VisualStudio/osgWrappers/osg/wrapper_osg.dsp index fbe0f1237..6a6f29abe 100644 --- a/VisualStudio/osgWrappers/osg/wrapper_osg.dsp +++ b/VisualStudio/osgWrappers/osg/wrapper_osg.dsp @@ -267,6 +267,10 @@ SOURCE=..\..\..\src\osgWrappers\osg\Geometry.cpp SOURCE=..\..\..\src\osgWrappers\osg\GraphicsContext.cpp # End Source File +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osg\GraphicsThread.cpp +# End Source File + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\Group.cpp # End Source File diff --git a/VisualStudio/osgWrappers/osgSim/wrapper_osgSim.dsp b/VisualStudio/osgWrappers/osgSim/wrapper_osgSim.dsp index 3c11ba1dc..1d59403c0 100644 --- a/VisualStudio/osgWrappers/osgSim/wrapper_osgSim.dsp +++ b/VisualStudio/osgWrappers/osgSim/wrapper_osgSim.dsp @@ -139,6 +139,10 @@ SOURCE=..\..\..\src\osgWrappers\osgSim\LightPointSystem.cpp SOURCE=..\..\..\src\osgWrappers\osgSim\MultiSwitch.cpp # End Source File +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osgSim\OverlayNode.cpp +# End Source File + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osgSim\ScalarBar.cpp # End Source File diff --git a/VisualStudio/osgWrappers/osgUtil/wrapper_osgUtil.dsp b/VisualStudio/osgWrappers/osgUtil/wrapper_osgUtil.dsp index f80102003..120f0a21a 100644 --- a/VisualStudio/osgWrappers/osgUtil/wrapper_osgUtil.dsp +++ b/VisualStudio/osgWrappers/osgUtil/wrapper_osgUtil.dsp @@ -131,6 +131,10 @@ SOURCE=..\..\..\src\osgWrappers\osgUtil\IntersectVisitor.cpp SOURCE=..\..\..\src\osgWrappers\osgUtil\Optimizer.cpp # End Source File +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osgUtil\PositionalStateContainer.cpp +# End Source File + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osgUtil\ReflectionMapGenerator.cpp # End Source File @@ -151,14 +155,6 @@ SOURCE=..\..\..\src\osgWrappers\osgUtil\RenderLeaf.cpp SOURCE=..\..\..\src\osgWrappers\osgUtil\RenderStage.cpp # End Source File -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osgUtil\RenderStageLighting.cpp -# End Source File - -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osgUtil\RenderToTextureStage.cpp -# End Source File - # Begin Source File SOURCE=..\..\..\src\osgWrappers\osgUtil\SceneView.cpp # End Source File diff --git a/src/osgWrappers/osg/CameraNode.cpp b/src/osgWrappers/osg/CameraNode.cpp index ed422bad6..6a02347e7 100644 --- a/src/osgWrappers/osg/CameraNode.cpp +++ b/src/osgWrappers/osg/CameraNode.cpp @@ -32,7 +32,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< GLenum >, osg::CameraNode::DrawBufferList); +TYPE_NAME_ALIAS(std::vector< GLenum >, osg::CameraNode::RenderBufferList); TYPE_NAME_ALIAS(std::map< osg::CameraNode::BufferComponent COMMA osg::CameraNode::Attachment >, osg::CameraNode::BufferAttachmentMap); @@ -113,14 +113,16 @@ BEGIN_OBJECT_REFLECTOR(osg::CameraNode) I_Method0(osg::Matrixd, getInverseViewMatrix); I_Method1(void, setRenderOrder, IN, osg::CameraNode::RenderOrder, order); I_Method0(osg::CameraNode::RenderOrder, getRenderOrder); - I_Method1(void, setRenderTargetImplmentation, IN, osg::CameraNode::RenderTargetImplementation, impl); - I_Method0(osg::CameraNode::RenderTargetImplementation, getRenderTargetImplmentation); - I_Method2(void, setDrawBuffer, IN, unsigned int, pos, IN, GLenum, buffer); - I_Method1(GLenum, getDrawBuffer, IN, unsigned int, pos); - I_Method0(osg::CameraNode::DrawBufferList &, getDrawBufferList); - I_Method0(const osg::CameraNode::DrawBufferList &, getDrawBufferList); + I_Method1(void, setRenderTargetImplementation, IN, osg::CameraNode::RenderTargetImplementation, impl); + I_Method0(osg::CameraNode::RenderTargetImplementation, getRenderTargetImplementation); + I_Method1(void, setDrawBuffer, IN, GLenum, buffer); + I_Method0(GLenum, getDrawBuffer); I_Method1(void, setReadBuffer, IN, GLenum, buffer); I_Method0(GLenum, getReadBuffer); + I_Method2(void, setRenderBuffer, IN, unsigned int, pos, IN, GLenum, buffer); + I_Method1(GLenum, getRenderBuffer, IN, unsigned int, pos); + I_Method0(osg::CameraNode::RenderBufferList &, getRenderBufferList); + I_Method0(const osg::CameraNode::RenderBufferList &, getRenderBufferList); I_Method2(void, attach, IN, osg::CameraNode::BufferComponent, buffer, IN, GLenum, internalFormat); I_MethodWithDefaults5(void, attach, IN, osg::CameraNode::BufferComponent, buffer, , IN, osg::Texture *, texture, , IN, unsigned int, level, 0, IN, unsigned int, face, 0, IN, bool, mipMapGeneration, false); I_Method2(void, attach, IN, osg::CameraNode::BufferComponent, buffer, IN, osg::Image *, image); @@ -142,15 +144,16 @@ BEGIN_OBJECT_REFLECTOR(osg::CameraNode) I_Property(const osg::Vec4 &, ClearColor); I_Property(GLbitfield, ClearMask); I_Property(osg::ColorMask *, ColorMask); - I_IndexedProperty1(GLenum, DrawBuffer, unsigned int, pos); - I_ReadOnlyProperty(osg::CameraNode::DrawBufferList &, DrawBufferList); + I_Property(GLenum, DrawBuffer); I_Property(osg::GraphicsContext *, GraphicsContext); I_ReadOnlyProperty(osg::Matrixd, InverseViewMatrix); I_Property(osg::CameraNode::DrawCallback *, PostDrawCallback); I_Property(const osg::Matrixd &, ProjectionMatrix); I_Property(GLenum, ReadBuffer); + I_IndexedProperty1(GLenum, RenderBuffer, unsigned int, pos); + I_ReadOnlyProperty(osg::CameraNode::RenderBufferList &, RenderBufferList); I_Property(osg::CameraNode::RenderOrder, RenderOrder); - I_Property(osg::CameraNode::RenderTargetImplementation, RenderTargetImplmentation); + I_Property(osg::CameraNode::RenderTargetImplementation, RenderTargetImplementation); I_Property(osg::Object *, RenderingCache); I_Property(osg::CameraNode::TransformOrder, TransformOrder); I_Property(const osg::Matrixd &, ViewMatrix); diff --git a/src/osgWrappers/osg/CullingSet.cpp b/src/osgWrappers/osg/CullingSet.cpp index a8d538332..d6a76648e 100644 --- a/src/osgWrappers/osg/CullingSet.cpp +++ b/src/osgWrappers/osg/CullingSet.cpp @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -27,6 +28,10 @@ #undef OUT #endif +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::ShadowVolumeOccluder >, osg::CullingSet::OccluderList); TYPE_NAME_ALIAS(unsigned int, osg::CullingSet::Mask); @@ -55,6 +60,9 @@ BEGIN_OBJECT_REFLECTOR(osg::CullingSet) I_Method1(void, setFrustum, IN, osg::Polytope &, cv); I_Method0(osg::Polytope &, getFrustum); I_Method0(const osg::Polytope &, getFrustum); + I_Method2(void, addStateFrustum, IN, osg::StateSet *, stateset, IN, osg::Polytope &, polytope); + I_Method1(void, getStateFrustumList, IN, osg::CullingSet::StateFrustumList &, sfl); + I_Method0(osg::CullingSet::StateFrustumList &, getStateFrustumList); I_Method1(void, addOccluder, IN, osg::ShadowVolumeOccluder &, cv); I_Method1(void, setPixelSizeVector, IN, const osg::Vec4 &, v); I_Method0(osg::Vec4 &, getPixelSizeVector); @@ -64,6 +72,8 @@ BEGIN_OBJECT_REFLECTOR(osg::CullingSet) I_Method0(float, getSmallFeatureCullingPixelSize); I_Method2(float, pixelSize, IN, const osg::Vec3 &, v, IN, float, radius); I_Method1(float, pixelSize, IN, const osg::BoundingSphere &, bs); + I_Method2(float, clampedPixelSize, IN, const osg::Vec3 &, v, IN, float, radius); + I_Method1(float, clampedPixelSize, IN, const osg::BoundingSphere &, bs); I_Method1(bool, isCulled, IN, const std::vector< osg::Vec3 > &, vertices); I_Method1(bool, isCulled, IN, const osg::BoundingBox &, bb); I_Method1(bool, isCulled, IN, const osg::BoundingSphere &, bs); @@ -76,5 +86,22 @@ BEGIN_OBJECT_REFLECTOR(osg::CullingSet) I_Property(osg::Polytope &, Frustum); I_Property(const osg::Vec4 &, PixelSizeVector); I_Property(float, SmallFeatureCullingPixelSize); + I_ReadOnlyProperty(osg::CullingSet::StateFrustumList &, StateFrustumList); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::StateSet >) + I_Constructor0(); + I_Constructor1(IN, osg::StateSet *, t); + I_Constructor1(IN, const osg::ref_ptr< osg::StateSet > &, rp); + I_Method0(bool, valid); + I_Method0(osg::StateSet *, get); + I_Method0(const osg::StateSet *, get); + I_Method0(osg::StateSet *, take); + I_Method0(osg::StateSet *, release); + I_ReadOnlyProperty(osg::StateSet *, ); +END_REFLECTOR + +STD_PAIR_REFLECTOR(std::pair< osg::ref_ptr< osg::StateSet > COMMA osg::Polytope >); + +STD_VECTOR_REFLECTOR(std::vector< osg::CullingSet::StateFrustumPair >); + diff --git a/src/osgWrappers/osg/Drawable.cpp b/src/osgWrappers/osg/Drawable.cpp index 038498d85..eac971ba1 100644 --- a/src/osgWrappers/osg/Drawable.cpp +++ b/src/osgWrappers/osg/Drawable.cpp @@ -44,8 +44,8 @@ BEGIN_ENUM_REFLECTOR(osg::Drawable::AttributeTypes) I_EnumLabel(osg::Drawable::COLORS); I_EnumLabel(osg::Drawable::SECONDARY_COLORS); I_EnumLabel(osg::Drawable::FOG_COORDS); - I_EnumLabel(osg::Drawable::ATTIBUTE_6); - I_EnumLabel(osg::Drawable::ATTIBUTE_7); + I_EnumLabel(osg::Drawable::ATTRIBUTE_6); + I_EnumLabel(osg::Drawable::ATTRIBUTE_7); I_EnumLabel(osg::Drawable::TEXTURE_COORDS); I_EnumLabel(osg::Drawable::TEXTURE_COORDS_0); I_EnumLabel(osg::Drawable::TEXTURE_COORDS_1); @@ -90,6 +90,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable) I_Method0(bool, getSupportsDisplayList); I_Method1(void, setUseDisplayList, IN, bool, flag); I_Method0(bool, getUseDisplayList); + I_Method1(GLuint &, getDisplayList, IN, unsigned int, contextID); I_Method1(void, setUseVertexBufferObjects, IN, bool, flag); I_Method0(bool, getUseVertexBufferObjects); I_Method0(void, dirtyDisplayList); diff --git a/src/osgWrappers/osg/FrameBufferObject.cpp b/src/osgWrappers/osg/FrameBufferObject.cpp index c278c446c..ee7a093bb 100644 --- a/src/osgWrappers/osg/FrameBufferObject.cpp +++ b/src/osgWrappers/osg/FrameBufferObject.cpp @@ -65,6 +65,7 @@ BEGIN_VALUE_REFLECTOR(osg::FrameBufferAttachment) I_ConstructorWithDefaults3(IN, osg::TextureCubeMap *, target, , IN, int, face, , IN, int, level, 0); I_Constructor1(IN, osg::TextureRectangle *, target); I_Constructor1(IN, osg::CameraNode::Attachment &, attachment); + I_Method2(void, createRequiredTexturesAndApplyGenerateMipMap, IN, osg::State &, state, IN, const osg::FBOExtensions *, ext); I_Method3(void, attach, IN, osg::State &, state, IN, GLenum, attachment_point, IN, const osg::FBOExtensions *, ext); I_Method1(int, compare, IN, const osg::FrameBufferAttachment &, fa); END_REFLECTOR diff --git a/src/osgWrappers/osg/GNUmakefile b/src/osgWrappers/osg/GNUmakefile index f07571698..24de2f40f 100644 --- a/src/osgWrappers/osg/GNUmakefile +++ b/src/osgWrappers/osg/GNUmakefile @@ -45,6 +45,7 @@ CXXFILES =\ Geode.cpp\ Geometry.cpp\ GraphicsContext.cpp\ + GraphicsThread.cpp\ Group.cpp\ Image.cpp\ ImageStream.cpp\ diff --git a/src/osgWrappers/osg/GraphicsContext.cpp b/src/osgWrappers/osg/GraphicsContext.cpp index 7f07cc3c0..ffee7b1bb 100644 --- a/src/osgWrappers/osg/GraphicsContext.cpp +++ b/src/osgWrappers/osg/GraphicsContext.cpp @@ -10,6 +10,7 @@ #include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -26,17 +27,32 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext) I_Method1(void, setState, IN, osg::State *, state); I_Method0(osg::State *, getState); I_Method0(const osg::State *, getState); - I_Method0(bool, isCurrent); - I_Method0(void, release); + I_Method0(bool, realize); + I_MethodWithDefaults1(void, close, IN, bool, callCloseImplementation, true); + I_Method0(void, swapBuffers); + I_Method0(bool, isRealized); I_Method0(void, makeCurrent); I_Method1(void, makeContextCurrent, IN, osg::GraphicsContext *, readContext); + I_Method0(void, releaseContext); + I_Method0(bool, isCurrent); I_Method1(void, bindPBufferToTexture, IN, GLenum, buffer); - I_Method0(void, swapBuffers); + I_Method0(void, createGraphicsThread); + I_Method1(void, setGraphicsThread, IN, osg::GraphicsThread *, gt); + I_Method0(osg::GraphicsThread *, getGraphicsThread); + I_Method0(const osg::GraphicsThread *, getGraphicsThread); + I_Method0(bool, realizeImplementation); + I_Method0(bool, isRealizedImplementation); + I_Method0(void, closeImplementation); + I_Method0(void, makeCurrentImplementation); + I_Method1(void, makeContextCurrentImplementation, IN, osg::GraphicsContext *, readContext); + I_Method1(void, bindPBufferToTextureImplementation, IN, GLenum, buffer); + I_Method0(void, swapBuffersImplementation); + I_Property(osg::GraphicsThread *, GraphicsThread); I_Property(osg::State *, State); I_ReadOnlyProperty(const osg::GraphicsContext::Traits *, Traits); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext::CreateGraphicContexCallback) +BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext::CreateGraphicContextCallback) I_BaseType(osg::Referenced); I_Constructor0(); I_Method1(osg::GraphicsContext *, createGraphicsContext, IN, osg::GraphicsContext::Traits *, traits); diff --git a/src/osgWrappers/osg/GraphicsThread.cpp b/src/osgWrappers/osg/GraphicsThread.cpp new file mode 100644 index 000000000..af7909714 --- /dev/null +++ b/src/osgWrappers/osg/GraphicsThread.cpp @@ -0,0 +1,73 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#include +#include + +#include +#include + +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_ENUM_REFLECTOR(osg::BarrierOperation::PreBlockOp) + I_EnumLabel(osg::BarrierOperation::NO_OPERATION); + I_EnumLabel(osg::BarrierOperation::GL_FLUSH); + I_EnumLabel(osg::BarrierOperation::GL_FINISH); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osg::BarrierOperation) + I_BaseType(osg::GraphicsThread::Operation); + I_ConstructorWithDefaults2(IN, int, numThreads, , IN, osg::BarrierOperation::PreBlockOp, op, osg::BarrierOperation::NO_OPERATION); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osg::Block) + I_VirtualBaseType(osg::Referenced); + I_Constructor0(); + I_Method0(void, block); + I_Method0(void, release); + I_Method0(void, reset); + I_Method1(void, set, IN, bool, doRelease); + I_WriteOnlyProperty(bool, ); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osg::GraphicsThread) + I_BaseType(osg::Referenced); + I_Constructor0(); + I_MethodWithDefaults2(void, add, IN, osg::GraphicsThread::Operation *, operation, , IN, bool, waitForCompletion, false); + I_Method0(void, run); + I_Method0(int, cancel); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osg::GraphicsThread::Operation) + I_VirtualBaseType(osg::Referenced); + I_Constructor2(IN, const std::string &, name, IN, bool, keep); + I_Method1(void, setName, IN, const std::string &, name); + I_Method0(const std::string &, getName); + I_Method1(void, setKeep, IN, bool, keep); + I_Method0(bool, getKeep); + I_Property(bool, Keep); + I_Property(const std::string &, Name); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osg::ReleaseContext_Block_MakeCurrentOperation) + I_BaseType(osg::GraphicsThread::Operation); + I_BaseType(osg::Block); + I_Constructor0(); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osg::SwapBuffersOperation) + I_BaseType(osg::GraphicsThread::Operation); + I_Constructor0(); +END_REFLECTOR + diff --git a/src/osgWrappers/osg/Plane.cpp b/src/osgWrappers/osg/Plane.cpp index 92ff3f0c9..9b971a98e 100644 --- a/src/osgWrappers/osg/Plane.cpp +++ b/src/osgWrappers/osg/Plane.cpp @@ -35,6 +35,7 @@ BEGIN_VALUE_REFLECTOR(osg::Plane) I_Constructor1(IN, const osg::Vec4 &, vec); I_Constructor2(IN, const osg::Vec3 &, norm, IN, float, d); I_Constructor3(IN, const osg::Vec3 &, v1, IN, const osg::Vec3 &, v2, IN, const osg::Vec3 &, v3); + I_Constructor2(IN, const osg::Vec3 &, norm, IN, const osg::Vec3 &, point); I_Method1(void, set, IN, const osg::Plane &, pl); I_Method4(void, set, IN, float, a, IN, float, b, IN, float, c, IN, float, d); I_Method1(void, set, IN, const osg::Vec4 &, vec); diff --git a/src/osgWrappers/osg/PolygonMode.cpp b/src/osgWrappers/osg/PolygonMode.cpp index 2386180fa..c7589bdba 100644 --- a/src/osgWrappers/osg/PolygonMode.cpp +++ b/src/osgWrappers/osg/PolygonMode.cpp @@ -38,6 +38,7 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::PolygonMode) I_BaseType(osg::StateAttribute); I_Constructor0(); + I_Constructor2(IN, osg::PolygonMode::Face, face, IN, osg::PolygonMode::Mode, mode); I_ConstructorWithDefaults2(IN, const osg::PolygonMode &, pm, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); I_Method0(osg::Object *, cloneType); I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); diff --git a/src/osgWrappers/osg/Scissor.cpp b/src/osgWrappers/osg/Scissor.cpp new file mode 100644 index 000000000..2241f24ad --- /dev/null +++ b/src/osgWrappers/osg/Scissor.cpp @@ -0,0 +1,52 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#include +#include + +#include +#include +#include +#include +#include + +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osg::Scissor) + I_BaseType(osg::StateAttribute); + I_Constructor0(); + I_Constructor4(IN, int, x, IN, int, y, IN, int, width, IN, int, height); + I_ConstructorWithDefaults2(IN, const osg::Scissor &, vp, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Method0(osg::StateAttribute::Type, getType); + I_Method1(int, compare, IN, const osg::StateAttribute &, sa); + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); + I_Method4(void, setScissor, IN, int, x, IN, int, y, IN, int, width, IN, int, height); + I_Method4(void, getScissor, IN, int &, x, IN, int &, y, IN, int &, width, IN, int &, height); + I_Method0(int &, x); + I_Method0(int, x); + I_Method0(int &, y); + I_Method0(int, y); + I_Method0(int &, width); + I_Method0(int, width); + I_Method0(int &, height); + I_Method0(int, height); + I_Method1(void, apply, IN, osg::State &, state); + I_ReadOnlyProperty(osg::StateAttribute::Type, Type); +END_REFLECTOR + diff --git a/src/osgWrappers/osg/Texture.cpp b/src/osgWrappers/osg/Texture.cpp index 0965187d7..897bc15bb 100644 --- a/src/osgWrappers/osg/Texture.cpp +++ b/src/osgWrappers/osg/Texture.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -88,6 +89,8 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture) I_Method0(const char *, className); I_Method0(osg::StateAttribute::Type, getType); I_Method0(bool, isTextureAttribute); + I_Method0(GLenum, getTextureTarget); + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); I_Method2(void, setWrap, IN, osg::Texture::WrapParameter, which, IN, osg::Texture::WrapMode, wrap); I_Method1(osg::Texture::WrapMode, getWrap, IN, osg::Texture::WrapParameter, which); I_Method1(void, setBorderColor, IN, const osg::Vec4 &, color); @@ -127,6 +130,8 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture) I_Method1(osg::Image *, getImage, IN, unsigned int, face); I_Method1(const osg::Image *, getImage, IN, unsigned int, face); I_Method0(unsigned int, getNumImages); + I_Method1(void, setReadPBuffer, IN, osg::GraphicsContext *, context); + I_Method0(osg::GraphicsContext *, getReadPBuffer); I_Method1(void, apply, IN, osg::State &, state); I_Method1(void, compileGLObjects, IN, osg::State &, state); I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); @@ -141,11 +146,13 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture) I_Property(GLint, InternalFormat); I_Property(osg::Texture::InternalFormatMode, InternalFormatMode); I_Property(float, MaxAnisotropy); + I_Property(osg::GraphicsContext *, ReadPBuffer); I_Property(bool, ResizeNonPowerOfTwoHint); I_Property(float, ShadowAmbient); I_Property(osg::Texture::ShadowCompareFunc, ShadowCompareFunc); I_WriteOnlyProperty(bool, ShadowComparison); I_Property(osg::Texture::ShadowTextureMode, ShadowTextureMode); + I_ReadOnlyProperty(GLenum, TextureTarget); I_ReadOnlyProperty(osg::StateAttribute::Type, Type); I_Property(bool, UnRefImageDataAfterApply); I_Property(bool, UseHardwareMipMapGeneration); diff --git a/src/osgWrappers/osg/Texture1D.cpp b/src/osgWrappers/osg/Texture1D.cpp index ad9f40065..88cb8ad15 100644 --- a/src/osgWrappers/osg/Texture1D.cpp +++ b/src/osgWrappers/osg/Texture1D.cpp @@ -35,7 +35,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture1D) I_Method0(const char *, className); I_Method0(osg::StateAttribute::Type, getType); I_Method1(int, compare, IN, const osg::StateAttribute &, rhs); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); + I_Method0(GLenum, getTextureTarget); I_Method1(void, setImage, IN, osg::Image *, image); I_Method0(osg::Image *, getImage); I_Method0(const osg::Image *, getImage); @@ -58,6 +58,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture1D) I_WriteOnlyProperty(unsigned int, NumMipmapLevels); I_Property(osg::Texture1D::SubloadCallback *, SubloadCallback); I_WriteOnlyProperty(int, TextureSize); + I_ReadOnlyProperty(GLenum, TextureTarget); I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/Texture2D.cpp b/src/osgWrappers/osg/Texture2D.cpp index f69368ba4..8fcbcaa22 100644 --- a/src/osgWrappers/osg/Texture2D.cpp +++ b/src/osgWrappers/osg/Texture2D.cpp @@ -36,7 +36,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture2D) I_Method0(const char *, className); I_Method0(osg::StateAttribute::Type, getType); I_Method1(int, compare, IN, const osg::StateAttribute &, rhs); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); + I_Method0(GLenum, getTextureTarget); I_Method1(void, setImage, IN, osg::Image *, image); I_Method0(osg::Image *, getImage); I_Method0(const osg::Image *, getImage); @@ -62,6 +62,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture2D) I_WriteOnlyProperty(unsigned int, NumMipmapLevels); I_Property(osg::Texture2D::SubloadCallback *, SubloadCallback); I_Property(int, TextureHeight); + I_ReadOnlyProperty(GLenum, TextureTarget); I_Property(int, TextureWidth); I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/Texture3D.cpp b/src/osgWrappers/osg/Texture3D.cpp index 05f118f03..23c2cecd0 100644 --- a/src/osgWrappers/osg/Texture3D.cpp +++ b/src/osgWrappers/osg/Texture3D.cpp @@ -35,7 +35,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture3D) I_Method0(const char *, className); I_Method0(osg::StateAttribute::Type, getType); I_Method1(int, compare, IN, const osg::StateAttribute &, rhs); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); + I_Method0(GLenum, getTextureTarget); I_Method1(void, setImage, IN, osg::Image *, image); I_Method0(osg::Image *, getImage); I_Method0(const osg::Image *, getImage); @@ -56,6 +56,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture3D) I_Property(osg::Image *, Image); I_WriteOnlyProperty(unsigned int, NumMipmapLevels); I_Property(osg::Texture3D::SubloadCallback *, SubloadCallback); + I_ReadOnlyProperty(GLenum, TextureTarget); I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/TextureCubeMap.cpp b/src/osgWrappers/osg/TextureCubeMap.cpp index 31a40ecb2..051fe9000 100644 --- a/src/osgWrappers/osg/TextureCubeMap.cpp +++ b/src/osgWrappers/osg/TextureCubeMap.cpp @@ -44,7 +44,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TextureCubeMap) I_Method0(const char *, className); I_Method0(osg::StateAttribute::Type, getType); I_Method1(int, compare, IN, const osg::StateAttribute &, rhs); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); + I_Method0(GLenum, getTextureTarget); I_Method2(void, setImage, IN, unsigned int, face, IN, osg::Image *, image); I_Method1(osg::Image *, getImage, IN, unsigned int, face); I_Method1(const osg::Image *, getImage, IN, unsigned int, face); @@ -62,6 +62,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TextureCubeMap) I_ArrayProperty_G(osg::Image *, Image, Images, unsigned int, void); I_WriteOnlyProperty(unsigned int, NumMipmapLevels); I_Property(osg::TextureCubeMap::SubloadCallback *, SubloadCallback); + I_ReadOnlyProperty(GLenum, TextureTarget); I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/TextureRectangle.cpp b/src/osgWrappers/osg/TextureRectangle.cpp index 80820cb56..2239d8b1e 100644 --- a/src/osgWrappers/osg/TextureRectangle.cpp +++ b/src/osgWrappers/osg/TextureRectangle.cpp @@ -36,7 +36,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TextureRectangle) I_Method0(const char *, className); I_Method0(osg::StateAttribute::Type, getType); I_Method1(int, compare, IN, const osg::StateAttribute &, rhs); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); + I_Method0(GLenum, getTextureTarget); I_Method1(void, setImage, IN, osg::Image *, image); I_Method0(osg::Image *, getImage); I_Method0(const osg::Image *, getImage); @@ -55,6 +55,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TextureRectangle) I_Method1(void, apply, IN, osg::State &, state); I_Property(osg::Image *, Image); I_Property(osg::TextureRectangle::SubloadCallback *, SubloadCallback); + I_ReadOnlyProperty(GLenum, TextureTarget); I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/Vec2b.cpp b/src/osgWrappers/osg/Vec2b.cpp index 4ce890ae5..e399a18fc 100644 --- a/src/osgWrappers/osg/Vec2b.cpp +++ b/src/osgWrappers/osg/Vec2b.cpp @@ -21,17 +21,25 @@ #include +TYPE_NAME_ALIAS(char, osg::Vec2b::value_type); + BEGIN_VALUE_REFLECTOR(osg::Vec2b) I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined I_Comparator(osgIntrospection::PartialOrderComparator); // user-defined I_Constructor0(); I_Constructor2(IN, char, r, IN, char, g); - I_Method0(char *, ptr); - I_Method0(const char *, ptr); - I_Method2(void, set, IN, char, r, IN, char, g); - I_Method0(char &, r); - I_Method0(char &, g); - I_Method0(char, r); - I_Method0(char, g); + I_Method0(osg::Vec2b::value_type *, ptr); + I_Method0(const osg::Vec2b::value_type *, ptr); + I_Method2(void, set, IN, osg::Vec2b::value_type, x, IN, osg::Vec2b::value_type, y); + I_Method1(void, set, IN, const osg::Vec2b &, rhs); + I_Method0(osg::Vec2b::value_type &, x); + I_Method0(osg::Vec2b::value_type &, y); + I_Method0(osg::Vec2b::value_type, x); + I_Method0(osg::Vec2b::value_type, y); + I_Method0(osg::Vec2b::value_type &, r); + I_Method0(osg::Vec2b::value_type &, g); + I_Method0(osg::Vec2b::value_type, r); + I_Method0(osg::Vec2b::value_type, g); + I_WriteOnlyProperty(const osg::Vec2b &, ); END_REFLECTOR diff --git a/src/osgWrappers/osg/Vec2s.cpp b/src/osgWrappers/osg/Vec2s.cpp index 3ccad7085..4d580fc36 100644 --- a/src/osgWrappers/osg/Vec2s.cpp +++ b/src/osgWrappers/osg/Vec2s.cpp @@ -23,8 +23,19 @@ TYPE_NAME_ALIAS(short, osg::Vec2s::value_type); BEGIN_VALUE_REFLECTOR(osg::Vec2s) I_Constructor0(); - I_Constructor2(IN, osg::Vec2s::value_type, xx, IN, osg::Vec2s::value_type, yy); + I_Constructor2(IN, osg::Vec2s::value_type, x, IN, osg::Vec2s::value_type, y); I_Method0(osg::Vec2s::value_type *, ptr); I_Method0(const osg::Vec2s::value_type *, ptr); + I_Method2(void, set, IN, osg::Vec2s::value_type, x, IN, osg::Vec2s::value_type, y); + I_Method1(void, set, IN, const osg::Vec2s &, rhs); + I_Method0(osg::Vec2s::value_type &, x); + I_Method0(osg::Vec2s::value_type &, y); + I_Method0(osg::Vec2s::value_type, x); + I_Method0(osg::Vec2s::value_type, y); + I_Method0(osg::Vec2s::value_type &, r); + I_Method0(osg::Vec2s::value_type &, g); + I_Method0(osg::Vec2s::value_type, r); + I_Method0(osg::Vec2s::value_type, g); + I_WriteOnlyProperty(const osg::Vec2s &, ); END_REFLECTOR diff --git a/src/osgWrappers/osg/Vec3b.cpp b/src/osgWrappers/osg/Vec3b.cpp index ce0cb8898..24a255531 100644 --- a/src/osgWrappers/osg/Vec3b.cpp +++ b/src/osgWrappers/osg/Vec3b.cpp @@ -21,19 +21,29 @@ #include +TYPE_NAME_ALIAS(char, osg::Vec3b::value_type); + BEGIN_VALUE_REFLECTOR(osg::Vec3b) I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined I_Comparator(osgIntrospection::PartialOrderComparator); // user-defined I_Constructor0(); - I_Constructor3(IN, char, r, IN, char, g, IN, char, b); - I_Method0(char *, ptr); - I_Method0(const char *, ptr); - I_Method3(void, set, IN, char, r, IN, char, g, IN, char, b); - I_Method0(char &, r); - I_Method0(char &, g); - I_Method0(char &, b); - I_Method0(char, r); - I_Method0(char, g); - I_Method0(char, b); + I_Constructor3(IN, osg::Vec3b::value_type, r, IN, osg::Vec3b::value_type, g, IN, osg::Vec3b::value_type, b); + I_Method0(osg::Vec3b::value_type *, ptr); + I_Method0(const osg::Vec3b::value_type *, ptr); + I_Method3(void, set, IN, osg::Vec3b::value_type, r, IN, osg::Vec3b::value_type, g, IN, osg::Vec3b::value_type, b); + I_Method1(void, set, IN, const osg::Vec3b &, rhs); + I_Method0(osg::Vec3b::value_type &, x); + I_Method0(osg::Vec3b::value_type &, y); + I_Method0(osg::Vec3b::value_type &, z); + I_Method0(osg::Vec3b::value_type, x); + I_Method0(osg::Vec3b::value_type, y); + I_Method0(osg::Vec3b::value_type, z); + I_Method0(osg::Vec3b::value_type &, r); + I_Method0(osg::Vec3b::value_type &, g); + I_Method0(osg::Vec3b::value_type &, b); + I_Method0(osg::Vec3b::value_type, r); + I_Method0(osg::Vec3b::value_type, g); + I_Method0(osg::Vec3b::value_type, b); + I_WriteOnlyProperty(const osg::Vec3b &, ); END_REFLECTOR diff --git a/src/osgWrappers/osg/Vec3s.cpp b/src/osgWrappers/osg/Vec3s.cpp index 47dee7e40..b2de84adb 100644 --- a/src/osgWrappers/osg/Vec3s.cpp +++ b/src/osgWrappers/osg/Vec3s.cpp @@ -23,8 +23,23 @@ TYPE_NAME_ALIAS(short, osg::Vec3s::value_type); BEGIN_VALUE_REFLECTOR(osg::Vec3s) I_Constructor0(); - I_Constructor3(IN, osg::Vec3s::value_type, xx, IN, osg::Vec3s::value_type, yy, IN, osg::Vec3s::value_type, zz); + I_Constructor3(IN, osg::Vec3s::value_type, r, IN, osg::Vec3s::value_type, g, IN, osg::Vec3s::value_type, b); I_Method0(osg::Vec3s::value_type *, ptr); I_Method0(const osg::Vec3s::value_type *, ptr); + I_Method3(void, set, IN, osg::Vec3s::value_type, r, IN, osg::Vec3s::value_type, g, IN, osg::Vec3s::value_type, b); + I_Method1(void, set, IN, const osg::Vec3s &, rhs); + I_Method0(osg::Vec3s::value_type &, x); + I_Method0(osg::Vec3s::value_type &, y); + I_Method0(osg::Vec3s::value_type &, z); + I_Method0(osg::Vec3s::value_type, x); + I_Method0(osg::Vec3s::value_type, y); + I_Method0(osg::Vec3s::value_type, z); + I_Method0(osg::Vec3s::value_type &, r); + I_Method0(osg::Vec3s::value_type &, g); + I_Method0(osg::Vec3s::value_type &, b); + I_Method0(osg::Vec3s::value_type, r); + I_Method0(osg::Vec3s::value_type, g); + I_Method0(osg::Vec3s::value_type, b); + I_WriteOnlyProperty(const osg::Vec3s &, ); END_REFLECTOR diff --git a/src/osgWrappers/osg/Vec4b.cpp b/src/osgWrappers/osg/Vec4b.cpp index 76d76d23f..b0ee6e017 100644 --- a/src/osgWrappers/osg/Vec4b.cpp +++ b/src/osgWrappers/osg/Vec4b.cpp @@ -21,21 +21,31 @@ #include +TYPE_NAME_ALIAS(char, osg::Vec4b::value_type); + BEGIN_VALUE_REFLECTOR(osg::Vec4b) I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined I_Comparator(osgIntrospection::PartialOrderComparator); // user-defined I_Constructor0(); - I_Constructor4(IN, char, r, IN, char, g, IN, char, b, IN, char, a); - I_Method0(char *, ptr); - I_Method0(const char *, ptr); - I_Method4(void, set, IN, char, r, IN, char, g, IN, char, b, IN, char, a); - I_Method0(char &, r); - I_Method0(char &, g); - I_Method0(char &, b); - I_Method0(char &, a); - I_Method0(char, r); - I_Method0(char, g); - I_Method0(char, b); - I_Method0(char, a); + I_Constructor4(IN, osg::Vec4b::value_type, x, IN, osg::Vec4b::value_type, y, IN, osg::Vec4b::value_type, z, IN, osg::Vec4b::value_type, w); + I_Method0(osg::Vec4b::value_type *, ptr); + I_Method0(const osg::Vec4b::value_type *, ptr); + I_Method4(void, set, IN, osg::Vec4b::value_type, x, IN, osg::Vec4b::value_type, y, IN, osg::Vec4b::value_type, z, IN, osg::Vec4b::value_type, w); + I_Method0(osg::Vec4b::value_type &, x); + I_Method0(osg::Vec4b::value_type &, y); + I_Method0(osg::Vec4b::value_type &, z); + I_Method0(osg::Vec4b::value_type &, w); + I_Method0(osg::Vec4b::value_type, x); + I_Method0(osg::Vec4b::value_type, y); + I_Method0(osg::Vec4b::value_type, z); + I_Method0(osg::Vec4b::value_type, w); + I_Method0(osg::Vec4b::value_type &, r); + I_Method0(osg::Vec4b::value_type &, g); + I_Method0(osg::Vec4b::value_type &, b); + I_Method0(osg::Vec4b::value_type &, a); + I_Method0(osg::Vec4b::value_type, r); + I_Method0(osg::Vec4b::value_type, g); + I_Method0(osg::Vec4b::value_type, b); + I_Method0(osg::Vec4b::value_type, a); END_REFLECTOR diff --git a/src/osgWrappers/osg/Vec4d.cpp b/src/osgWrappers/osg/Vec4d.cpp index e33187f40..a01973b49 100644 --- a/src/osgWrappers/osg/Vec4d.cpp +++ b/src/osgWrappers/osg/Vec4d.cpp @@ -43,14 +43,14 @@ BEGIN_VALUE_REFLECTOR(osg::Vec4d) I_Method0(osg::Vec4d::value_type, y); I_Method0(osg::Vec4d::value_type, z); I_Method0(osg::Vec4d::value_type, w); - I_Method0(osg::Vec4d::value_type &, red); - I_Method0(osg::Vec4d::value_type &, green); - I_Method0(osg::Vec4d::value_type &, blue); - I_Method0(osg::Vec4d::value_type &, alpha); - I_Method0(osg::Vec4d::value_type, red); - I_Method0(osg::Vec4d::value_type, green); - I_Method0(osg::Vec4d::value_type, blue); - I_Method0(osg::Vec4d::value_type, alpha); + I_Method0(osg::Vec4d::value_type &, r); + I_Method0(osg::Vec4d::value_type &, g); + I_Method0(osg::Vec4d::value_type &, b); + I_Method0(osg::Vec4d::value_type &, a); + I_Method0(osg::Vec4d::value_type, r); + I_Method0(osg::Vec4d::value_type, g); + I_Method0(osg::Vec4d::value_type, b); + I_Method0(osg::Vec4d::value_type, a); I_Method0(unsigned long, asABGR); I_Method0(unsigned long, asRGBA); I_Method0(bool, valid); diff --git a/src/osgWrappers/osg/Vec4f.cpp b/src/osgWrappers/osg/Vec4f.cpp index c091e6da8..8d9067cd7 100644 --- a/src/osgWrappers/osg/Vec4f.cpp +++ b/src/osgWrappers/osg/Vec4f.cpp @@ -41,14 +41,14 @@ BEGIN_VALUE_REFLECTOR(osg::Vec4f) I_Method0(osg::Vec4f::value_type, y); I_Method0(osg::Vec4f::value_type, z); I_Method0(osg::Vec4f::value_type, w); - I_Method0(osg::Vec4f::value_type &, red); - I_Method0(osg::Vec4f::value_type &, green); - I_Method0(osg::Vec4f::value_type &, blue); - I_Method0(osg::Vec4f::value_type &, alpha); - I_Method0(osg::Vec4f::value_type, red); - I_Method0(osg::Vec4f::value_type, green); - I_Method0(osg::Vec4f::value_type, blue); - I_Method0(osg::Vec4f::value_type, alpha); + I_Method0(osg::Vec4f::value_type &, r); + I_Method0(osg::Vec4f::value_type &, g); + I_Method0(osg::Vec4f::value_type &, b); + I_Method0(osg::Vec4f::value_type &, a); + I_Method0(osg::Vec4f::value_type, r); + I_Method0(osg::Vec4f::value_type, g); + I_Method0(osg::Vec4f::value_type, b); + I_Method0(osg::Vec4f::value_type, a); I_Method0(unsigned long, asABGR); I_Method0(unsigned long, asRGBA); I_Method0(bool, valid); diff --git a/src/osgWrappers/osg/Vec4s.cpp b/src/osgWrappers/osg/Vec4s.cpp index fb2719447..73368e2b5 100644 --- a/src/osgWrappers/osg/Vec4s.cpp +++ b/src/osgWrappers/osg/Vec4s.cpp @@ -23,8 +23,25 @@ TYPE_NAME_ALIAS(short, osg::Vec4s::value_type); BEGIN_VALUE_REFLECTOR(osg::Vec4s) I_Constructor0(); - I_Constructor4(IN, osg::Vec4s::value_type, xx, IN, osg::Vec4s::value_type, yy, IN, osg::Vec4s::value_type, zz, IN, osg::Vec4s::value_type, ww); + I_Constructor4(IN, osg::Vec4s::value_type, x, IN, osg::Vec4s::value_type, y, IN, osg::Vec4s::value_type, z, IN, osg::Vec4s::value_type, w); I_Method0(osg::Vec4s::value_type *, ptr); I_Method0(const osg::Vec4s::value_type *, ptr); + I_Method4(void, set, IN, osg::Vec4s::value_type, x, IN, osg::Vec4s::value_type, y, IN, osg::Vec4s::value_type, z, IN, osg::Vec4s::value_type, w); + I_Method0(osg::Vec4s::value_type &, x); + I_Method0(osg::Vec4s::value_type &, y); + I_Method0(osg::Vec4s::value_type &, z); + I_Method0(osg::Vec4s::value_type &, w); + I_Method0(osg::Vec4s::value_type, x); + I_Method0(osg::Vec4s::value_type, y); + I_Method0(osg::Vec4s::value_type, z); + I_Method0(osg::Vec4s::value_type, w); + I_Method0(osg::Vec4s::value_type &, r); + I_Method0(osg::Vec4s::value_type &, g); + I_Method0(osg::Vec4s::value_type &, b); + I_Method0(osg::Vec4s::value_type &, a); + I_Method0(osg::Vec4s::value_type, r); + I_Method0(osg::Vec4s::value_type, g); + I_Method0(osg::Vec4s::value_type, b); + I_Method0(osg::Vec4s::value_type, a); END_REFLECTOR diff --git a/src/osgWrappers/osg/Vec4ub.cpp b/src/osgWrappers/osg/Vec4ub.cpp index 835573f36..8241a2bf0 100644 --- a/src/osgWrappers/osg/Vec4ub.cpp +++ b/src/osgWrappers/osg/Vec4ub.cpp @@ -21,11 +21,13 @@ #include +TYPE_NAME_ALIAS(unsigned char, osg::Vec4ub::value_type); + BEGIN_VALUE_REFLECTOR(osg::Vec4ub) I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined I_Comparator(osgIntrospection::PartialOrderComparator); // user-defined I_Constructor0(); - I_Constructor4(IN, unsigned char, r, IN, unsigned char, g, IN, unsigned char, b, IN, unsigned char, a); + I_Constructor4(IN, osg::Vec4ub::value_type, x, IN, osg::Vec4ub::value_type, y, IN, osg::Vec4ub::value_type, z, IN, osg::Vec4ub::value_type, w); I_Method0(unsigned char *, ptr); I_Method0(const unsigned char *, ptr); I_Method4(void, set, IN, unsigned char, r, IN, unsigned char, g, IN, unsigned char, b, IN, unsigned char, a); diff --git a/src/osgWrappers/osgDB/DatabasePager.cpp b/src/osgWrappers/osgDB/DatabasePager.cpp index e8ad8eea6..cf05271ac 100644 --- a/src/osgWrappers/osgDB/DatabasePager.cpp +++ b/src/osgWrappers/osgDB/DatabasePager.cpp @@ -10,11 +10,11 @@ #include #include +#include #include #include #include #include -#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -25,16 +25,6 @@ #undef OUT #endif -BEGIN_OBJECT_REFLECTOR(osgDB::Block) - I_BaseType(osg::Referenced); - I_Constructor0(); - I_Method0(void, block); - I_Method0(void, release); - I_Method0(void, reset); - I_Method1(void, set, IN, bool, doRelease); - I_WriteOnlyProperty(bool, ); -END_REFLECTOR - TYPE_NAME_ALIAS(OpenThreads::Thread::ThreadPriority, osgDB::DatabasePager::ThreadPriority); TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::PagedLOD > >, osgDB::DatabasePager::PagedLODList); @@ -62,7 +52,7 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager) I_Method0(bool, getAcceptNewDatabaseRequests); I_Method1(void, setUseFrameBlock, IN, bool, useFrameBlock); I_Method0(bool, getUseFrameBlock); - I_Method0(osgDB::Block *, getFrameBlock); + I_Method0(osg::Block *, getFrameBlock); I_Method1(void, setThreadPriorityDuringFrame, IN, osgDB::DatabasePager::ThreadPriority, duringFrame); I_Method0(osgDB::DatabasePager::ThreadPriority, getThreadPriorityDuringFrame); I_Method1(void, setThreadPriorityOutwithFrame, IN, osgDB::DatabasePager::ThreadPriority, outwithFrame); @@ -99,7 +89,7 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager) I_Property(bool, DeleteRemovedSubgraphsInDatabaseThread); I_Property(bool, DoPreCompile); I_Property(double, ExpiryDelay); - I_ReadOnlyProperty(osgDB::Block *, FrameBlock); + I_ReadOnlyProperty(osg::Block *, FrameBlock); I_Property(unsigned int, MaximumNumOfObjectsToCompilePerFrame); I_Property(double, MinimumTimeAvailableForGLCompileAndDeletePerFrame); I_Property(double, TargetFrameRate); @@ -120,18 +110,6 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::PagedLOD >) I_ReadOnlyProperty(osg::PagedLOD *, ); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::StateSet >) - I_Constructor0(); - I_Constructor1(IN, osg::StateSet *, t); - I_Constructor1(IN, const osg::ref_ptr< osg::StateSet > &, rp); - I_Method0(bool, valid); - I_Method0(osg::StateSet *, get); - I_Method0(const osg::StateSet *, get); - I_Method0(osg::StateSet *, take); - I_Method0(osg::StateSet *, release); - I_ReadOnlyProperty(osg::StateSet *, ); -END_REFLECTOR - STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osg::PagedLOD > >); STD_MAP_REFLECTOR(std::map< unsigned int COMMA osgDB::DatabasePager::DataToCompile >); diff --git a/src/osgWrappers/osgDB/Output.cpp b/src/osgWrappers/osgDB/Output.cpp index 2a3945fc3..72380bbbc 100644 --- a/src/osgWrappers/osgDB/Output.cpp +++ b/src/osgWrappers/osgDB/Output.cpp @@ -11,6 +11,7 @@ #include #include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN diff --git a/src/osgWrappers/osgGA/EventVisitor.cpp b/src/osgWrappers/osgGA/EventVisitor.cpp index 9fbe23e94..0c2ab571b 100644 --- a/src/osgWrappers/osgGA/EventVisitor.cpp +++ b/src/osgWrappers/osgGA/EventVisitor.cpp @@ -44,6 +44,8 @@ BEGIN_OBJECT_REFLECTOR(osgGA::EventVisitor) I_Method0(const osgGA::EventVisitor::EventList &, getEventList); I_Method1(void, addEvent, IN, osgGA::GUIEventAdapter *, event); I_Method1(void, removeEvent, IN, osgGA::GUIEventAdapter *, event); + I_Method0(bool, getEventHandled); + I_Method1(void, setEventHandled, IN, bool, handled); I_Method0(void, reset); I_Method1(void, apply, IN, osg::Node &, node); I_Method1(void, apply, IN, osg::Geode &, node); @@ -56,6 +58,7 @@ BEGIN_OBJECT_REFLECTOR(osgGA::EventVisitor) I_Method1(void, apply, IN, osg::LOD &, node); I_Method1(void, apply, IN, osg::OccluderNode &, node); I_Property(osgGA::GUIActionAdapter *, ActionAdapter); + I_Property(bool, EventHandled); I_Property(const osgGA::EventVisitor::EventList &, EventList); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/ModularEmitter.cpp b/src/osgWrappers/osgParticle/ModularEmitter.cpp index ba6e81a09..0b352d4d0 100644 --- a/src/osgWrappers/osgParticle/ModularEmitter.cpp +++ b/src/osgWrappers/osgParticle/ModularEmitter.cpp @@ -38,6 +38,8 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::ModularEmitter) I_Method0(osgParticle::Counter *, getCounter); I_Method0(const osgParticle::Counter *, getCounter); I_Method1(void, setCounter, IN, osgParticle::Counter *, c); + I_Method0(float, getNumParticlesToCreateMovementCompenstationRatio); + I_Method1(void, setNumParticlesToCreateMovementCompenstationRatio, IN, float, r); I_Method0(osgParticle::Placer *, getPlacer); I_Method0(const osgParticle::Placer *, getPlacer); I_Method1(void, setPlacer, IN, osgParticle::Placer *, p); @@ -45,6 +47,7 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::ModularEmitter) I_Method0(const osgParticle::Shooter *, getShooter); I_Method1(void, setShooter, IN, osgParticle::Shooter *, s); I_Property(osgParticle::Counter *, Counter); + I_WriteOnlyProperty(float, NumParticlesToCreateMovementCompenstationRatio); I_Property(osgParticle::Placer *, Placer); I_Property(osgParticle::Shooter *, Shooter); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp b/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp index 09be77eeb..8309197de 100644 --- a/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp +++ b/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp @@ -40,6 +40,8 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::MultiSegmentPlacer) I_Method3(void, addVertex, IN, float, x, IN, float, y, IN, float, z); I_Method1(void, removeVertex, IN, int, i); I_Method1(void, place, IN, osgParticle::Particle *, P); + I_Method0(osg::Vec3, getControlPosition); + I_ReadOnlyProperty(osg::Vec3, ControlPosition); I_IndexedProperty1(const osg::Vec3 &, Vertex, int, i); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/Particle.cpp b/src/osgWrappers/osgParticle/Particle.cpp index 0fa806698..f2be0e46b 100644 --- a/src/osgWrappers/osgParticle/Particle.cpp +++ b/src/osgWrappers/osgParticle/Particle.cpp @@ -67,6 +67,7 @@ BEGIN_VALUE_REFLECTOR(osgParticle::Particle) I_Method1(void, setVelocity, IN, const osg::Vec3 &, v); I_Method1(void, addVelocity, IN, const osg::Vec3 &, dv); I_Method1(void, transformPositionVelocity, IN, const osg::Matrix &, xform); + I_Method3(void, transformPositionVelocity, IN, const osg::Matrix &, xform1, IN, const osg::Matrix &, xform2, IN, float, r); I_Method1(void, setAngle, IN, const osg::Vec3 &, a); I_Method1(void, setAngularVelocity, IN, const osg::Vec3 &, v); I_Method1(void, addAngularVelocity, IN, const osg::Vec3 &, dv); diff --git a/src/osgWrappers/osgParticle/ParticleProcessor.cpp b/src/osgWrappers/osgParticle/ParticleProcessor.cpp index 8ca45f15d..bcdd0f3b0 100644 --- a/src/osgWrappers/osgParticle/ParticleProcessor.cpp +++ b/src/osgWrappers/osgParticle/ParticleProcessor.cpp @@ -60,6 +60,8 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ParticleProcessor) I_Method1(void, traverse, IN, osg::NodeVisitor &, nv); I_Method0(const osg::Matrix &, getLocalToWorldMatrix); I_Method0(const osg::Matrix &, getWorldToLocalMatrix); + I_Method0(const osg::Matrix &, getPreviousLocalToWorldMatrix); + I_Method0(const osg::Matrix &, getPreviousWorldToLocalMatrix); I_Method1(osg::Vec3, transformLocalToWorld, IN, const osg::Vec3 &, P); I_Method1(osg::Vec3, rotateLocalToWorld, IN, const osg::Vec3 &, P); I_Method1(osg::Vec3, transformWorldToLocal, IN, const osg::Vec3 &, P); @@ -71,6 +73,8 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ParticleProcessor) I_Property(double, LifeTime); I_ReadOnlyProperty(const osg::Matrix &, LocalToWorldMatrix); I_Property(osgParticle::ParticleSystem *, ParticleSystem); + I_ReadOnlyProperty(const osg::Matrix &, PreviousLocalToWorldMatrix); + I_ReadOnlyProperty(const osg::Matrix &, PreviousWorldToLocalMatrix); I_Property(osgParticle::ParticleProcessor::ReferenceFrame, ReferenceFrame); I_Property(double, ResetTime); I_Property(double, StartTime); diff --git a/src/osgWrappers/osgParticle/Placer.cpp b/src/osgWrappers/osgParticle/Placer.cpp index ed1ddf5a9..7c60f3857 100644 --- a/src/osgWrappers/osgParticle/Placer.cpp +++ b/src/osgWrappers/osgParticle/Placer.cpp @@ -11,6 +11,7 @@ #include #include +#include #include #include @@ -30,5 +31,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::Placer) I_Method0(const char *, className); I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); I_Method1(void, place, IN, osgParticle::Particle *, P); + I_Method0(osg::Vec3, getControlPosition); + I_ReadOnlyProperty(osg::Vec3, ControlPosition); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/PointPlacer.cpp b/src/osgWrappers/osgParticle/PointPlacer.cpp index 5b570893f..8812bb124 100644 --- a/src/osgWrappers/osgParticle/PointPlacer.cpp +++ b/src/osgWrappers/osgParticle/PointPlacer.cpp @@ -11,6 +11,7 @@ #include #include +#include #include #include @@ -32,5 +33,7 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::PointPlacer) I_Method0(const char *, libraryName); I_Method0(const char *, className); I_Method1(void, place, IN, osgParticle::Particle *, P); + I_Method0(osg::Vec3, getControlPosition); + I_ReadOnlyProperty(osg::Vec3, ControlPosition); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/SectorPlacer.cpp b/src/osgWrappers/osgParticle/SectorPlacer.cpp index 92a082768..5914e208c 100644 --- a/src/osgWrappers/osgParticle/SectorPlacer.cpp +++ b/src/osgWrappers/osgParticle/SectorPlacer.cpp @@ -11,6 +11,7 @@ #include #include +#include #include #include #include @@ -39,6 +40,8 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::SectorPlacer) I_Method0(const char *, libraryName); I_Method0(const char *, className); I_Method1(void, place, IN, osgParticle::Particle *, P); + I_Method0(osg::Vec3, getControlPosition); + I_ReadOnlyProperty(osg::Vec3, ControlPosition); I_Property(const osgParticle::rangef &, PhiRange); I_Property(const osgParticle::rangef &, RadiusRange); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/SegmentPlacer.cpp b/src/osgWrappers/osgParticle/SegmentPlacer.cpp index a149c48e0..ec96fe3a6 100644 --- a/src/osgWrappers/osgParticle/SegmentPlacer.cpp +++ b/src/osgWrappers/osgParticle/SegmentPlacer.cpp @@ -40,6 +40,8 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::SegmentPlacer) I_Method3(void, setVertexB, IN, float, x, IN, float, y, IN, float, z); I_Method2(void, setSegment, IN, const osg::Vec3 &, A, IN, const osg::Vec3 &, B); I_Method1(void, place, IN, osgParticle::Particle *, P); + I_Method0(osg::Vec3, getControlPosition); + I_ReadOnlyProperty(osg::Vec3, ControlPosition); I_Property(const osg::Vec3 &, VertexA); I_Property(const osg::Vec3 &, VertexB); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/range.cpp b/src/osgWrappers/osgParticle/range.cpp index 4debbf57c..5b41c4936 100644 --- a/src/osgWrappers/osgParticle/range.cpp +++ b/src/osgWrappers/osgParticle/range.cpp @@ -36,6 +36,7 @@ BEGIN_VALUE_REFLECTOR(osgParticle::range< float >) I_Method2(void, set, IN, const float &, mn, IN, const float &, mx); I_Method0(float, get_random); I_Method0(float, get_random_sqrtf); + I_Method0(float, mid); I_ReadOnlyProperty(float, _random); I_ReadOnlyProperty(float, _random_sqrtf); END_REFLECTOR @@ -46,6 +47,7 @@ BEGIN_VALUE_REFLECTOR(osgParticle::range< osg::Vec2 >) I_Method2(void, set, IN, const osg::Vec2 &, mn, IN, const osg::Vec2 &, mx); I_Method0(osg::Vec2, get_random); I_Method0(osg::Vec2, get_random_sqrtf); + I_Method0(osg::Vec2, mid); I_ReadOnlyProperty(osg::Vec2, _random); I_ReadOnlyProperty(osg::Vec2, _random_sqrtf); END_REFLECTOR @@ -56,6 +58,7 @@ BEGIN_VALUE_REFLECTOR(osgParticle::range< osg::Vec3 >) I_Method2(void, set, IN, const osg::Vec3 &, mn, IN, const osg::Vec3 &, mx); I_Method0(osg::Vec3, get_random); I_Method0(osg::Vec3, get_random_sqrtf); + I_Method0(osg::Vec3, mid); I_ReadOnlyProperty(osg::Vec3, _random); I_ReadOnlyProperty(osg::Vec3, _random_sqrtf); END_REFLECTOR @@ -66,6 +69,7 @@ BEGIN_VALUE_REFLECTOR(osgParticle::range< osg::Vec4 >) I_Method2(void, set, IN, const osg::Vec4 &, mn, IN, const osg::Vec4 &, mx); I_Method0(osg::Vec4, get_random); I_Method0(osg::Vec4, get_random_sqrtf); + I_Method0(osg::Vec4, mid); I_ReadOnlyProperty(osg::Vec4, _random); I_ReadOnlyProperty(osg::Vec4, _random_sqrtf); END_REFLECTOR diff --git a/src/osgWrappers/osgProducer/GraphicsContextImplementation.cpp b/src/osgWrappers/osgProducer/GraphicsContextImplementation.cpp index 9d9a251a5..246185066 100644 --- a/src/osgWrappers/osgProducer/GraphicsContextImplementation.cpp +++ b/src/osgWrappers/osgProducer/GraphicsContextImplementation.cpp @@ -24,14 +24,15 @@ BEGIN_OBJECT_REFLECTOR(osgProducer::GraphicsContextImplementation) I_BaseType(osg::GraphicsContext); I_Constructor1(IN, osg::GraphicsContext::Traits *, traits); I_Constructor1(IN, Producer::RenderSurface *, rs); - I_Method0(bool, isRealized); I_Method0(Producer::RenderSurface *, getRenderSurface); I_Method0(const Producer::RenderSurface *, getRenderSurface); - I_Method0(void, release); - I_Method0(void, makeCurrent); - I_Method1(void, makeContextCurrent, IN, osg::GraphicsContext *, readContext); - I_Method1(void, bindPBufferToTexture, IN, GLenum, buffer); - I_Method0(void, swapBuffers); + I_Method0(bool, realizeImplementation); + I_Method0(bool, isRealizedImplementation); + I_Method0(void, closeImplementation); + I_Method0(void, makeCurrentImplementation); + I_Method1(void, makeContextCurrentImplementation, IN, osg::GraphicsContext *, readContext); + I_Method1(void, bindPBufferToTextureImplementation, IN, GLenum, buffer); + I_Method0(void, swapBuffersImplementation); I_ReadOnlyProperty(Producer::RenderSurface *, RenderSurface); END_REFLECTOR diff --git a/src/osgWrappers/osgProducer/KeyboardMouseCallback.cpp b/src/osgWrappers/osgProducer/KeyboardMouseCallback.cpp index d0f09377f..a673ca545 100644 --- a/src/osgWrappers/osgProducer/KeyboardMouseCallback.cpp +++ b/src/osgWrappers/osgProducer/KeyboardMouseCallback.cpp @@ -41,18 +41,23 @@ BEGIN_OBJECT_REFLECTOR(osgProducer::KeyboardMouseCallback) I_Method1(void, setEscapeSetDone, IN, bool, esc); I_Method0(bool, getEscapeSetDone); I_Method1(double, getEventQueue, IN, osgProducer::KeyboardMouseCallback::EventQueue &, queue); + I_Method1(double, copyEventQueue, IN, osgProducer::KeyboardMouseCallback::EventQueue &, queue); + I_Method1(double, setEventQueue, IN, osgProducer::KeyboardMouseCallback::EventQueue &, queue); + I_Method1(double, appendEventQueue, IN, osgProducer::KeyboardMouseCallback::EventQueue &, queue); I_Method0(bool, done); I_Method0(float, mx); I_Method0(float, my); I_Method0(unsigned int, mbutton); I_Method1(void, setStartTick, IN, osg::Timer_t, tick); + I_Method0(osg::Timer_t, getStartTick); I_Method0(double, getTime); I_Method0(Producer::KeyboardMouse *, getKeyboardMouse); I_Method0(const Producer::KeyboardMouse *, getKeyboardMouse); I_Method0(osgProducer::EventAdapter *, createEventAdapter); I_Property(bool, EscapeSetDone); + I_WriteOnlyPropertyWithReturnType(osgProducer::KeyboardMouseCallback::EventQueue &, EventQueue, double); I_ReadOnlyProperty(Producer::KeyboardMouse *, KeyboardMouse); - I_WriteOnlyProperty(osg::Timer_t, StartTick); + I_Property(osg::Timer_t, StartTick); I_ReadOnlyProperty(double, Time); END_REFLECTOR diff --git a/src/osgWrappers/osgSim/GNUmakefile b/src/osgWrappers/osgSim/GNUmakefile index 339dd0b1f..5a4cbce82 100644 --- a/src/osgWrappers/osgSim/GNUmakefile +++ b/src/osgWrappers/osgSim/GNUmakefile @@ -13,6 +13,7 @@ CXXFILES =\ LightPointNode.cpp\ LightPointSystem.cpp\ MultiSwitch.cpp\ + OverlayNode.cpp\ ScalarBar.cpp\ ScalarsToColors.cpp\ Sector.cpp\ diff --git a/src/osgWrappers/osgSim/OverlayNode.cpp b/src/osgWrappers/osgSim/OverlayNode.cpp new file mode 100644 index 000000000..1ed3e88b1 --- /dev/null +++ b/src/osgWrappers/osgSim/OverlayNode.cpp @@ -0,0 +1,63 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgSim::OverlayNode) + I_BaseType(osg::Group); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgSim::OverlayNode &, es, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method0(const char *, className); + I_Method0(const char *, libraryName); + I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method1(void, traverse, IN, osg::NodeVisitor &, nv); + I_Method1(void, setOverlaySubgraph, IN, osg::Node *, node); + I_Method0(osg::Node *, getOverlaySubgraph); + I_Method0(const osg::Node *, getOverlaySubgraph); + I_Method0(void, dirtyOverlayTexture); + I_Method1(void, setContinousUpdate, IN, bool, update); + I_Method0(bool, getContinousUpdate); + I_Method1(void, setOverlayClearColor, IN, const osg::Vec4 &, color); + I_Method0(const osg::Vec4 &, getOverlayClearColor); + I_Method1(void, setTexEnvMode, IN, GLenum, mode); + I_Method0(GLenum, getTexEnvMode); + I_Method1(void, setOverlayTextureUnit, IN, unsigned int, unit); + I_Method0(unsigned int, getOverlayTextureUnit); + I_Method1(void, setOverlayTextureSizeHint, IN, unsigned int, size); + I_Method0(unsigned int, getOverlayTextureSizeHint); + I_Method0(osg::CameraNode *, getCamera); + I_Method0(const osg::CameraNode *, getCamera); + I_ReadOnlyProperty(osg::CameraNode *, Camera); + I_Property(bool, ContinousUpdate); + I_Property(const osg::Vec4 &, OverlayClearColor); + I_Property(osg::Node *, OverlaySubgraph); + I_Property(unsigned int, OverlayTextureSizeHint); + I_Property(unsigned int, OverlayTextureUnit); + I_Property(GLenum, TexEnvMode); +END_REFLECTOR + diff --git a/src/osgWrappers/osgSim/SphereSegment.cpp b/src/osgWrappers/osgSim/SphereSegment.cpp index 9b49a905d..b2e759f1b 100644 --- a/src/osgWrappers/osgSim/SphereSegment.cpp +++ b/src/osgWrappers/osgSim/SphereSegment.cpp @@ -9,7 +9,11 @@ #include #include +#include #include +#include +#include +#include #include #include #include @@ -24,6 +28,8 @@ #undef OUT #endif +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Vec3Array > >, osgSim::SphereSegment::LineList); + BEGIN_ENUM_REFLECTOR(osgSim::SphereSegment::DrawMask) I_EnumLabel(osgSim::SphereSegment::SURFACE); I_EnumLabel(osgSim::SphereSegment::SPOKES); @@ -65,6 +71,10 @@ BEGIN_OBJECT_REFLECTOR(osgSim::SphereSegment) I_Method0(const char *, className); I_Method0(const char *, libraryName); I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method2(osgSim::SphereSegment::LineList, computeIntersection, IN, const osg::Matrixd &, matrix, IN, osg::Node *, subgraph); + I_Method2(osgSim::SphereSegment::LineList, computeIntersection, IN, const osg::Matrixd &, matrix, IN, osg::Drawable *, drawable); + I_Method2(osg::Node *, computeIntersectionSubgraph, IN, const osg::Matrixd &, matrix, IN, osg::Node *, subgraph); + I_Method2(osg::Node *, computeIntersectionSubgraph, IN, const osg::Matrixd &, matrix, IN, osg::Drawable *, drawable); I_WriteOnlyProperty(const osg::Vec4 &, AllColors); I_Property(const osg::Vec3 &, Centre); I_Property(int, Density); @@ -76,3 +86,17 @@ BEGIN_OBJECT_REFLECTOR(osgSim::SphereSegment) I_ReadOnlyProperty(osg::Vec4, SurfaceColor); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Vec3Array >) + I_Constructor0(); + I_Constructor1(IN, osg::Vec3Array *, t); + I_Constructor1(IN, const osg::ref_ptr< osg::Vec3Array > &, rp); + I_Method0(bool, valid); + I_Method0(osg::Vec3Array *, get); + I_Method0(const osg::Vec3Array *, get); + I_Method0(osg::Vec3Array *, take); + I_Method0(osg::Vec3Array *, release); + I_ReadOnlyProperty(osg::Vec3Array *, ); +END_REFLECTOR + +STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::Vec3Array > >); + diff --git a/src/osgWrappers/osgTerrain/DataSet.cpp b/src/osgWrappers/osgTerrain/DataSet.cpp index 55ed56796..f78e02495 100644 --- a/src/osgWrappers/osgTerrain/DataSet.cpp +++ b/src/osgWrappers/osgTerrain/DataSet.cpp @@ -111,6 +111,8 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet) I_Method0(const std::string &, getDestinationTileBaseName); I_Method1(void, setDestinationTileExtension, IN, const std::string &, extension); I_Method0(const std::string &, getDestinationTileExtension); + I_Method1(void, setDestinationImageExtension, IN, const std::string &, extension); + I_Method0(const std::string &, getDestinationImageExtension); I_Method1(void, setDatabaseType, IN, osgTerrain::DataSet::DatabaseType, type); I_Method0(osgTerrain::DataSet::DatabaseType, getDatabaseType); I_Method1(void, setGeometryType, IN, osgTerrain::DataSet::GeometryType, type); @@ -153,6 +155,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet) I_Property(osg::CoordinateSystemNode *, DestinationCoordinateSystem); I_WriteOnlyProperty(const osg::BoundingBox &, DestinationExtents); I_WriteOnlyProperty(const osg::Matrixd &, DestinationGeoTransform); + I_Property(const std::string &, DestinationImageExtension); I_WriteOnlyProperty(const std::string &, DestinationName); I_ReadOnlyProperty(osg::Node *, DestinationRootNode); I_Property(const std::string &, DestinationTileBaseName); diff --git a/src/osgWrappers/osgUtil/GNUmakefile b/src/osgWrappers/osgUtil/GNUmakefile index 9125d1c2d..d26e6ac53 100644 --- a/src/osgWrappers/osgUtil/GNUmakefile +++ b/src/osgWrappers/osgUtil/GNUmakefile @@ -11,13 +11,12 @@ CXXFILES =\ HighlightMapGenerator.cpp\ IntersectVisitor.cpp\ Optimizer.cpp\ + PositionalStateContainer.cpp\ ReflectionMapGenerator.cpp\ RenderBin.cpp\ RenderGraph.cpp\ RenderLeaf.cpp\ RenderStage.cpp\ - RenderStageLighting.cpp\ - RenderToTextureStage.cpp\ SceneView.cpp\ Simplifier.cpp\ SmoothingVisitor.cpp\ diff --git a/src/osgWrappers/osgUtil/RenderStageLighting.cpp b/src/osgWrappers/osgUtil/PositionalStateContainer.cpp similarity index 74% rename from src/osgWrappers/osgUtil/RenderStageLighting.cpp rename to src/osgWrappers/osgUtil/PositionalStateContainer.cpp index fe3342803..416b21e83 100644 --- a/src/osgWrappers/osgUtil/RenderStageLighting.cpp +++ b/src/osgWrappers/osgUtil/PositionalStateContainer.cpp @@ -14,8 +14,8 @@ #include #include #include +#include #include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -25,13 +25,13 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::pair< osg::ref_ptr< const osg::StateAttribute > COMMA osg::ref_ptr< osg::RefMatrix > >, osgUtil::RenderStageLighting::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::RenderStageLighting::AttrMatrixPair >, osgUtil::RenderStageLighting::AttrMatrixList); +TYPE_NAME_ALIAS(std::vector< osgUtil::PositionalStateContainer::AttrMatrixPair >, osgUtil::PositionalStateContainer::AttrMatrixList); -TYPE_NAME_ALIAS(std::map< unsigned int COMMA osgUtil::RenderStageLighting::AttrMatrixList >, osgUtil::RenderStageLighting::TexUnitAttrMatrixListMap); +TYPE_NAME_ALIAS(std::map< unsigned int COMMA osgUtil::PositionalStateContainer::AttrMatrixList >, osgUtil::PositionalStateContainer::TexUnitAttrMatrixListMap); -BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStageLighting) +BEGIN_OBJECT_REFLECTOR(osgUtil::PositionalStateContainer) I_BaseType(osg::Object); I_Constructor0(); I_Method0(osg::Object *, cloneType); @@ -57,9 +57,9 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::RefMatrix >) I_ReadOnlyProperty(osg::RefMatrix *, ); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< unsigned int COMMA osgUtil::RenderStageLighting::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_VECTOR_REFLECTOR(std::vector< osgUtil::RenderStageLighting::AttrMatrixPair >); +STD_VECTOR_REFLECTOR(std::vector< osgUtil::PositionalStateContainer::AttrMatrixPair >); diff --git a/src/osgWrappers/osgUtil/RenderBin.cpp b/src/osgWrappers/osgUtil/RenderBin.cpp index 9abad7d77..ab133c842 100644 --- a/src/osgWrappers/osgUtil/RenderBin.cpp +++ b/src/osgWrappers/osgUtil/RenderBin.cpp @@ -86,6 +86,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderBin) I_Method1(bool, getStats, IN, osgUtil::Statistics *, primStats); I_Method1(void, getPrims, IN, osgUtil::Statistics *, primStats); I_Method2(bool, getPrims, IN, osgUtil::Statistics *, primStats, IN, int, nbin); + I_Method0(void, copyLeavesFromRenderGraphListToRenderLeafList); I_ReadOnlyProperty(int, BinNum); I_Property(osgUtil::RenderBin::DrawCallback *, DrawCallback); I_ReadOnlyProperty(osgUtil::RenderBin *, Parent); diff --git a/src/osgWrappers/osgUtil/RenderStage.cpp b/src/osgWrappers/osgUtil/RenderStage.cpp index dbb02402f..83be57e32 100644 --- a/src/osgWrappers/osgUtil/RenderStage.cpp +++ b/src/osgWrappers/osgUtil/RenderStage.cpp @@ -9,18 +9,23 @@ #include #include +#include #include #include +#include +#include +#include #include #include #include #include +#include #include #include +#include #include #include #include -#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -41,6 +46,10 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage) I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); I_Method0(const char *, className); I_Method0(void, reset); + I_Method1(void, setDrawBuffer, IN, GLenum, buffer); + I_Method0(GLenum, getDrawBuffer); + I_Method1(void, setReadBuffer, IN, GLenum, buffer); + I_Method0(GLenum, getReadBuffer); I_Method1(void, setViewport, IN, osg::Viewport *, viewport); I_Method0(const osg::Viewport *, getViewport); I_Method0(osg::Viewport *, getViewport); @@ -57,31 +66,58 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage) I_Method0(double, getClearDepth); I_Method1(void, setClearStencil, IN, int, stencil); I_Method0(int, getClearStencil); - I_Method1(void, setInheritedRenderStageLightingMatrix, IN, const osg::Matrix &, matrix); - I_Method0(const osg::Matrix &, getInheritedRenderStageLightingMatrix); - I_Method1(void, setInheritedRenderStageLighting, IN, osgUtil::RenderStageLighting *, rsl); - I_Method0(osgUtil::RenderStageLighting *, getInheritedRenderStageLighting); - I_Method1(void, setRenderStageLighting, IN, osgUtil::RenderStageLighting *, rsl); - I_Method0(osgUtil::RenderStageLighting *, getRenderStageLighting); + I_Method1(void, setCameraNode, IN, const osg::CameraNode *, camera); + I_Method0(const osg::CameraNode *, getCameraNode); + I_MethodWithDefaults3(void, setTexture, IN, osg::Texture *, texture, , IN, unsigned int, level, 0, IN, unsigned int, face, 0); + I_Method0(osg::Texture *, getTexture); + I_Method1(void, setImage, IN, osg::Image *, image); + I_Method0(osg::Image *, getImage); + I_Method1(void, setImageReadPixelFormat, IN, GLenum, format); + I_Method0(GLenum, getImageReadPixelFormat); + I_Method1(void, setImageReadPixelDataType, IN, GLenum, type); + I_Method0(GLenum, getImageReadPixelDataType); + I_Method1(void, setFrameBufferObject, IN, osg::FrameBufferObject *, fbo); + I_Method0(osg::FrameBufferObject *, getFrameBufferObject); + I_Method0(const osg::FrameBufferObject *, getFrameBufferObject); + I_Method1(void, setGraphicsContext, IN, osg::GraphicsContext *, context); + I_Method0(osg::GraphicsContext *, getGraphicsContext); + I_Method0(const osg::GraphicsContext *, getGraphicsContext); + I_Method1(void, setInheritedPositionalStateContainerMatrix, IN, const osg::Matrix &, matrix); + I_Method0(const osg::Matrix &, getInheritedPositionalStateContainerMatrix); + I_Method1(void, setInheritedPositionalStateContainer, IN, osgUtil::PositionalStateContainer *, rsl); + I_Method0(osgUtil::PositionalStateContainer *, getInheritedPositionalStateContainer); + I_Method1(void, setPositionalStateContainer, IN, osgUtil::PositionalStateContainer *, rsl); + I_Method0(osgUtil::PositionalStateContainer *, getPositionalStateContainer); I_Method2(void, addPositionedAttribute, IN, osg::RefMatrix *, matrix, IN, const osg::StateAttribute *, attr); I_Method3(void, addPositionedTextureAttribute, IN, unsigned int, textureUnit, IN, osg::RefMatrix *, matrix, IN, const osg::StateAttribute *, attr); + I_Method1(void, copyTexture, IN, osg::State &, state); I_Method2(void, drawPreRenderStages, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); I_Method2(void, draw, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); + I_Method3(void, drawInner, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous, IN, bool &, doCopyTexture); I_Method2(void, drawPostRenderStages, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); I_Method2(void, drawImplementation, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); I_Method1(void, addToDependencyList, IN, osgUtil::RenderStage *, rs); I_Method1(void, addPreRenderStage, IN, osgUtil::RenderStage *, rs); I_Method1(void, addPostRenderStage, IN, osgUtil::RenderStage *, rs); I_Method1(bool, getStats, IN, osgUtil::Statistics *, primStats); + I_Property(const osg::CameraNode *, CameraNode); I_Property(const osg::Vec4 &, ClearAccum); I_Property(const osg::Vec4 &, ClearColor); I_Property(double, ClearDepth); I_Property(GLbitfield, ClearMask); I_Property(int, ClearStencil); I_Property(osg::ColorMask *, ColorMask); - I_Property(osgUtil::RenderStageLighting *, InheritedRenderStageLighting); - I_Property(const osg::Matrix &, InheritedRenderStageLightingMatrix); - I_Property(osgUtil::RenderStageLighting *, RenderStageLighting); + I_Property(GLenum, DrawBuffer); + I_Property(osg::FrameBufferObject *, FrameBufferObject); + I_Property(osg::GraphicsContext *, GraphicsContext); + I_Property(osg::Image *, Image); + I_Property(GLenum, ImageReadPixelDataType); + I_Property(GLenum, ImageReadPixelFormat); + I_Property(osgUtil::PositionalStateContainer *, InheritedPositionalStateContainer); + I_Property(const osg::Matrix &, InheritedPositionalStateContainerMatrix); + I_Property(osgUtil::PositionalStateContainer *, PositionalStateContainer); + I_Property(GLenum, ReadBuffer); + I_ReadOnlyProperty(osg::Texture *, Texture); I_Property(osg::Viewport *, Viewport); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/RenderToTextureStage.cpp b/src/osgWrappers/osgUtil/RenderToTextureStage.cpp deleted file mode 100644 index 0f9508f69..000000000 --- a/src/osgWrappers/osgUtil/RenderToTextureStage.cpp +++ /dev/null @@ -1,65 +0,0 @@ -// *************************************************************************** -// -// Generated automatically by genwrapper. -// Please DO NOT EDIT this file! -// -// *************************************************************************** - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// Must undefine IN and OUT macros defined in Windows headers -#ifdef IN -#undef IN -#endif -#ifdef OUT -#undef OUT -#endif - -BEGIN_OBJECT_REFLECTOR(osgUtil::RenderToTextureStage) - I_BaseType(osgUtil::RenderStage); - I_Constructor0(); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(void, reset); - I_Method1(void, setCameraNode, IN, const osg::CameraNode *, camera); - I_Method0(const osg::CameraNode *, getCameraNode); - I_MethodWithDefaults3(void, setTexture, IN, osg::Texture *, texture, , IN, unsigned int, level, 0, IN, unsigned int, face, 0); - I_Method0(osg::Texture *, getTexture); - I_Method1(void, setImage, IN, osg::Image *, image); - I_Method0(osg::Image *, getImage); - I_Method1(void, setImageReadPixelFormat, IN, GLenum, format); - I_Method0(GLenum, getImageReadPixelFormat); - I_Method1(void, setImageReadPixelDataType, IN, GLenum, type); - I_Method0(GLenum, getImageReadPixelDataType); - I_Method1(void, setFrameBufferObject, IN, osg::FrameBufferObject *, fbo); - I_Method0(osg::FrameBufferObject *, getFrameBufferObject); - I_Method0(const osg::FrameBufferObject *, getFrameBufferObject); - I_Method1(void, setGraphicsContext, IN, osg::GraphicsContext *, context); - I_Method0(osg::GraphicsContext *, getGraphicsContext); - I_Method0(const osg::GraphicsContext *, getGraphicsContext); - I_Method2(void, draw, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); - I_Property(const osg::CameraNode *, CameraNode); - I_Property(osg::FrameBufferObject *, FrameBufferObject); - I_Property(osg::GraphicsContext *, GraphicsContext); - I_Property(osg::Image *, Image); - I_Property(GLenum, ImageReadPixelDataType); - I_Property(GLenum, ImageReadPixelFormat); - I_ReadOnlyProperty(osg::Texture *, Texture); -END_REFLECTOR - diff --git a/src/osgWrappers/osgUtil/Simplifier.cpp b/src/osgWrappers/osgUtil/Simplifier.cpp index 5a9fb42e1..a40f2f965 100644 --- a/src/osgWrappers/osgUtil/Simplifier.cpp +++ b/src/osgWrappers/osgUtil/Simplifier.cpp @@ -9,9 +9,7 @@ #include #include -#include -#include -#include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -23,29 +21,3 @@ TYPE_NAME_ALIAS(std::vector< unsigned int >, osgUtil::Simplifier::IndexList); -BEGIN_OBJECT_REFLECTOR(osgUtil::Simplifier) - I_BaseType(osg::NodeVisitor); - I_ConstructorWithDefaults2(IN, float, sampleRatio, 1.0f, IN, float, maximumError, 0.0f); - I_Method1(void, setSampleRatio, IN, float, sampleRatio); - I_Method0(float, getSampleRatio); - I_Method1(void, setMaximumError, IN, float, error); - I_Method0(float, getMaximumError); - I_Method1(void, setContinueSimplificationCallback, IN, osgUtil::Simplifier::ContinueSimplificationCallback *, cb); - I_Method0(osgUtil::Simplifier::ContinueSimplificationCallback *, getContinueSimplificationCallback); - I_Method0(const osgUtil::Simplifier::ContinueSimplificationCallback *, getContinueSimplificationCallback); - I_Method3(bool, continueSimplification, IN, float, nextError, IN, unsigned int, numOriginalPrimitives, IN, unsigned int, numRemainingPrimitives); - I_Method3(bool, continueSimplificationImplementation, IN, float, nextError, IN, unsigned int, numOriginalPrimitives, IN, unsigned int, numRemainingPrimitives); - I_Method1(void, apply, IN, osg::Geode &, geode); - I_Method1(void, simplify, IN, osg::Geometry &, geometry); - I_Method2(void, simplify, IN, osg::Geometry &, geometry, IN, const osgUtil::Simplifier::IndexList &, protectedPoints); - I_Property(osgUtil::Simplifier::ContinueSimplificationCallback *, ContinueSimplificationCallback); - I_Property(float, MaximumError); - I_Property(float, SampleRatio); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osgUtil::Simplifier::ContinueSimplificationCallback) - I_BaseType(osg::Referenced); - I_Constructor0(); - I_Method4(bool, continueSimplification, IN, const osgUtil::Simplifier &, simplifier, IN, float, nextError, IN, unsigned int, numOriginalPrimitives, IN, unsigned int, numRemainingPrimitives); -END_REFLECTOR - diff --git a/src/osgWrappers/osgUtil/Statistics.cpp b/src/osgWrappers/osgUtil/Statistics.cpp index d8b4ae6d4..8bbe819c1 100644 --- a/src/osgWrappers/osgUtil/Statistics.cpp +++ b/src/osgWrappers/osgUtil/Statistics.cpp @@ -24,9 +24,9 @@ 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::PrimtiveValueMap); +TYPE_NAME_ALIAS(std::map< GLenum COMMA osgUtil::Statistics::PrimitivePair >, osgUtil::Statistics::PrimitiveValueMap); -TYPE_NAME_ALIAS(std::map< GLenum COMMA unsigned int >, osgUtil::Statistics::PrimtiveCountMap); +TYPE_NAME_ALIAS(std::map< GLenum COMMA unsigned int >, osgUtil::Statistics::PrimitiveCountMap); BEGIN_ENUM_REFLECTOR(osgUtil::Statistics::statsType) I_EnumLabel(osgUtil::Statistics::STAT_NONE); @@ -68,8 +68,8 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Statistics) I_Method1(void, setDepth, IN, int, d); I_Method1(void, addBins, IN, int, np); I_Method1(void, setBinNo, IN, int, n); - I_Method0(osgUtil::Statistics::PrimtiveCountMap::iterator, GetPrimitivesBegin); - I_Method0(osgUtil::Statistics::PrimtiveCountMap::iterator, GetPrimitivesEnd); + I_Method0(osgUtil::Statistics::PrimitiveCountMap::iterator, GetPrimitivesBegin); + I_Method0(osgUtil::Statistics::PrimitiveCountMap::iterator, GetPrimitivesEnd); I_WriteOnlyProperty(int, BinNo); I_ReadOnlyProperty(int, Bins); I_WriteOnlyProperty(int, Depth); diff --git a/src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp b/src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp index b05bf4891..0b7d31e87 100644 --- a/src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp +++ b/src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp @@ -26,7 +26,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::TangentSpaceGenerator) I_BaseType(osg::Referenced); I_Constructor0(); I_ConstructorWithDefaults2(IN, const osgUtil::TangentSpaceGenerator &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_MethodWithDefaults2(void, generate, IN, osg::Geometry *, geo, , IN, int, normal_map_tex_unit, 0); + I_MethodWithDefaults3(void, generate, IN, osg::Geometry *, geo, , IN, int, normal_map_tex_unit, 0, IN, bool, use_indices, false); I_Method0(osg::Vec4Array *, getTangentArray); I_Method0(const osg::Vec4Array *, getTangentArray); I_Method1(void, setTangentArray, IN, osg::Vec4Array *, array); diff --git a/src/osgWrappers/osgUtil/Tesselator.cpp b/src/osgWrappers/osgUtil/Tesselator.cpp index d7941ae60..124bb1dda 100644 --- a/src/osgWrappers/osgUtil/Tesselator.cpp +++ b/src/osgWrappers/osgUtil/Tesselator.cpp @@ -49,6 +49,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Tesselator) I_Method1(void, setTesselationType, IN, const osgUtil::Tesselator::TesselationType, tt); I_Method0(const osgUtil::Tesselator::TesselationType, getTesselationType); I_Method1(void, retesselatePolygons, IN, osg::Geometry &, cxgeom); + I_Method1(void, setTesselationNormal, IN, const osg::Vec3, norm); I_Method0(osg::Geometry::PrimitiveSetList, getContours); I_Method0(void, beginTesselation); I_Method0(void, beginContour); @@ -60,6 +61,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Tesselator) I_Property(const bool, BoundaryOnly); I_ReadOnlyProperty(osg::Geometry::PrimitiveSetList, Contours); I_ReadOnlyProperty(osgUtil::Tesselator::PrimList &, PrimList); + I_WriteOnlyProperty(const osg::Vec3, TesselationNormal); I_Property(const osgUtil::Tesselator::TesselationType, TesselationType); I_Property(const osgUtil::Tesselator::WindingType, WindingType); END_REFLECTOR