From 9b7053826450ef205d2eef282f6e4662b1ffd9be Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 1 Mar 2007 11:58:36 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osg/AutoTransform.cpp | 6 + src/osgWrappers/osg/Billboard.cpp | 6 + src/osgWrappers/osg/BufferObject.cpp | 10 + .../osg/CollectOccludersVisitor.cpp | 12 + src/osgWrappers/osg/CoordinateSystemNode.cpp | 6 + src/osgWrappers/osg/CullStack.cpp | 255 ------------------ src/osgWrappers/osg/DeleteHandler.cpp | 5 + src/osgWrappers/osg/Drawable.cpp | 78 ++++++ src/osgWrappers/osg/FrameBufferObject.cpp | 17 ++ src/osgWrappers/osg/Geometry.cpp | 24 ++ src/osgWrappers/osg/GraphicsContext.cpp | 49 ++++ src/osgWrappers/osg/Group.cpp | 12 + src/osgWrappers/osg/Image.cpp | 12 + src/osgWrappers/osg/Light.cpp | 6 + src/osgWrappers/osg/Node.cpp | 36 +++ src/osgWrappers/osg/PagedLOD.cpp | 6 + src/osgWrappers/osg/ProxyNode.cpp | 6 + src/osgWrappers/osg/Referenced.cpp | 6 + src/osgWrappers/osg/Shader.cpp | 13 + src/osgWrappers/osg/State.cpp | 53 ++++ src/osgWrappers/osg/StateAttribute.cpp | 12 + src/osgWrappers/osg/StateSet.cpp | 96 +++++++ src/osgWrappers/osg/Stats.cpp | 24 ++ src/osgWrappers/osg/TexEnvCombine.cpp | 12 + src/osgWrappers/osg/Texture.cpp | 36 +++ src/osgWrappers/osg/Texture1D.cpp | 12 + src/osgWrappers/osg/Texture2D.cpp | 6 + src/osgWrappers/osg/Texture3D.cpp | 18 ++ src/osgWrappers/osg/TextureCubeMap.cpp | 12 + src/osgWrappers/osg/TextureRectangle.cpp | 24 ++ src/osgWrappers/osg/Uniform.cpp | 30 +++ src/osgWrappers/osgDB/DatabasePager.cpp | 24 ++ src/osgWrappers/osgDB/DotOsgWrapper.cpp | 8 + src/osgWrappers/osgDB/DynamicLibrary.cpp | 12 + src/osgWrappers/osgDB/Field.cpp | 18 ++ src/osgWrappers/osgDB/Registry.cpp | 18 ++ src/osgWrappers/osgDB/SharedStateManager.cpp | 30 +++ src/osgWrappers/osgFX/AnisotropicLighting.cpp | 6 + src/osgWrappers/osgFX/BumpMapping.cpp | 6 + src/osgWrappers/osgFX/Cartoon.cpp | 6 + src/osgWrappers/osgFX/Effect.cpp | 18 ++ src/osgWrappers/osgFX/MultiTextureControl.cpp | 6 + src/osgWrappers/osgFX/Registry.cpp | 3 + src/osgWrappers/osgFX/Scribe.cpp | 6 + src/osgWrappers/osgFX/SpecularHighlights.cpp | 6 + src/osgWrappers/osgFX/Technique.cpp | 35 +++ .../osgGA/AnimationPathManipulator.cpp | 6 + src/osgWrappers/osgGA/DriveManipulator.cpp | 24 ++ src/osgWrappers/osgGA/EventVisitor.cpp | 24 ++ src/osgWrappers/osgGA/FlightManipulator.cpp | 24 ++ src/osgWrappers/osgGA/MatrixManipulator.cpp | 3 + .../osgGA/NodeTrackerManipulator.cpp | 78 ++++++ src/osgWrappers/osgGA/StateSetManipulator.cpp | 6 + src/osgWrappers/osgGA/TerrainManipulator.cpp | 48 ++++ .../osgGA/TrackballManipulator.cpp | 42 +++ src/osgWrappers/osgGA/UFOManipulator.cpp | 30 +++ src/osgWrappers/osgManipulator/Command.cpp | 2 + src/osgWrappers/osgManipulator/Constraint.cpp | 35 +++ src/osgWrappers/osgManipulator/Dragger.cpp | 6 + src/osgWrappers/osgParticle/Emitter.cpp | 12 + src/osgWrappers/osgParticle/FluidProgram.cpp | 6 + .../osgParticle/ModularEmitter.cpp | 6 + .../osgParticle/ModularProgram.cpp | 6 + .../osgParticle/ParticleProcessor.cpp | 6 + .../osgParticle/ParticleSystem.cpp | 12 + .../osgParticle/PrecipitationEffect.cpp | 26 ++ src/osgWrappers/osgParticle/Program.cpp | 12 + .../osgShadow/OccluderGeometry.cpp | 44 +++ src/osgWrappers/osgSim/Impostor.cpp | 6 + src/osgWrappers/osgSim/ImpostorSprite.cpp | 5 + src/osgWrappers/osgSim/MultiSwitch.cpp | 6 + .../osgSim/OpenFlightOptimizer.cpp | 12 + src/osgWrappers/osgSim/OverlayNode.cpp | 12 + src/osgWrappers/osgSim/ScalarBar.cpp | 6 + src/osgWrappers/osgTerrain/Export.cpp | 22 ++ src/osgWrappers/osgText/FadeText.cpp | 8 + src/osgWrappers/osgText/Font.cpp | 6 + src/osgWrappers/osgText/Text.cpp | 132 +++++++++ src/osgWrappers/osgUtil/CubeMapGenerator.cpp | 12 + src/osgWrappers/osgUtil/CullVisitor.cpp | 18 ++ .../osgUtil/DelaunayTriangulator.cpp | 6 + .../osgUtil/HalfWayMapGenerator.cpp | 6 + .../osgUtil/HighlightMapGenerator.cpp | 6 + src/osgWrappers/osgUtil/IntersectVisitor.cpp | 30 +++ .../osgUtil/IntersectionVisitor.cpp | 30 +++ .../osgUtil/LineSegmentIntersector.cpp | 12 + src/osgWrappers/osgUtil/Optimizer.cpp | 38 +++ .../osgUtil/ReflectionMapGenerator.cpp | 6 + src/osgWrappers/osgUtil/SceneView.cpp | 18 ++ .../osgUtil/TangentSpaceGenerator.cpp | 6 + src/osgWrappers/osgUtil/Tessellator.cpp | 55 ++++ src/osgWrappers/osgUtil/UpdateVisitor.cpp | 18 ++ src/osgWrappers/osgViewer/CompositeViewer.cpp | 18 ++ src/osgWrappers/osgViewer/GraphicsWindow.cpp | 2 +- src/osgWrappers/osgViewer/HelpHandler.cpp | 12 + src/osgWrappers/osgViewer/SimpleViewer.cpp | 2 +- src/osgWrappers/osgViewer/StatsHandler.cpp | 42 +++ src/osgWrappers/osgViewer/Viewer.cpp | 18 ++ 98 files changed, 1873 insertions(+), 257 deletions(-) create mode 100644 src/osgWrappers/osgTerrain/Export.cpp diff --git a/src/osgWrappers/osg/AutoTransform.cpp b/src/osgWrappers/osg/AutoTransform.cpp index 4f42cd93a..f352f048e 100644 --- a/src/osgWrappers/osg/AutoTransform.cpp +++ b/src/osgWrappers/osg/AutoTransform.cpp @@ -172,6 +172,12 @@ BEGIN_OBJECT_REFLECTOR(osg::AutoTransform) __BoundingSphere__computeBound, "Overrides Group's computeBound. ", "There is no need to override in subclasses from osg::Transform since this computeBound() uses the underlying matrix (calling computeMatrix if required)."); + I_ProtectedMethod0(void, computeMatrix, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__computeMatrix, + "", + ""); I_SimpleProperty(osg::AutoTransform::AutoRotateMode, AutoRotateMode, __AutoRotateMode__getAutoRotateMode, __void__setAutoRotateMode__AutoRotateMode); diff --git a/src/osgWrappers/osg/Billboard.cpp b/src/osgWrappers/osg/Billboard.cpp index 2a9f357dd..bdc5b4c4b 100644 --- a/src/osgWrappers/osg/Billboard.cpp +++ b/src/osgWrappers/osg/Billboard.cpp @@ -154,6 +154,12 @@ BEGIN_OBJECT_REFLECTOR(osg::Billboard) __BoundingSphere__computeBound, "Compute the bounding sphere around Node's geometry or children. ", "This method is automatically called by getBound() when the bounding sphere has been marked dirty via dirtyBound(). "); + I_ProtectedMethod0(void, updateCache, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__updateCache, + "", + ""); I_SimpleProperty(const osg::Vec3 &, Axis, __C5_Vec3_R1__getAxis, __void__setAxis__C5_Vec3_R1); diff --git a/src/osgWrappers/osg/BufferObject.cpp b/src/osgWrappers/osg/BufferObject.cpp index fb268212d..e785752ee 100644 --- a/src/osgWrappers/osg/BufferObject.cpp +++ b/src/osgWrappers/osg/BufferObject.cpp @@ -208,6 +208,16 @@ BEGIN_OBJECT_REFLECTOR(osg::BufferObject::Extensions) __void__glGetBufferPointerv__GLenum__GLenum__GLvoid_P1P1, "", ""); + + + + + + + + + + END_REFLECTOR TYPE_NAME_ALIAS(std::pair< osg::BufferObject::BufferEntry COMMA osg::Image * >, osg::PixelBufferObject::BufferEntryImagePair); diff --git a/src/osgWrappers/osg/CollectOccludersVisitor.cpp b/src/osgWrappers/osg/CollectOccludersVisitor.cpp index 7e44ec3ae..35569e116 100644 --- a/src/osgWrappers/osg/CollectOccludersVisitor.cpp +++ b/src/osgWrappers/osg/CollectOccludersVisitor.cpp @@ -140,6 +140,18 @@ BEGIN_OBJECT_REFLECTOR(osg::CollectOccludersVisitor) __void__removeOccludedOccluders, "Removes occluded occluders for the collected occluders list, then discards all but MaximumNumberOfActiveOccluders of occluders, discarding the occluders with the lowests shadow occluder volume. ", ""); + I_ProtectedMethod1(void, handle_cull_callbacks_and_traverse, IN, osg::Node &, node, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__handle_cull_callbacks_and_traverse__osg_Node_R1, + "", + ""); + I_ProtectedMethod2(void, handle_cull_callbacks_and_accept, IN, osg::Node &, node, IN, osg::Node *, acceptNode, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__handle_cull_callbacks_and_accept__osg_Node_R1__osg_Node_P1, + "", + ""); I_SimpleProperty(osg::CollectOccludersVisitor::ShadowVolumeOccluderSet &, CollectedOccluderSet, __ShadowVolumeOccluderSet_R1__getCollectedOccluderSet, 0); diff --git a/src/osgWrappers/osg/CoordinateSystemNode.cpp b/src/osgWrappers/osg/CoordinateSystemNode.cpp index 4d6d9a88a..d895ceb16 100644 --- a/src/osgWrappers/osg/CoordinateSystemNode.cpp +++ b/src/osgWrappers/osg/CoordinateSystemNode.cpp @@ -209,6 +209,12 @@ BEGIN_OBJECT_REFLECTOR(osg::EllipsoidModel) __osg_Vec3d__computeLocalUpVector__double__double__double, "", ""); + I_ProtectedMethod0(void, computeCoefficients, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__computeCoefficients, + "", + ""); I_SimpleProperty(double, RadiusEquator, __double__getRadiusEquator, __void__setRadiusEquator__double); diff --git a/src/osgWrappers/osg/CullStack.cpp b/src/osgWrappers/osg/CullStack.cpp index 0256f3525..dd8d0500f 100644 --- a/src/osgWrappers/osg/CullStack.cpp +++ b/src/osgWrappers/osg/CullStack.cpp @@ -33,261 +33,6 @@ TYPE_NAME_ALIAS(std::vector< osg::ShadowVolumeOccluder >, osg::CullStack::Occlud TYPE_NAME_ALIAS(std::vector< osg::CullingSet >, osg::CullStack::CullingStack); -BEGIN_OBJECT_REFLECTOR(osg::CullStack) - I_BaseType(osg::CullSettings); - I_Constructor0(____CullStack, - "", - ""); - I_Method0(void, reset, - Properties::NON_VIRTUAL, - __void__reset, - "", - ""); - I_Method1(void, setOccluderList, IN, const osg::ShadowVolumeOccluderList &, svol, - Properties::NON_VIRTUAL, - __void__setOccluderList__C5_ShadowVolumeOccluderList_R1, - "", - ""); - I_Method0(osg::ShadowVolumeOccluderList &, getOccluderList, - Properties::NON_VIRTUAL, - __ShadowVolumeOccluderList_R1__getOccluderList, - "", - ""); - I_Method0(const osg::ShadowVolumeOccluderList &, getOccluderList, - Properties::NON_VIRTUAL, - __C5_ShadowVolumeOccluderList_R1__getOccluderList, - "", - ""); - I_Method1(void, pushViewport, IN, osg::Viewport *, viewport, - Properties::NON_VIRTUAL, - __void__pushViewport__osg_Viewport_P1, - "", - ""); - I_Method0(void, popViewport, - Properties::NON_VIRTUAL, - __void__popViewport, - "", - ""); - I_Method1(void, pushProjectionMatrix, IN, osg::RefMatrix *, matrix, - Properties::NON_VIRTUAL, - __void__pushProjectionMatrix__osg_RefMatrix_P1, - "", - ""); - I_Method0(void, popProjectionMatrix, - Properties::NON_VIRTUAL, - __void__popProjectionMatrix, - "", - ""); - I_Method2(void, pushModelViewMatrix, IN, osg::RefMatrix *, matrix, IN, osg::Transform::ReferenceFrame, referenceFrame, - Properties::NON_VIRTUAL, - __void__pushModelViewMatrix__osg_RefMatrix_P1__Transform_ReferenceFrame, - "", - ""); - I_Method0(void, popModelViewMatrix, - Properties::NON_VIRTUAL, - __void__popModelViewMatrix, - "", - ""); - I_Method0(float, getFrustumVolume, - Properties::NON_VIRTUAL, - __float__getFrustumVolume, - "", - ""); - I_Method2(float, pixelSize, IN, const osg::Vec3 &, v, IN, float, radius, - Properties::NON_VIRTUAL, - __float__pixelSize__C5_Vec3_R1__float, - "Compute the pixel size of an object at position v, with specified radius. ", - ""); - I_Method1(float, pixelSize, IN, const osg::BoundingSphere &, bs, - Properties::NON_VIRTUAL, - __float__pixelSize__C5_BoundingSphere_R1, - "Compute the pixel size of the bounding sphere. ", - ""); - I_Method2(float, clampedPixelSize, IN, const osg::Vec3 &, v, IN, float, radius, - Properties::NON_VIRTUAL, - __float__clampedPixelSize__C5_Vec3_R1__float, - "Compute the pixel size of an object at position v, with specified radius. ", - "fabs()ed to always be positive. "); - I_Method1(float, clampedPixelSize, IN, const osg::BoundingSphere &, bs, - Properties::NON_VIRTUAL, - __float__clampedPixelSize__C5_BoundingSphere_R1, - "Compute the pixel size of the bounding sphere. ", - "fabs()ed to always be positive. "); - I_Method1(void, disableAndPushOccludersCurrentMask, IN, osg::NodePath &, nodePath, - Properties::NON_VIRTUAL, - __void__disableAndPushOccludersCurrentMask__NodePath_R1, - "", - ""); - I_Method1(void, popOccludersCurrentMask, IN, osg::NodePath &, nodePath, - Properties::NON_VIRTUAL, - __void__popOccludersCurrentMask__NodePath_R1, - "", - ""); - I_Method1(bool, isCulled, IN, const std::vector< osg::Vec3 > &, vertices, - Properties::NON_VIRTUAL, - __bool__isCulled__C5_std_vectorT1_Vec3__R1, - "", - ""); - I_Method1(bool, isCulled, IN, const osg::BoundingBox &, bb, - Properties::NON_VIRTUAL, - __bool__isCulled__C5_BoundingBox_R1, - "", - ""); - I_Method1(bool, isCulled, IN, const osg::BoundingSphere &, bs, - Properties::NON_VIRTUAL, - __bool__isCulled__C5_BoundingSphere_R1, - "", - ""); - I_Method1(bool, isCulled, IN, const osg::Node &, node, - Properties::NON_VIRTUAL, - __bool__isCulled__C5_osg_Node_R1, - "", - ""); - I_Method0(void, pushCurrentMask, - Properties::NON_VIRTUAL, - __void__pushCurrentMask, - "", - ""); - I_Method0(void, popCurrentMask, - Properties::NON_VIRTUAL, - __void__popCurrentMask, - "", - ""); - I_Method0(osg::CullStack::CullingStack &, getClipSpaceCullingStack, - Properties::NON_VIRTUAL, - __CullingStack_R1__getClipSpaceCullingStack, - "", - ""); - I_Method0(osg::CullStack::CullingStack &, getProjectionCullingStack, - Properties::NON_VIRTUAL, - __CullingStack_R1__getProjectionCullingStack, - "", - ""); - I_Method0(osg::CullStack::CullingStack &, getModelViewCullingStack, - Properties::NON_VIRTUAL, - __CullingStack_R1__getModelViewCullingStack, - "", - ""); - I_Method0(osg::CullingSet &, getCurrentCullingSet, - Properties::NON_VIRTUAL, - __CullingSet_R1__getCurrentCullingSet, - "", - ""); - I_Method0(const osg::CullingSet &, getCurrentCullingSet, - Properties::NON_VIRTUAL, - __C5_CullingSet_R1__getCurrentCullingSet, - "", - ""); - I_Method0(osg::Viewport *, getViewport, - Properties::NON_VIRTUAL, - __osg_Viewport_P1__getViewport, - "", - ""); - I_Method0(osg::RefMatrix *, getModelViewMatrix, - Properties::NON_VIRTUAL, - __osg_RefMatrix_P1__getModelViewMatrix, - "", - ""); - I_Method0(osg::RefMatrix *, getProjectionMatrix, - Properties::NON_VIRTUAL, - __osg_RefMatrix_P1__getProjectionMatrix, - "", - ""); - I_Method0(osg::Matrix, getWindowMatrix, - Properties::NON_VIRTUAL, - __osg_Matrix__getWindowMatrix, - "", - ""); - I_Method0(const osg::RefMatrix *, getMVPW, - Properties::NON_VIRTUAL, - __C5_osg_RefMatrix_P1__getMVPW, - "", - ""); - I_Method0(const osg::Vec3 &, getReferenceViewPoint, - Properties::NON_VIRTUAL, - __C5_osg_Vec3_R1__getReferenceViewPoint, - "", - ""); - I_Method1(void, pushReferenceViewPoint, IN, const osg::Vec3 &, viewPoint, - Properties::NON_VIRTUAL, - __void__pushReferenceViewPoint__C5_osg_Vec3_R1, - "", - ""); - I_Method0(void, popReferenceViewPoint, - Properties::NON_VIRTUAL, - __void__popReferenceViewPoint, - "", - ""); - I_Method0(const osg::Vec3 &, getEyeLocal, - Properties::NON_VIRTUAL, - __C5_osg_Vec3_R1__getEyeLocal, - "", - ""); - I_Method0(const osg::Vec3 &, getViewPointLocal, - Properties::NON_VIRTUAL, - __C5_osg_Vec3_R1__getViewPointLocal, - "", - ""); - I_Method0(const osg::Vec3, getUpLocal, - Properties::NON_VIRTUAL, - __C5_osg_Vec3__getUpLocal, - "", - ""); - I_Method0(const osg::Vec3, getLookVectorLocal, - Properties::NON_VIRTUAL, - __C5_osg_Vec3__getLookVectorLocal, - "", - ""); - I_SimpleProperty(osg::CullStack::CullingStack &, ClipSpaceCullingStack, - __CullingStack_R1__getClipSpaceCullingStack, - 0); - I_SimpleProperty(osg::CullingSet &, CurrentCullingSet, - __CullingSet_R1__getCurrentCullingSet, - 0); - I_SimpleProperty(const osg::Vec3 &, EyeLocal, - __C5_osg_Vec3_R1__getEyeLocal, - 0); - I_SimpleProperty(float, FrustumVolume, - __float__getFrustumVolume, - 0); - I_SimpleProperty(const osg::Vec3, LookVectorLocal, - __C5_osg_Vec3__getLookVectorLocal, - 0); - I_SimpleProperty(const osg::RefMatrix *, MVPW, - __C5_osg_RefMatrix_P1__getMVPW, - 0); - I_SimpleProperty(osg::CullStack::CullingStack &, ModelViewCullingStack, - __CullingStack_R1__getModelViewCullingStack, - 0); - I_SimpleProperty(osg::RefMatrix *, ModelViewMatrix, - __osg_RefMatrix_P1__getModelViewMatrix, - 0); - I_SimpleProperty(const osg::ShadowVolumeOccluderList &, OccluderList, - __C5_ShadowVolumeOccluderList_R1__getOccluderList, - __void__setOccluderList__C5_ShadowVolumeOccluderList_R1); - I_SimpleProperty(osg::CullStack::CullingStack &, ProjectionCullingStack, - __CullingStack_R1__getProjectionCullingStack, - 0); - I_SimpleProperty(osg::RefMatrix *, ProjectionMatrix, - __osg_RefMatrix_P1__getProjectionMatrix, - 0); - I_SimpleProperty(const osg::Vec3 &, ReferenceViewPoint, - __C5_osg_Vec3_R1__getReferenceViewPoint, - 0); - I_SimpleProperty(const osg::Vec3, UpLocal, - __C5_osg_Vec3__getUpLocal, - 0); - I_SimpleProperty(const osg::Vec3 &, ViewPointLocal, - __C5_osg_Vec3_R1__getViewPointLocal, - 0); - I_SimpleProperty(osg::Viewport *, Viewport, - __osg_Viewport_P1__getViewport, - 0); - I_SimpleProperty(osg::Matrix, WindowMatrix, - __osg_Matrix__getWindowMatrix, - 0); -END_REFLECTOR - STD_VECTOR_REFLECTOR(std::vector< osg::CullingSet >); STD_VECTOR_REFLECTOR(std::vector< osg::ShadowVolumeOccluder >); diff --git a/src/osgWrappers/osg/DeleteHandler.cpp b/src/osgWrappers/osg/DeleteHandler.cpp index dea93b37f..bca125018 100644 --- a/src/osgWrappers/osg/DeleteHandler.cpp +++ b/src/osgWrappers/osg/DeleteHandler.cpp @@ -71,6 +71,11 @@ BEGIN_OBJECT_REFLECTOR(osg::DeleteHandler) __void__requestDelete__C5_osg_Referenced_P1, "Request the deletion of an object. ", "Depending on users implementation of DeleteHandler, the delete of the object may occur straight away or be delayed until doDelete is called. The default implementation does a delete straight away. "); + I_ProtectedConstructor1(IN, const osg::DeleteHandler &, x, + Properties::NON_EXPLICIT, + ____DeleteHandler__C5_DeleteHandler_R1, + "", + ""); I_SimpleProperty(int, FrameNumber, __int__getFrameNumber, __void__setFrameNumber__int); diff --git a/src/osgWrappers/osg/Drawable.cpp b/src/osgWrappers/osg/Drawable.cpp index b3c68f8e8..0fbb355e3 100644 --- a/src/osgWrappers/osg/Drawable.cpp +++ b/src/osgWrappers/osg/Drawable.cpp @@ -428,6 +428,48 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable) __void__setExtensions__unsigned_int__Extensions_P1_S, "setExtensions allows users to override the extensions across graphics contexts. ", "typically used when you have different extensions supported across graphics pipes but need to ensure that they all use the same low common denominator extensions. "); + I_ProtectedMethod1(void, setBound, IN, const osg::BoundingBox &, bb, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__setBound__C5_BoundingBox_R1, + "set the bounding box . ", + ""); + I_ProtectedMethod1(void, addParent, IN, osg::Node *, node, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__addParent__osg_Node_P1, + "", + ""); + I_ProtectedMethod1(void, removeParent, IN, osg::Node *, node, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__removeParent__osg_Node_P1, + "", + ""); + I_ProtectedMethod1(void, setNumChildrenRequiringUpdateTraversal, IN, unsigned int, num, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setNumChildrenRequiringUpdateTraversal__unsigned_int, + "", + ""); + I_ProtectedMethod0(unsigned int, getNumChildrenRequiringUpdateTraversal, + Properties::NON_VIRTUAL, + Properties::CONST, + __unsigned_int__getNumChildrenRequiringUpdateTraversal, + "", + ""); + I_ProtectedMethod1(void, setNumChildrenRequiringEventTraversal, IN, unsigned int, num, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setNumChildrenRequiringEventTraversal__unsigned_int, + "", + ""); + I_ProtectedMethod0(unsigned int, getNumChildrenRequiringEventTraversal, + Properties::NON_VIRTUAL, + Properties::CONST, + __unsigned_int__getNumChildrenRequiringEventTraversal, + "", + ""); I_SimpleProperty(const osg::BoundingBox &, Bound, __C5_BoundingBox_R1__getBound, 0); @@ -1075,6 +1117,42 @@ BEGIN_OBJECT_REFLECTOR(osg::Drawable::Extensions) __void__glGetQueryObjectui64v__GLuint__GLenum__GLuint64EXT_P1, "", ""); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + I_SimpleProperty(bool, ARBOcclusionQuerySupported, 0, __void__setARBOcclusionQuerySupported__bool); diff --git a/src/osgWrappers/osg/FrameBufferObject.cpp b/src/osgWrappers/osg/FrameBufferObject.cpp index 4afa7f03e..444825cbb 100644 --- a/src/osgWrappers/osg/FrameBufferObject.cpp +++ b/src/osgWrappers/osg/FrameBufferObject.cpp @@ -67,6 +67,11 @@ BEGIN_OBJECT_REFLECTOR(osg::FBOExtensions) __FBOExtensions_P1__instance__unsigned__bool_S, "", ""); + I_ProtectedConstructor1(IN, unsigned int, contextID, + Properties::NON_EXPLICIT, + ____FBOExtensions__unsigned_int, + "", + ""); I_PublicMemberProperty(osg::FBOExtensions::TglBindRenderbufferEXT *, glBindRenderbufferEXT); I_PublicMemberProperty(osg::FBOExtensions::TglGenRenderbuffersEXT *, glGenRenderbuffersEXT); I_PublicMemberProperty(osg::FBOExtensions::TglDeleteRenderbuffersEXT *, glDeleteRenderbuffersEXT); @@ -218,6 +223,12 @@ BEGIN_OBJECT_REFLECTOR(osg::FrameBufferObject) __void__flushDeletedFrameBufferObjects__unsigned_int__double__double_R1_S, "flush all the cached FBOs which need to be deleted in the OpenGL context related to contextID. ", ""); + I_ProtectedMethod0(void, dirtyAll, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__dirtyAll, + "", + ""); I_IndexedProperty(const osg::FrameBufferAttachment &, Attachment, __C5_FrameBufferAttachment_R1__getAttachment__GLenum, __void__setAttachment__GLenum__C5_FrameBufferAttachment_R1, @@ -321,6 +332,12 @@ BEGIN_OBJECT_REFLECTOR(osg::RenderBuffer) __void__flushDeletedRenderBuffers__unsigned_int__double__double_R1_S, "flush all the cached RenderBuffers which need to be deleted in the OpenGL context related to contextID. ", ""); + I_ProtectedMethod0(void, dirtyAll, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__dirtyAll, + "", + ""); I_SimpleProperty(int, Height, __int__getHeight, __void__setHeight__int); diff --git a/src/osgWrappers/osg/Geometry.cpp b/src/osgWrappers/osg/Geometry.cpp index a9f10c174..29f751893 100644 --- a/src/osgWrappers/osg/Geometry.cpp +++ b/src/osgWrappers/osg/Geometry.cpp @@ -662,6 +662,30 @@ BEGIN_OBJECT_REFLECTOR(osg::Geometry) __void__accept__PrimitiveIndexFunctor_R1, "Accept a PrimitiveFunctor and call its methods to tell it about the interal primitives that this Drawable has. ", ""); + I_ProtectedMethod1(bool, verifyBindings, IN, const osg::Geometry::ArrayData &, arrayData, + Properties::NON_VIRTUAL, + Properties::CONST, + __bool__verifyBindings__C5_ArrayData_R1, + "", + ""); + I_ProtectedMethod1(bool, verifyBindings, IN, const osg::Geometry::Vec3ArrayData &, arrayData, + Properties::NON_VIRTUAL, + Properties::CONST, + __bool__verifyBindings__C5_Vec3ArrayData_R1, + "", + ""); + I_ProtectedMethod2(void, computeCorrectBindingsAndArraySizes, IN, osg::Geometry::ArrayData &, arrayData, IN, const char *, arrayName, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__computeCorrectBindingsAndArraySizes__ArrayData_R1__C5_char_P1, + "", + ""); + I_ProtectedMethod2(void, computeCorrectBindingsAndArraySizes, IN, osg::Geometry::Vec3ArrayData &, arrayData, IN, const char *, arrayName, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__computeCorrectBindingsAndArraySizes__Vec3ArrayData_R1__C5_char_P1, + "", + ""); I_SimpleProperty(osg::Array *, ColorArray, __Array_P1__getColorArray, __void__setColorArray__Array_P1); diff --git a/src/osgWrappers/osg/GraphicsContext.cpp b/src/osgWrappers/osg/GraphicsContext.cpp index b2b5b16ee..5715501fc 100644 --- a/src/osgWrappers/osg/GraphicsContext.cpp +++ b/src/osgWrappers/osg/GraphicsContext.cpp @@ -290,6 +290,55 @@ BEGIN_OBJECT_REFLECTOR(osg::GraphicsContext) __void__decrementContextIDUsageCount__unsigned_int_S, "Decrement the usage count associate with a contextID. ", "Once the contextID goes to 0 the contextID is then free to be reused. "); + I_ProtectedConstructor0(____GraphicsContext, + "", + ""); + I_ProtectedConstructor2(IN, const osg::GraphicsContext &, x, IN, const osg::CopyOp &, x, + ____GraphicsContext__C5_GraphicsContext_R1__C5_osg_CopyOp_R1, + "", + ""); + I_ProtectedMethod0(osg::Object *, cloneType, + Properties::VIRTUAL, + Properties::CONST, + __Object_P1__cloneType, + "Clone the type of an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_ProtectedMethod1(osg::Object *, clone, IN, const osg::CopyOp &, x, + Properties::VIRTUAL, + Properties::CONST, + __Object_P1__clone__C5_CopyOp_R1, + "Clone an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_ProtectedMethod1(bool, isSameKindAs, IN, const osg::Object *, object, + Properties::VIRTUAL, + Properties::CONST, + __bool__isSameKindAs__C5_Object_P1, + "", + ""); + I_ProtectedMethod0(const char *, libraryName, + Properties::VIRTUAL, + Properties::CONST, + __C5_char_P1__libraryName, + "return the name of the object's library. ", + "Must be defined by derived classes. The OpenSceneGraph convention is that the namespace of a library is the same as the library name. "); + I_ProtectedMethod0(const char *, className, + Properties::VIRTUAL, + Properties::CONST, + __C5_char_P1__className, + "return the name of the object's class type. ", + "Must be defined by derived classes. "); + I_ProtectedMethod1(void, addCamera, IN, osg::Camera *, camera, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__addCamera__osg_Camera_P1, + "", + ""); + I_ProtectedMethod1(void, removeCamera, IN, osg::Camera *, camera, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__removeCamera__osg_Camera_P1, + "", + ""); I_SimpleProperty(osg::GraphicsContext::Cameras &, Cameras, __Cameras_R1__getCameras, 0); diff --git a/src/osgWrappers/osg/Group.cpp b/src/osgWrappers/osg/Group.cpp index 3a46b2311..1f607e6c5 100644 --- a/src/osgWrappers/osg/Group.cpp +++ b/src/osgWrappers/osg/Group.cpp @@ -160,6 +160,18 @@ BEGIN_OBJECT_REFLECTOR(osg::Group) __BoundingSphere__computeBound, "Compute the bounding sphere around Node's geometry or children. ", "This method is automatically called by getBound() when the bounding sphere has been marked dirty via dirtyBound(). "); + I_ProtectedMethod2(void, childRemoved, IN, unsigned, int, IN, unsigned, int, + Properties::VIRTUAL, + Properties::NON_CONST, + __void__childRemoved__unsigned__unsigned, + "", + ""); + I_ProtectedMethod1(void, childInserted, IN, unsigned, int, + Properties::VIRTUAL, + Properties::NON_CONST, + __void__childInserted__unsigned, + "", + ""); I_ArrayProperty(osg::Node *, Child, __Node_P1__getChild__unsigned_int, __bool__setChild__unsigned_int__Node_P1, diff --git a/src/osgWrappers/osg/Image.cpp b/src/osgWrappers/osg/Image.cpp index 23b725973..f08d97c86 100644 --- a/src/osgWrappers/osg/Image.cpp +++ b/src/osgWrappers/osg/Image.cpp @@ -339,6 +339,18 @@ BEGIN_OBJECT_REFLECTOR(osg::Image) __int__computeNearestPowerOfTwo__int__float_S, "", ""); + I_ProtectedMethod0(void, deallocateData, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__deallocateData, + "", + ""); + I_ProtectedMethod2(void, setData, IN, unsigned char *, data, IN, osg::Image::AllocationMode, allocationMode, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setData__unsigned_char_P1__AllocationMode, + "", + ""); I_SimpleProperty(osg::Image::AllocationMode, AllocationMode, __AllocationMode__getAllocationMode, __void__setAllocationMode__AllocationMode); diff --git a/src/osgWrappers/osg/Light.cpp b/src/osgWrappers/osg/Light.cpp index 1263c79dc..92c2bd354 100644 --- a/src/osgWrappers/osg/Light.cpp +++ b/src/osgWrappers/osg/Light.cpp @@ -200,6 +200,12 @@ BEGIN_OBJECT_REFLECTOR(osg::Light) __void__apply__State_R1, "Apply the light's state to the OpenGL state machine. ", ""); + I_ProtectedMethod0(void, init, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__init, + "Initialize the light's settings with some decent defaults. ", + ""); I_SimpleProperty(const osg::Vec4 &, Ambient, __C5_Vec4_R1__getAmbient, __void__setAmbient__C5_Vec4_R1); diff --git a/src/osgWrappers/osg/Node.cpp b/src/osgWrappers/osg/Node.cpp index ab8dd79ee..98cc903b3 100644 --- a/src/osgWrappers/osg/Node.cpp +++ b/src/osgWrappers/osg/Node.cpp @@ -344,6 +344,42 @@ BEGIN_OBJECT_REFLECTOR(osg::Node) __void__releaseGLObjects__osg_State_P1, "If State is non-zero, this function releases any associated OpenGL objects for the specified graphics context. ", "Otherwise, releases OpenGL objexts for all graphics contexts. "); + I_ProtectedMethod1(void, addParent, IN, osg::Group *, node, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__addParent__osg_Group_P1, + "", + ""); + I_ProtectedMethod1(void, removeParent, IN, osg::Group *, node, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__removeParent__osg_Group_P1, + "", + ""); + I_ProtectedMethod1(void, setNumChildrenRequiringUpdateTraversal, IN, unsigned int, num, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setNumChildrenRequiringUpdateTraversal__unsigned_int, + "", + ""); + I_ProtectedMethod1(void, setNumChildrenRequiringEventTraversal, IN, unsigned int, num, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setNumChildrenRequiringEventTraversal__unsigned_int, + "", + ""); + I_ProtectedMethod1(void, setNumChildrenWithCullingDisabled, IN, unsigned int, num, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setNumChildrenWithCullingDisabled__unsigned_int, + "", + ""); + I_ProtectedMethod1(void, setNumChildrenWithOccluderNodes, IN, unsigned int, num, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setNumChildrenWithOccluderNodes__unsigned_int, + "", + ""); I_SimpleProperty(const osg::BoundingSphere &, Bound, __C5_BoundingSphere_R1__getBound, 0); diff --git a/src/osgWrappers/osg/PagedLOD.cpp b/src/osgWrappers/osg/PagedLOD.cpp index 2f1432f8a..d018b3ccb 100644 --- a/src/osgWrappers/osg/PagedLOD.cpp +++ b/src/osgWrappers/osg/PagedLOD.cpp @@ -186,6 +186,12 @@ BEGIN_OBJECT_REFLECTOR(osg::PagedLOD) __bool__removeExpiredChildren__double__NodeList_R1, "Remove the children from the PagedLOD which haven't been visited since specified expiry time. ", "The removed children are added to the removeChildren list passed into the method, this allows the children to be deleted later at the caller's discretion. Return true if children are removed, false otherwise. "); + I_ProtectedMethod1(void, expandPerRangeDataTo, IN, unsigned int, pos, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__expandPerRangeDataTo__unsigned_int, + "", + ""); I_SimpleProperty(const std::string &, DatabasePath, __C5_std_string_R1__getDatabasePath, __void__setDatabasePath__C5_std_string_R1); diff --git a/src/osgWrappers/osg/ProxyNode.cpp b/src/osgWrappers/osg/ProxyNode.cpp index 175dcb21f..f63e86e30 100644 --- a/src/osgWrappers/osg/ProxyNode.cpp +++ b/src/osgWrappers/osg/ProxyNode.cpp @@ -152,6 +152,12 @@ BEGIN_OBJECT_REFLECTOR(osg::ProxyNode) __BoundingSphere__computeBound, "Compute the bounding sphere around Node's geometry or children. ", "This method is automatically called by getBound() when the bounding sphere has been marked dirty via dirtyBound(). "); + I_ProtectedMethod1(void, expandFileNameListTo, IN, unsigned int, pos, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__expandFileNameListTo__unsigned_int, + "", + ""); I_SimpleProperty(const osg::Vec3 &, Center, __C5_Vec3_R1__getCenter, __void__setCenter__C5_Vec3_R1); diff --git a/src/osgWrappers/osg/Referenced.cpp b/src/osgWrappers/osg/Referenced.cpp index c5732d229..b787adade 100644 --- a/src/osgWrappers/osg/Referenced.cpp +++ b/src/osgWrappers/osg/Referenced.cpp @@ -92,6 +92,12 @@ BEGIN_OBJECT_REFLECTOR(osg::Referenced) __DeleteHandler_P1__getDeleteHandler_S, "Get a DeleteHandler. ", ""); + I_ProtectedMethod0(void, deletUsingDeleteHandler, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__deletUsingDeleteHandler, + "", + ""); I_SimpleProperty(bool, ThreadSafeRefUnref, __bool__getThreadSafeRefUnref, __void__setThreadSafeRefUnref__bool); diff --git a/src/osgWrappers/osg/Shader.cpp b/src/osgWrappers/osg/Shader.cpp index dd00cf34e..e507bb0ac 100644 --- a/src/osgWrappers/osg/Shader.cpp +++ b/src/osgWrappers/osg/Shader.cpp @@ -150,6 +150,19 @@ BEGIN_OBJECT_REFLECTOR(osg::Shader) __Shader_Type__getTypeId__C5_std_string_R1_S, "", ""); + + I_ProtectedMethod1(bool, addProgramRef, IN, osg::Program *, program, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __bool__addProgramRef__osg_Program_P1, + "", + ""); + I_ProtectedMethod1(bool, removeProgramRef, IN, osg::Program *, program, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __bool__removeProgramRef__osg_Program_P1, + "", + ""); I_SimpleProperty(const std::string &, ShaderSource, __C5_std_string_R1__getShaderSource, __void__setShaderSource__C5_std_string_R1); diff --git a/src/osgWrappers/osg/State.cpp b/src/osgWrappers/osg/State.cpp index 64e34c4fe..cfc8223b5 100644 --- a/src/osgWrappers/osg/State.cpp +++ b/src/osgWrappers/osg/State.cpp @@ -587,6 +587,59 @@ BEGIN_OBJECT_REFLECTOR(osg::State) __bool__checkGLErrors__C5_StateAttribute_P1, "", ""); + + + + + + + + + + + + + + + + + + + + + + + + I_ProtectedMethod0(bool, computeSecondaryColorSupported, + Properties::NON_VIRTUAL, + Properties::CONST, + __bool__computeSecondaryColorSupported, + "", + ""); + I_ProtectedMethod0(bool, computeFogCoordSupported, + Properties::NON_VIRTUAL, + Properties::CONST, + __bool__computeFogCoordSupported, + "", + ""); + I_ProtectedMethod0(bool, computeVertexBufferObjectSupported, + Properties::NON_VIRTUAL, + Properties::CONST, + __bool__computeVertexBufferObjectSupported, + "", + ""); + + + + + + + I_ProtectedMethod0(void, initializeExtensionProcs, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__initializeExtensionProcs, + "", + ""); I_SimpleProperty(bool, AbortRendering, __bool__getAbortRendering, 0); diff --git a/src/osgWrappers/osg/StateAttribute.cpp b/src/osgWrappers/osg/StateAttribute.cpp index d0f06a61c..e5d01d830 100644 --- a/src/osgWrappers/osg/StateAttribute.cpp +++ b/src/osgWrappers/osg/StateAttribute.cpp @@ -232,6 +232,18 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateAttribute) __void__releaseGLObjects__State_P1, "Release OpenGL objects in specified graphics context if State object is passed, otherwise release OpenGL objexts for all graphics context if State object pointer NULL. ", ""); + I_ProtectedMethod1(void, addParent, IN, osg::StateSet *, object, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__addParent__osg_StateSet_P1, + "", + ""); + I_ProtectedMethod1(void, removeParent, IN, osg::StateSet *, object, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__removeParent__osg_StateSet_P1, + "", + ""); I_SimpleProperty(osg::StateAttribute::Callback *, EventCallback, __Callback_P1__getEventCallback, __void__setEventCallback__Callback_P1); diff --git a/src/osgWrappers/osg/StateSet.cpp b/src/osgWrappers/osg/StateSet.cpp index 2742a3de7..69dae2f87 100644 --- a/src/osgWrappers/osg/StateSet.cpp +++ b/src/osgWrappers/osg/StateSet.cpp @@ -498,6 +498,102 @@ BEGIN_OBJECT_REFLECTOR(osg::StateSet) __void__releaseGLObjects__State_P1, "call release on all StateAttributes contained within this StateSet. ", ""); + I_ProtectedMethod1(void, addParent, IN, osg::Object *, object, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__addParent__osg_Object_P1, + "", + ""); + I_ProtectedMethod1(void, removeParent, IN, osg::Object *, object, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__removeParent__osg_Object_P1, + "", + ""); + I_ProtectedMethod1(osg::StateSet::ModeList &, getOrCreateTextureModeList, IN, unsigned int, unit, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __ModeList_R1__getOrCreateTextureModeList__unsigned_int, + "", + ""); + I_ProtectedMethod1(osg::StateSet::AttributeList &, getOrCreateTextureAttributeList, IN, unsigned int, unit, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __AttributeList_R1__getOrCreateTextureAttributeList__unsigned_int, + "", + ""); + I_ProtectedMethod2(int, compareModes, IN, const osg::StateSet::ModeList &, lhs, IN, const osg::StateSet::ModeList &, rhs, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __int__compareModes__C5_ModeList_R1__C5_ModeList_R1, + "", + ""); + I_ProtectedMethod2(int, compareAttributePtrs, IN, const osg::StateSet::AttributeList &, lhs, IN, const osg::StateSet::AttributeList &, rhs, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __int__compareAttributePtrs__C5_AttributeList_R1__C5_AttributeList_R1, + "", + ""); + I_ProtectedMethod2(int, compareAttributeContents, IN, const osg::StateSet::AttributeList &, lhs, IN, const osg::StateSet::AttributeList &, rhs, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __int__compareAttributeContents__C5_AttributeList_R1__C5_AttributeList_R1, + "", + ""); + I_ProtectedMethod3(void, setMode, IN, osg::StateSet::ModeList &, modeList, IN, osg::StateAttribute::GLMode, mode, IN, osg::StateAttribute::GLModeValue, value, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setMode__ModeList_R1__StateAttribute_GLMode__StateAttribute_GLModeValue, + "", + ""); + I_ProtectedMethod2(void, setModeToInherit, IN, osg::StateSet::ModeList &, modeList, IN, osg::StateAttribute::GLMode, mode, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setModeToInherit__ModeList_R1__StateAttribute_GLMode, + "", + ""); + I_ProtectedMethod2(osg::StateAttribute::GLModeValue, getMode, IN, const osg::StateSet::ModeList &, modeList, IN, osg::StateAttribute::GLMode, mode, + Properties::NON_VIRTUAL, + Properties::CONST, + __StateAttribute_GLModeValue__getMode__C5_ModeList_R1__StateAttribute_GLMode, + "", + ""); + I_ProtectedMethodWithDefaults3(void, setAttribute, IN, osg::StateSet::AttributeList &, attributeList, , IN, osg::StateAttribute *, attribute, , IN, const osg::StateAttribute::OverrideValue, value, osg::StateAttribute::OFF, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setAttribute__AttributeList_R1__StateAttribute_P1__C5_StateAttribute_OverrideValue, + "", + ""); + I_ProtectedMethod3(osg::StateAttribute *, getAttribute, IN, osg::StateSet::AttributeList &, attributeList, IN, const osg::StateAttribute::Type, type, IN, unsigned int, member, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __StateAttribute_P1__getAttribute__AttributeList_R1__C5_StateAttribute_Type__unsigned_int, + "", + ""); + I_ProtectedMethod3(const osg::StateAttribute *, getAttribute, IN, const osg::StateSet::AttributeList &, attributeList, IN, const osg::StateAttribute::Type, type, IN, unsigned int, member, + Properties::NON_VIRTUAL, + Properties::CONST, + __C5_StateAttribute_P1__getAttribute__C5_AttributeList_R1__C5_StateAttribute_Type__unsigned_int, + "", + ""); + I_ProtectedMethod3(const osg::StateSet::RefAttributePair *, getAttributePair, IN, const osg::StateSet::AttributeList &, attributeList, IN, const osg::StateAttribute::Type, type, IN, unsigned int, member, + Properties::NON_VIRTUAL, + Properties::CONST, + __C5_RefAttributePair_P1__getAttributePair__C5_AttributeList_R1__C5_StateAttribute_Type__unsigned_int, + "", + ""); + I_ProtectedMethod1(void, setNumChildrenRequiringUpdateTraversal, IN, unsigned int, num, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setNumChildrenRequiringUpdateTraversal__unsigned_int, + "", + ""); + I_ProtectedMethod1(void, setNumChildrenRequiringEventTraversal, IN, unsigned int, num, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setNumChildrenRequiringEventTraversal__unsigned_int, + "", + ""); I_SimpleProperty(osg::StateSet::AttributeList &, AttributeList, __AttributeList_R1__getAttributeList, __void__setAttributeList__AttributeList_R1); diff --git a/src/osgWrappers/osg/Stats.cpp b/src/osgWrappers/osg/Stats.cpp index d25e294b2..c0139aa04 100644 --- a/src/osgWrappers/osg/Stats.cpp +++ b/src/osgWrappers/osg/Stats.cpp @@ -112,6 +112,30 @@ BEGIN_OBJECT_REFLECTOR(osg::Stats) __void__report__std_ostream_R1__unsigned_int__C5_char_P1, "", ""); + I_ProtectedMethod3(bool, getAttributeNoMutex, IN, int, frameNumber, IN, const std::string &, attributeName, IN, double &, value, + Properties::NON_VIRTUAL, + Properties::CONST, + __bool__getAttributeNoMutex__int__C5_std_string_R1__double_R1, + "", + ""); + I_ProtectedMethod1(osg::Stats::AttributeMap &, getAttributeMapNoMutex, IN, int, frameNumber, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __AttributeMap_R1__getAttributeMapNoMutex__int, + "", + ""); + I_ProtectedMethod1(const osg::Stats::AttributeMap &, getAttributeMapNoMutex, IN, int, frameNumber, + Properties::NON_VIRTUAL, + Properties::CONST, + __C5_AttributeMap_R1__getAttributeMapNoMutex__int, + "", + ""); + I_ProtectedMethod1(int, getIndex, IN, int, frameNumber, + Properties::NON_VIRTUAL, + Properties::CONST, + __int__getIndex__int, + "", + ""); I_SimpleProperty(int, EarliestFrameNumber, __int__getEarliestFrameNumber, 0); diff --git a/src/osgWrappers/osg/TexEnvCombine.cpp b/src/osgWrappers/osg/TexEnvCombine.cpp index 268f7f263..41196ba8c 100644 --- a/src/osgWrappers/osg/TexEnvCombine.cpp +++ b/src/osgWrappers/osg/TexEnvCombine.cpp @@ -293,6 +293,18 @@ BEGIN_OBJECT_REFLECTOR(osg::TexEnvCombine) __void__apply__State_R1, "apply the OpenGL state attributes. ", "The render info for the current OpenGL context is passed in to allow the StateAttribute to obtain details on the the current context and state."); + I_ProtectedMethod1(bool, needsTexEnvCombiner, IN, GLint, value, + Properties::NON_VIRTUAL, + Properties::CONST, + __bool__needsTexEnvCombiner__GLint, + "", + ""); + I_ProtectedMethod0(void, computeNeedoForTexEnvCombiners, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__computeNeedoForTexEnvCombiners, + "", + ""); I_SimpleProperty(GLint, Combine_Alpha, __GLint__getCombine_Alpha, __void__setCombine_Alpha__GLint); diff --git a/src/osgWrappers/osg/Texture.cpp b/src/osgWrappers/osg/Texture.cpp index 9683f1494..6853c893c 100644 --- a/src/osgWrappers/osg/Texture.cpp +++ b/src/osgWrappers/osg/Texture.cpp @@ -453,6 +453,42 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture) __void__flushDeletedTextureObjects__unsigned_int__double__double_R1_S, "", ""); + I_ProtectedMethod0(void, computeInternalFormat, + Properties::PURE_VIRTUAL, + Properties::CONST, + __void__computeInternalFormat, + "", + ""); + I_ProtectedMethod1(void, computeInternalFormatWithImage, IN, const osg::Image &, image, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__computeInternalFormatWithImage__C5_osg_Image_R1, + "", + ""); + I_ProtectedMethod5(void, computeRequiredTextureDimensions, IN, osg::State &, state, IN, const osg::Image &, image, IN, GLsizei &, width, IN, GLsizei &, height, IN, GLsizei &, numMipmapLevels, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__computeRequiredTextureDimensions__State_R1__C5_osg_Image_R1__GLsizei_R1__GLsizei_R1__GLsizei_R1, + "", + ""); + I_ProtectedMethod2(void, applyTexParameters, IN, GLenum, target, IN, osg::State &, state, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__applyTexParameters__GLenum__State_R1, + "Helper method. ", + "Sets texture paramters. "); + I_ProtectedMethod1(int, compareTexture, IN, const osg::Texture &, rhs, + Properties::NON_VIRTUAL, + Properties::CONST, + __int__compareTexture__C5_Texture_R1, + "Returns -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", + ""); + I_ProtectedMethod1(int, compareTextureObjects, IN, const osg::Texture &, rhs, + Properties::NON_VIRTUAL, + Properties::CONST, + __int__compareTextureObjects__C5_Texture_R1, + "Returns -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", + ""); I_SimpleProperty(const osg::Vec4 &, BorderColor, __C5_Vec4_R1__getBorderColor, __void__setBorderColor__C5_Vec4_R1); diff --git a/src/osgWrappers/osg/Texture1D.cpp b/src/osgWrappers/osg/Texture1D.cpp index 8f7bd9923..0a924513d 100644 --- a/src/osgWrappers/osg/Texture1D.cpp +++ b/src/osgWrappers/osg/Texture1D.cpp @@ -174,6 +174,18 @@ BEGIN_OBJECT_REFLECTOR(osg::Texture1D) __void__apply__State_R1, "Bind the texture object. ", "If the texture object hasn't already been compiled, create the texture mipmap levels. "); + I_ProtectedMethod0(void, computeInternalFormat, + Properties::VIRTUAL, + Properties::CONST, + __void__computeInternalFormat, + "", + ""); + I_ProtectedMethod5(void, applyTexImage1D, IN, GLenum, target, IN, osg::Image *, image, IN, osg::State &, state, IN, GLsizei &, width, IN, GLsizei &, numMipmapLevels, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__applyTexImage1D__GLenum__Image_P1__State_R1__GLsizei_R1__GLsizei_R1, + "Helper method. ", + "Createa the texture without setting or using a texture binding. "); I_SimpleProperty(osg::Image *, Image, __Image_P1__getImage, __void__setImage__Image_P1); diff --git a/src/osgWrappers/osg/Texture2D.cpp b/src/osgWrappers/osg/Texture2D.cpp index 2483ef61c..76c84bbc2 100644 --- a/src/osgWrappers/osg/Texture2D.cpp +++ b/src/osgWrappers/osg/Texture2D.cpp @@ -189,6 +189,12 @@ BEGIN_OBJECT_REFLECTOR(osg::Texture2D) __void__apply__State_R1, "Bind the texture object. ", "If the texture object hasn't already been compiled, create the texture mipmap levels. "); + I_ProtectedMethod0(void, computeInternalFormat, + Properties::VIRTUAL, + Properties::CONST, + __void__computeInternalFormat, + "", + ""); I_SimpleProperty(osg::Image *, Image, __Image_P1__getImage, __void__setImage__Image_P1); diff --git a/src/osgWrappers/osg/Texture3D.cpp b/src/osgWrappers/osg/Texture3D.cpp index bc8a7bf24..b9d920048 100644 --- a/src/osgWrappers/osg/Texture3D.cpp +++ b/src/osgWrappers/osg/Texture3D.cpp @@ -197,6 +197,24 @@ BEGIN_OBJECT_REFLECTOR(osg::Texture3D) __void__setExtensions__unsigned_int__Extensions_P1_S, "Overrides Extensions objects across graphics contexts. ", "Typically used to ensure the same lowest common denominator of extensions on sustems with different graphics pipes. "); + I_ProtectedMethod6(void, computeRequiredTextureDimensions, IN, osg::State &, state, IN, const osg::Image &, image, IN, GLsizei &, width, IN, GLsizei &, height, IN, GLsizei &, depth, IN, GLsizei &, numMipmapLevels, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__computeRequiredTextureDimensions__State_R1__C5_osg_Image_R1__GLsizei_R1__GLsizei_R1__GLsizei_R1__GLsizei_R1, + "", + ""); + I_ProtectedMethod0(void, computeInternalFormat, + Properties::VIRTUAL, + Properties::CONST, + __void__computeInternalFormat, + "", + ""); + I_ProtectedMethod7(void, applyTexImage3D, IN, GLenum, target, IN, osg::Image *, image, IN, osg::State &, state, IN, GLsizei &, inwidth, IN, GLsizei &, inheight, IN, GLsizei &, indepth, IN, GLsizei &, numMipmapLevels, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__applyTexImage3D__GLenum__Image_P1__State_R1__GLsizei_R1__GLsizei_R1__GLsizei_R1__GLsizei_R1, + "", + ""); I_SimpleProperty(osg::Image *, Image, __Image_P1__getImage, __void__setImage__Image_P1); diff --git a/src/osgWrappers/osg/TextureCubeMap.cpp b/src/osgWrappers/osg/TextureCubeMap.cpp index b717ddd15..cce370a8f 100644 --- a/src/osgWrappers/osg/TextureCubeMap.cpp +++ b/src/osgWrappers/osg/TextureCubeMap.cpp @@ -181,6 +181,18 @@ BEGIN_OBJECT_REFLECTOR(osg::TextureCubeMap) __void__setExtensions__unsigned_int__Extensions_P1_S, "The setExtensions method allows users to override the extensions across graphics contexts. ", "Typically used when you have different extensions supported across graphics pipes but need to ensure that they all use the same low common denominator extensions."); + I_ProtectedMethod0(bool, imagesValid, + Properties::NON_VIRTUAL, + Properties::CONST, + __bool__imagesValid, + "", + ""); + I_ProtectedMethod0(void, computeInternalFormat, + Properties::VIRTUAL, + Properties::CONST, + __void__computeInternalFormat, + "", + ""); I_ArrayProperty(osg::Image *, Image, __Image_P1__getImage__unsigned_int, __void__setImage__unsigned_int__Image_P1, diff --git a/src/osgWrappers/osg/TextureRectangle.cpp b/src/osgWrappers/osg/TextureRectangle.cpp index 43ac6d0be..7bcb56b0d 100644 --- a/src/osgWrappers/osg/TextureRectangle.cpp +++ b/src/osgWrappers/osg/TextureRectangle.cpp @@ -179,6 +179,30 @@ BEGIN_OBJECT_REFLECTOR(osg::TextureRectangle) __void__apply__State_R1, "On first apply (unless already compiled), create and bind the texture, subsequent apply will simply bind to texture. ", ""); + I_ProtectedMethod0(void, computeInternalFormat, + Properties::VIRTUAL, + Properties::CONST, + __void__computeInternalFormat, + "", + ""); + I_ProtectedMethod2(void, applyTexParameters, IN, GLenum, target, IN, osg::State &, state, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__applyTexParameters__GLenum__State_R1, + "Helper method. ", + "Sets texture paramters. "); + I_ProtectedMethod5(void, applyTexImage_load, IN, GLenum, target, IN, osg::Image *, image, IN, osg::State &, state, IN, GLsizei &, inwidth, IN, GLsizei &, inheight, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__applyTexImage_load__GLenum__Image_P1__State_R1__GLsizei_R1__GLsizei_R1, + "", + ""); + I_ProtectedMethod6(void, applyTexImage_subload, IN, GLenum, target, IN, osg::Image *, image, IN, osg::State &, state, IN, GLsizei &, inwidth, IN, GLsizei &, inheight, IN, GLint &, inInternalFormat, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__applyTexImage_subload__GLenum__Image_P1__State_R1__GLsizei_R1__GLsizei_R1__GLint_R1, + "", + ""); I_SimpleProperty(osg::Image *, Image, __Image_P1__getImage, __void__setImage__Image_P1); diff --git a/src/osgWrappers/osg/Uniform.cpp b/src/osgWrappers/osg/Uniform.cpp index 7424c7055..aa53ced4d 100644 --- a/src/osgWrappers/osg/Uniform.cpp +++ b/src/osgWrappers/osg/Uniform.cpp @@ -740,6 +740,36 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform) __GLenum__getInternalArrayType__Type_S, "Return the internal data array type corresponding to a GLSL type. ", ""); + I_ProtectedMethod1(bool, isCompatibleType, IN, osg::Uniform::Type, t, + Properties::NON_VIRTUAL, + Properties::CONST, + __bool__isCompatibleType__Type, + "", + ""); + I_ProtectedMethod0(bool, isScalar, + Properties::NON_VIRTUAL, + Properties::CONST, + __bool__isScalar, + "", + ""); + I_ProtectedMethod0(void, allocateDataArray, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__allocateDataArray, + "", + ""); + I_ProtectedMethod1(void, addParent, IN, osg::StateSet *, object, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__addParent__osg_StateSet_P1, + "", + ""); + I_ProtectedMethod1(void, removeParent, IN, osg::StateSet *, object, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__removeParent__osg_StateSet_P1, + "", + ""); I_SimpleProperty(osg::FloatArray *, Array, 0, __bool__setArray__FloatArray_P1); diff --git a/src/osgWrappers/osgDB/DatabasePager.cpp b/src/osgWrappers/osgDB/DatabasePager.cpp index 07a07d1bf..258d41267 100644 --- a/src/osgWrappers/osgDB/DatabasePager.cpp +++ b/src/osgWrappers/osgDB/DatabasePager.cpp @@ -283,6 +283,30 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager) __unsigned_int__getDataToCompileListSize, "Report how many items are in the _dataToCompileList queue. ", ""); + I_ProtectedMethod0(void, updateDatabasePagerThreadBlock, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__updateDatabasePagerThreadBlock, + "", + ""); + I_ProtectedMethod1(void, updateFrameBlock, IN, int, delta, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__updateFrameBlock__int, + "", + ""); + I_ProtectedMethod1(void, removeExpiredSubgraphs, IN, double, currentFrameTime, + Properties::VIRTUAL, + Properties::NON_CONST, + __void__removeExpiredSubgraphs__double, + "Iterate through the active PagedLOD nodes children removing children which havn't been visited since specified expiryTime. ", + "note, should be only be called from the update thread. "); + I_ProtectedMethod1(void, addLoadedDataToSceneGraph, IN, double, currentFrameTime, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__addLoadedDataToSceneGraph__double, + "Add the loaded data to the scene graph. ", + ""); I_SimpleProperty(bool, AcceptNewDatabaseRequests, __bool__getAcceptNewDatabaseRequests, __void__setAcceptNewDatabaseRequests__bool); diff --git a/src/osgWrappers/osgDB/DotOsgWrapper.cpp b/src/osgWrappers/osgDB/DotOsgWrapper.cpp index 4d310c605..adcedad4e 100644 --- a/src/osgWrappers/osgDB/DotOsgWrapper.cpp +++ b/src/osgWrappers/osgDB/DotOsgWrapper.cpp @@ -68,6 +68,14 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DotOsgWrapper) __ReadWriteMode__getReadWriteMode, "", ""); + I_ProtectedConstructor0(____DotOsgWrapper, + "protected to prevent inappropriate creation of wrappers. ", + ""); + I_ProtectedConstructor1(IN, osgDB::DotOsgWrapper &, x, + Properties::NON_EXPLICIT, + ____DotOsgWrapper__DotOsgWrapper_R1, + "protected to prevent inappropriate creation of wrappers. ", + ""); I_SimpleProperty(const osgDB::DotOsgWrapper::Associates &, Associates, __C5_Associates_R1__getAssociates, 0); diff --git a/src/osgWrappers/osgDB/DynamicLibrary.cpp b/src/osgWrappers/osgDB/DynamicLibrary.cpp index 98e7ace6f..62ba39c4e 100644 --- a/src/osgWrappers/osgDB/DynamicLibrary.cpp +++ b/src/osgWrappers/osgDB/DynamicLibrary.cpp @@ -50,6 +50,18 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DynamicLibrary) __DynamicLibrary_P1__loadLibrary__C5_std_string_R1_S, "returns a pointer to a DynamicLibrary object on successfully opening of library returns NULL on failure. ", ""); + I_ProtectedConstructor0(____DynamicLibrary, + "disallow default constructor. ", + ""); + I_ProtectedConstructor1(IN, const osgDB::DynamicLibrary &, x, + Properties::NON_EXPLICIT, + ____DynamicLibrary__C5_DynamicLibrary_R1, + "disallow copy constructor. ", + ""); + I_ProtectedConstructor2(IN, const std::string &, name, IN, osgDB::DynamicLibrary::HANDLE, handle, + ____DynamicLibrary__C5_std_string_R1__HANDLE, + "Disallow public construction so that users have to go through loadLibrary() above which returns NULL on failure, a valid DynamicLibrary object on success. ", + ""); I_SimpleProperty(const std::string &, FullName, __C5_std_string_R1__getFullName, 0); diff --git a/src/osgWrappers/osgDB/Field.cpp b/src/osgWrappers/osgDB/Field.cpp index 893e6e3de..fa3322a41 100644 --- a/src/osgWrappers/osgDB/Field.cpp +++ b/src/osgWrappers/osgDB/Field.cpp @@ -194,6 +194,24 @@ BEGIN_VALUE_REFLECTOR(osgDB::Field) __FieldType__calculateFieldType__C5_char_P1__bool_S, "", ""); + I_ProtectedMethod0(void, _init, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void___init, + "", + ""); + I_ProtectedMethod0(void, _free, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void___free, + "", + ""); + I_ProtectedMethod1(void, _copy, IN, const osgDB::Field &, ic, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void___copy__C5_Field_R1, + "", + ""); I_SimpleProperty(osgDB::Field::FieldType, FieldType, __FieldType__getFieldType, 0); diff --git a/src/osgWrappers/osgDB/Registry.cpp b/src/osgWrappers/osgDB/Registry.cpp index 4fbe145a1..4d13f496a 100644 --- a/src/osgWrappers/osgDB/Registry.cpp +++ b/src/osgWrappers/osgDB/Registry.cpp @@ -461,6 +461,24 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Registry) __Registry_P1__instance__bool_S, "", ""); + 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 ", + ""); + + + + I_ProtectedMethod1(osgDB::ReaderWriter::ReadResult, read, IN, const osgDB::Registry::ReadFunctor &, readFunctor, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __ReaderWriter_ReadResult__read__C5_ReadFunctor_R1, + "", + ""); + I_ProtectedMethod2(osgDB::ReaderWriter::ReadResult, readImplementation, IN, const osgDB::Registry::ReadFunctor &, readFunctor, IN, bool, useObjectCache, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __ReaderWriter_ReadResult__readImplementation__C5_ReadFunctor_R1__bool, + "", + ""); I_SimpleProperty(bool, CreateNodeFromImage, __bool__getCreateNodeFromImage, __void__setCreateNodeFromImage__bool); diff --git a/src/osgWrappers/osgDB/SharedStateManager.cpp b/src/osgWrappers/osgDB/SharedStateManager.cpp index 9c0d019b7..fb3038bcb 100644 --- a/src/osgWrappers/osgDB/SharedStateManager.cpp +++ b/src/osgWrappers/osgDB/SharedStateManager.cpp @@ -64,6 +64,36 @@ BEGIN_OBJECT_REFLECTOR(osgDB::SharedStateManager) __void__apply__osg_Geode_R1, "", ""); + I_ProtectedMethod2(void, process, IN, osg::StateSet *, ss, IN, osg::Object *, parent, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__process__osg_StateSet_P1__osg_Object_P1, + "", + ""); + I_ProtectedMethod1(osg::StateAttribute *, find, IN, osg::StateAttribute *, sa, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __osg_StateAttribute_P1__find__osg_StateAttribute_P1, + "", + ""); + I_ProtectedMethod1(osg::StateSet *, find, IN, osg::StateSet *, ss, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __osg_StateSet_P1__find__osg_StateSet_P1, + "", + ""); + I_ProtectedMethod2(void, setStateSet, IN, osg::StateSet *, ss, IN, osg::Object *, object, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setStateSet__osg_StateSet_P1__osg_Object_P1, + "", + ""); + I_ProtectedMethod1(void, shareTextures, IN, osg::StateSet *, ss, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__shareTextures__osg_StateSet_P1, + "", + ""); I_SimpleProperty(unsigned int, ShareMode, __unsigned_int__getShareMode, __void__setShareMode__unsigned_int); diff --git a/src/osgWrappers/osgFX/AnisotropicLighting.cpp b/src/osgWrappers/osgFX/AnisotropicLighting.cpp index 10e2e04ac..b1a0983fb 100644 --- a/src/osgWrappers/osgFX/AnisotropicLighting.cpp +++ b/src/osgWrappers/osgFX/AnisotropicLighting.cpp @@ -103,6 +103,12 @@ BEGIN_OBJECT_REFLECTOR(osgFX::AnisotropicLighting) __void__setLightNumber__int, "set the OpenGL light number that will be used in lighting computations ", ""); + I_ProtectedMethod0(bool, define_techniques, + Properties::VIRTUAL, + Properties::NON_CONST, + __bool__define_techniques, + "abstract method to be implemented in derived classes; its purpose if to create the techniques that can be used for obtaining the desired effect. ", + "You will usually call addTechnique() inside this method."); I_SimpleProperty(int, LightNumber, __int__getLightNumber, __void__setLightNumber__int); diff --git a/src/osgWrappers/osgFX/BumpMapping.cpp b/src/osgWrappers/osgFX/BumpMapping.cpp index 308524e60..782d46ce0 100644 --- a/src/osgWrappers/osgFX/BumpMapping.cpp +++ b/src/osgWrappers/osgFX/BumpMapping.cpp @@ -160,6 +160,12 @@ BEGIN_OBJECT_REFLECTOR(osgFX::BumpMapping) __void__setUpDemo, "set up a demo environment with predefined diffuse and normal maps, as well as texture coordinates ", ""); + I_ProtectedMethod0(bool, define_techniques, + Properties::VIRTUAL, + Properties::NON_CONST, + __bool__define_techniques, + "abstract method to be implemented in derived classes; its purpose if to create the techniques that can be used for obtaining the desired effect. ", + "You will usually call addTechnique() inside this method."); I_SimpleProperty(int, DiffuseTextureUnit, __int__getDiffuseTextureUnit, __void__setDiffuseTextureUnit__int); diff --git a/src/osgWrappers/osgFX/Cartoon.cpp b/src/osgWrappers/osgFX/Cartoon.cpp index da2f2eade..955fbbbd4 100644 --- a/src/osgWrappers/osgFX/Cartoon.cpp +++ b/src/osgWrappers/osgFX/Cartoon.cpp @@ -108,6 +108,12 @@ BEGIN_OBJECT_REFLECTOR(osgFX::Cartoon) __void__setLightNumber__int, "set the OpenGL light number that will be used in lighting computations ", ""); + I_ProtectedMethod0(bool, define_techniques, + Properties::VIRTUAL, + Properties::NON_CONST, + __bool__define_techniques, + "abstract method to be implemented in derived classes; its purpose if to create the techniques that can be used for obtaining the desired effect. ", + "You will usually call addTechnique() inside this method."); I_SimpleProperty(int, LightNumber, __int__getLightNumber, __void__setLightNumber__int); diff --git a/src/osgWrappers/osgFX/Effect.cpp b/src/osgWrappers/osgFX/Effect.cpp index bdce597ad..06a9f8395 100644 --- a/src/osgWrappers/osgFX/Effect.cpp +++ b/src/osgWrappers/osgFX/Effect.cpp @@ -117,6 +117,24 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgFX::Effect) __void__inherited_traverse__osg_NodeVisitor_R1, "default traversal ", ""); + I_ProtectedMethod0(void, dirtyTechniques, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__dirtyTechniques, + "force rebuilding of techniques on next traversal ", + ""); + I_ProtectedMethod1(void, addTechnique, IN, osgFX::Technique *, tech, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__addTechnique__Technique_P1, + "add a technique to the Effect ", + ""); + I_ProtectedMethod0(bool, define_techniques, + Properties::PURE_VIRTUAL, + Properties::NON_CONST, + __bool__define_techniques, + "abstract method to be implemented in derived classes; its purpose if to create the techniques that can be used for obtaining the desired effect. ", + "You will usually call addTechnique() inside this method."); I_SimpleProperty(bool, Enabled, __bool__getEnabled, __void__setEnabled__bool); diff --git a/src/osgWrappers/osgFX/MultiTextureControl.cpp b/src/osgWrappers/osgFX/MultiTextureControl.cpp index ddcb077a2..b2d1b34e1 100644 --- a/src/osgWrappers/osgFX/MultiTextureControl.cpp +++ b/src/osgWrappers/osgFX/MultiTextureControl.cpp @@ -77,6 +77,12 @@ BEGIN_OBJECT_REFLECTOR(osgFX::MultiTextureControl) __unsigned_int__getNumTextureWeights, "", ""); + I_ProtectedMethod0(void, updateStateSet, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__updateStateSet, + "", + ""); I_ArrayProperty(float, TextureWeight, __float__getTextureWeight__unsigned_int, __void__setTextureWeight__unsigned_int__float, diff --git a/src/osgWrappers/osgFX/Registry.cpp b/src/osgWrappers/osgFX/Registry.cpp index fcd339cd3..aa4348925 100644 --- a/src/osgWrappers/osgFX/Registry.cpp +++ b/src/osgWrappers/osgFX/Registry.cpp @@ -39,6 +39,9 @@ BEGIN_OBJECT_REFLECTOR(osgFX::Registry) __Registry_P1__instance_S, "", ""); + I_ProtectedConstructor0(____Registry, + "", + ""); I_SimpleProperty(const osgFX::Registry::EffectMap &, EffectMap, __C5_EffectMap_R1__getEffectMap, 0); diff --git a/src/osgWrappers/osgFX/Scribe.cpp b/src/osgWrappers/osgFX/Scribe.cpp index 2cb167723..da62a48c0 100644 --- a/src/osgWrappers/osgFX/Scribe.cpp +++ b/src/osgWrappers/osgFX/Scribe.cpp @@ -98,6 +98,12 @@ BEGIN_OBJECT_REFLECTOR(osgFX::Scribe) __void__setWireframeLineWidth__float, "set the wireframe line width ", ""); + I_ProtectedMethod0(bool, define_techniques, + Properties::VIRTUAL, + Properties::NON_CONST, + __bool__define_techniques, + "abstract method to be implemented in derived classes; its purpose if to create the techniques that can be used for obtaining the desired effect. ", + "You will usually call addTechnique() inside this method."); I_SimpleProperty(const osg::Vec4 &, WireframeColor, __C5_osg_Vec4_R1__getWireframeColor, __void__setWireframeColor__C5_osg_Vec4_R1); diff --git a/src/osgWrappers/osgFX/SpecularHighlights.cpp b/src/osgWrappers/osgFX/SpecularHighlights.cpp index 675663039..e88022f20 100644 --- a/src/osgWrappers/osgFX/SpecularHighlights.cpp +++ b/src/osgWrappers/osgFX/SpecularHighlights.cpp @@ -118,6 +118,12 @@ BEGIN_OBJECT_REFLECTOR(osgFX::SpecularHighlights) __void__setSpecularExponent__float, "set the specular exponent ", ""); + I_ProtectedMethod0(bool, define_techniques, + Properties::VIRTUAL, + Properties::NON_CONST, + __bool__define_techniques, + "abstract method to be implemented in derived classes; its purpose if to create the techniques that can be used for obtaining the desired effect. ", + "You will usually call addTechnique() inside this method."); I_SimpleProperty(int, LightNumber, __int__getLightNumber, __void__setLightNumber__int); diff --git a/src/osgWrappers/osgFX/Technique.cpp b/src/osgWrappers/osgFX/Technique.cpp index 91b4ee6a1..301029c4f 100644 --- a/src/osgWrappers/osgFX/Technique.cpp +++ b/src/osgWrappers/osgFX/Technique.cpp @@ -69,5 +69,40 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgFX::Technique) __void__traverse__osg_NodeVisitor_R1__Effect_P1, "traverse children with multipass if necessary. ", "By default this method simply calls the protected method traverse_implementation(); you can override it to change the default behavior. Don't call this method directly as it is called by osgFX::Effect"); + I_ProtectedConstructor1(IN, const osgFX::Technique &, x, + Properties::NON_EXPLICIT, + ____Technique__C5_Technique_R1, + "", + ""); + I_ProtectedMethod0(void, dirtyPasses, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__dirtyPasses, + "force rebuilding of pass nodes on next traversal ", + ""); + I_ProtectedMethodWithDefaults1(void, addPass, IN, osg::StateSet *, ss, 0, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__addPass__osg_StateSet_P1, + "create a new pass node, add it to the technique and associate a StateSet ", + ""); + I_ProtectedMethod1(osg::Node *, getOverrideChild, IN, int, x, + Properties::VIRTUAL, + Properties::NON_CONST, + __osg_Node_P1__getOverrideChild__int, + "optional: return a node that overrides the child node on a specified pass ", + ""); + I_ProtectedMethod0(void, define_passes, + Properties::PURE_VIRTUAL, + Properties::NON_CONST, + __void__define_passes, + "define the rendering passes that make up this technique. ", + "You must implement this method in derived classes to add the required passes."); + I_ProtectedMethod2(void, traverse_implementation, IN, osg::NodeVisitor &, nv, IN, osgFX::Effect *, fx, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__traverse_implementation__osg_NodeVisitor_R1__Effect_P1, + "traverse children with multipass if necessary. ", + "Don't call this method directly unless you are in a customized version of traverse()."); END_REFLECTOR diff --git a/src/osgWrappers/osgGA/AnimationPathManipulator.cpp b/src/osgWrappers/osgGA/AnimationPathManipulator.cpp index f6f4f0990..ddc5da4fc 100644 --- a/src/osgWrappers/osgGA/AnimationPathManipulator.cpp +++ b/src/osgWrappers/osgGA/AnimationPathManipulator.cpp @@ -117,6 +117,12 @@ BEGIN_OBJECT_REFLECTOR(osgGA::AnimationPathManipulator) __void__getUsage__osg_ApplicationUsage_R1, "Get the keyboard and mouse usage of this manipulator. ", ""); + I_ProtectedMethod1(void, handleFrame, IN, double, time, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__handleFrame__double, + "", + ""); I_SimpleProperty(osg::AnimationPath *, AnimationPath, __osg_AnimationPath_P1__getAnimationPath, __void__setAnimationPath__osg_AnimationPath_P1); diff --git a/src/osgWrappers/osgGA/DriveManipulator.cpp b/src/osgWrappers/osgGA/DriveManipulator.cpp index 1f75cb076..8bc2713bf 100644 --- a/src/osgWrappers/osgGA/DriveManipulator.cpp +++ b/src/osgWrappers/osgGA/DriveManipulator.cpp @@ -125,6 +125,30 @@ BEGIN_OBJECT_REFLECTOR(osgGA::DriveManipulator) __double__getHeight, "", ""); + I_ProtectedMethod0(void, flushMouseEventStack, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__flushMouseEventStack, + "Reset the internal GUIEvent stack. ", + ""); + I_ProtectedMethod1(void, addMouseEvent, IN, const osgGA::GUIEventAdapter &, ea, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__addMouseEvent__C5_GUIEventAdapter_R1, + "Add the current mouse GUIEvent to internal stack. ", + ""); + I_ProtectedMethod3(void, computePosition, IN, const osg::Vec3d &, eye, IN, const osg::Vec3d &, lv, IN, const osg::Vec3d &, up, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__computePosition__C5_osg_Vec3d_R1__C5_osg_Vec3d_R1__C5_osg_Vec3d_R1, + "", + ""); + I_ProtectedMethod0(bool, calcMovement, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __bool__calcMovement, + "For the give mouse movement calculate the movement of the camera. ", + "Return true is camera has moved and a redraw is required. "); I_SimpleProperty(const osg::Matrixd &, ByInverseMatrix, 0, __void__setByInverseMatrix__C5_osg_Matrixd_R1); diff --git a/src/osgWrappers/osgGA/EventVisitor.cpp b/src/osgWrappers/osgGA/EventVisitor.cpp index 117211d40..f556610f9 100644 --- a/src/osgWrappers/osgGA/EventVisitor.cpp +++ b/src/osgWrappers/osgGA/EventVisitor.cpp @@ -145,6 +145,30 @@ BEGIN_OBJECT_REFLECTOR(osgGA::EventVisitor) __void__apply__osg_OccluderNode_R1, "", ""); + I_ProtectedMethod1(void, handle_callbacks, IN, osg::StateSet *, stateset, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__handle_callbacks__osg_StateSet_P1, + "", + ""); + I_ProtectedMethod1(void, handle_callbacks_and_traverse, IN, osg::Node &, node, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__handle_callbacks_and_traverse__osg_Node_R1, + "", + ""); + I_ProtectedMethod1(void, handle_geode_callbacks, IN, osg::Geode &, node, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__handle_geode_callbacks__osg_Geode_R1, + "", + ""); + I_ProtectedMethod1(void, traverseGeode, IN, osg::Geode &, geode, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__traverseGeode__osg_Geode_R1, + "", + ""); I_SimpleProperty(osgGA::GUIActionAdapter *, ActionAdapter, __osgGA_GUIActionAdapter_P1__getActionAdapter, __void__setActionAdapter__osgGA_GUIActionAdapter_P1); diff --git a/src/osgWrappers/osgGA/FlightManipulator.cpp b/src/osgWrappers/osgGA/FlightManipulator.cpp index 768dc27d4..2c9dc8ac8 100644 --- a/src/osgWrappers/osgGA/FlightManipulator.cpp +++ b/src/osgWrappers/osgGA/FlightManipulator.cpp @@ -130,6 +130,30 @@ BEGIN_OBJECT_REFLECTOR(osgGA::FlightManipulator) __double__getVelocity, "", ""); + I_ProtectedMethod0(void, flushMouseEventStack, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__flushMouseEventStack, + "Reset the internal GUIEvent stack. ", + ""); + I_ProtectedMethod1(void, addMouseEvent, IN, const osgGA::GUIEventAdapter &, ea, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__addMouseEvent__C5_GUIEventAdapter_R1, + "Add the current mouse GUIEvent to internal stack. ", + ""); + I_ProtectedMethod3(void, computePosition, IN, const osg::Vec3 &, eye, IN, const osg::Vec3 &, lv, IN, const osg::Vec3 &, up, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__computePosition__C5_osg_Vec3_R1__C5_osg_Vec3_R1__C5_osg_Vec3_R1, + "", + ""); + I_ProtectedMethod0(bool, calcMovement, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __bool__calcMovement, + "For the give mouse movement calculate the movement of the camera. ", + "Return true is camera has moved and a redraw is required. "); I_SimpleProperty(double, Acceleration, __double__getAcceleration, __void__setAcceleration__double); diff --git a/src/osgWrappers/osgGA/MatrixManipulator.cpp b/src/osgWrappers/osgGA/MatrixManipulator.cpp index 8bd0af3a1..84640ec4f 100644 --- a/src/osgWrappers/osgGA/MatrixManipulator.cpp +++ b/src/osgWrappers/osgGA/MatrixManipulator.cpp @@ -179,6 +179,9 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::MatrixManipulator) __bool__handle__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, "Handle events, return true if handled, false otherwise. ", ""); + I_ProtectedConstructor0(____MatrixManipulator, + "", + ""); I_SimpleProperty(bool, AutoComputeHomePosition, __bool__getAutoComputeHomePosition, __void__setAutoComputeHomePosition__bool); diff --git a/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp b/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp index b7050c8c7..4b3c43a33 100644 --- a/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp +++ b/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp @@ -169,6 +169,84 @@ BEGIN_OBJECT_REFLECTOR(osgGA::NodeTrackerManipulator) __void__getUsage__osg_ApplicationUsage_R1, "Get the keyboard and mouse usage of this manipulator. ", ""); + I_ProtectedMethod0(osg::NodePath, getNodePath, + Properties::NON_VIRTUAL, + Properties::CONST, + __osg_NodePath__getNodePath, + "", + ""); + I_ProtectedMethod0(bool, validateNodePath, + Properties::NON_VIRTUAL, + Properties::CONST, + __bool__validateNodePath, + "", + ""); + I_ProtectedMethod0(void, flushMouseEventStack, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__flushMouseEventStack, + "Reset the internal GUIEvent stack. ", + ""); + I_ProtectedMethod1(void, addMouseEvent, IN, const osgGA::GUIEventAdapter &, ea, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__addMouseEvent__C5_GUIEventAdapter_R1, + "Add the current mouse GUIEvent to internal stack. ", + ""); + I_ProtectedMethod1(void, computeNodeWorldToLocal, IN, osg::Matrixd &, worldToLocal, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__computeNodeWorldToLocal__osg_Matrixd_R1, + "", + ""); + I_ProtectedMethod1(void, computeNodeLocalToWorld, IN, osg::Matrixd &, localToWorld, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__computeNodeLocalToWorld__osg_Matrixd_R1, + "", + ""); + I_ProtectedMethod2(void, computeNodeCenterAndRotation, IN, osg::Vec3d &, center, IN, osg::Quat &, rotation, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__computeNodeCenterAndRotation__osg_Vec3d_R1__osg_Quat_R1, + "", + ""); + I_ProtectedMethod3(void, computePosition, IN, const osg::Vec3d &, eye, IN, const osg::Vec3d &, lv, IN, const osg::Vec3d &, up, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__computePosition__C5_osg_Vec3d_R1__C5_osg_Vec3d_R1__C5_osg_Vec3d_R1, + "", + ""); + I_ProtectedMethod0(bool, calcMovement, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __bool__calcMovement, + "For the give mouse movement calculate the movement of the camera. ", + "Return true is camera has moved and a redraw is required. "); + I_ProtectedMethod6(void, trackball, IN, osg::Vec3 &, axis, IN, double &, angle, IN, double, p1x, IN, double, p1y, IN, double, p2x, IN, double, p2y, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__trackball__osg_Vec3_R1__double_R1__double__double__double__double, + "", + ""); + I_ProtectedMethod3(double, tb_project_to_sphere, IN, double, r, IN, double, x, IN, double, y, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __double__tb_project_to_sphere__double__double__double, + "", + ""); + I_ProtectedMethod0(bool, isMouseMoving, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __bool__isMouseMoving, + "Check the speed at which the mouse is moving. ", + "If speed is below a threshold then return false, otherwise return true. "); + I_ProtectedMethod0(void, clampOrientation, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__clampOrientation, + "", + ""); I_SimpleProperty(const osg::Matrixd &, ByInverseMatrix, 0, __void__setByInverseMatrix__C5_osg_Matrixd_R1); diff --git a/src/osgWrappers/osgGA/StateSetManipulator.cpp b/src/osgWrappers/osgGA/StateSetManipulator.cpp index 0e9a4cce3..0dfac481d 100644 --- a/src/osgWrappers/osgGA/StateSetManipulator.cpp +++ b/src/osgWrappers/osgGA/StateSetManipulator.cpp @@ -117,6 +117,12 @@ BEGIN_OBJECT_REFLECTOR(osgGA::StateSetManipulator) __void__cyclePolygonMode, "", ""); + I_ProtectedMethod0(osg::PolygonMode *, getOrCreatePolygonMode, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __osg_PolygonMode_P1__getOrCreatePolygonMode, + "", + ""); I_SimpleProperty(bool, BackfaceEnabled, __bool__getBackfaceEnabled, __void__setBackfaceEnabled__bool); diff --git a/src/osgWrappers/osgGA/TerrainManipulator.cpp b/src/osgWrappers/osgGA/TerrainManipulator.cpp index d703fd6d5..4b0512488 100644 --- a/src/osgWrappers/osgGA/TerrainManipulator.cpp +++ b/src/osgWrappers/osgGA/TerrainManipulator.cpp @@ -116,6 +116,54 @@ BEGIN_OBJECT_REFLECTOR(osgGA::TerrainManipulator) __void__getUsage__osg_ApplicationUsage_R1, "Get the keyboard and mouse usage of this manipulator. ", ""); + I_ProtectedMethod0(void, flushMouseEventStack, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__flushMouseEventStack, + "Reset the internal GUIEvent stack. ", + ""); + I_ProtectedMethod1(void, addMouseEvent, IN, const osgGA::GUIEventAdapter &, ea, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__addMouseEvent__C5_GUIEventAdapter_R1, + "Add the current mouse GUIEvent to internal stack. ", + ""); + I_ProtectedMethod3(void, computePosition, IN, const osg::Vec3d &, eye, IN, const osg::Vec3d &, lv, IN, const osg::Vec3d &, up, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__computePosition__C5_osg_Vec3d_R1__C5_osg_Vec3d_R1__C5_osg_Vec3d_R1, + "", + ""); + I_ProtectedMethod0(bool, calcMovement, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __bool__calcMovement, + "For the give mouse movement calculate the movement of the camera. ", + "Return true is camera has moved and a redraw is required. "); + I_ProtectedMethod6(void, trackball, IN, osg::Vec3 &, axis, IN, double &, angle, IN, double, p1x, IN, double, p1y, IN, double, p2x, IN, double, p2y, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__trackball__osg_Vec3_R1__double_R1__double__double__double__double, + "", + ""); + I_ProtectedMethod3(double, tb_project_to_sphere, IN, double, r, IN, double, x, IN, double, y, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __double__tb_project_to_sphere__double__double__double, + "", + ""); + I_ProtectedMethod0(bool, isMouseMoving, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __bool__isMouseMoving, + "Check the speed at which the mouse is moving. ", + "If speed is below a threshold then return false, otherwise return true. "); + I_ProtectedMethod0(void, clampOrientation, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__clampOrientation, + "", + ""); I_SimpleProperty(const osg::Matrixd &, ByInverseMatrix, 0, __void__setByInverseMatrix__C5_osg_Matrixd_R1); diff --git a/src/osgWrappers/osgGA/TrackballManipulator.cpp b/src/osgWrappers/osgGA/TrackballManipulator.cpp index 9f152727d..73edec927 100644 --- a/src/osgWrappers/osgGA/TrackballManipulator.cpp +++ b/src/osgWrappers/osgGA/TrackballManipulator.cpp @@ -158,6 +158,48 @@ BEGIN_OBJECT_REFLECTOR(osgGA::TrackballManipulator) __float__getTrackballSize, "Get the size of the trackball. ", ""); + I_ProtectedMethod0(void, flushMouseEventStack, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__flushMouseEventStack, + "Reset the internal GUIEvent stack. ", + ""); + I_ProtectedMethod1(void, addMouseEvent, IN, const osgGA::GUIEventAdapter &, ea, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__addMouseEvent__C5_GUIEventAdapter_R1, + "Add the current mouse GUIEvent to internal stack. ", + ""); + I_ProtectedMethod3(void, computePosition, IN, const osg::Vec3 &, eye, IN, const osg::Vec3 &, lv, IN, const osg::Vec3 &, up, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__computePosition__C5_osg_Vec3_R1__C5_osg_Vec3_R1__C5_osg_Vec3_R1, + "", + ""); + I_ProtectedMethod0(bool, calcMovement, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __bool__calcMovement, + "For the give mouse movement calculate the movement of the camera. ", + "Return true is camera has moved and a redraw is required. "); + I_ProtectedMethod6(void, trackball, IN, osg::Vec3 &, axis, IN, float &, angle, IN, float, p1x, IN, float, p1y, IN, float, p2x, IN, float, p2y, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__trackball__osg_Vec3_R1__float_R1__float__float__float__float, + "", + ""); + I_ProtectedMethod3(float, tb_project_to_sphere, IN, float, r, IN, float, x, IN, float, y, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __float__tb_project_to_sphere__float__float__float, + "", + ""); + I_ProtectedMethod0(bool, isMouseMoving, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __bool__isMouseMoving, + "Check the speed at which the mouse is moving. ", + "If speed is below a threshold then return false, otherwise return true. "); I_SimpleProperty(const osg::Matrixd &, ByInverseMatrix, 0, __void__setByInverseMatrix__C5_osg_Matrixd_R1); diff --git a/src/osgWrappers/osgGA/UFOManipulator.cpp b/src/osgWrappers/osgGA/UFOManipulator.cpp index 7fa7a746b..ef3a2c1fd 100644 --- a/src/osgWrappers/osgGA/UFOManipulator.cpp +++ b/src/osgWrappers/osgGA/UFOManipulator.cpp @@ -156,6 +156,36 @@ BEGIN_OBJECT_REFLECTOR(osgGA::UFOManipulator) __double__getRotationSpeed, "", ""); + I_ProtectedMethod0(void, _stop, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void___stop, + "", + ""); + I_ProtectedMethod2(void, _keyDown, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, x, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void___keyDown__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + "", + ""); + I_ProtectedMethod2(void, _keyUp, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, x, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void___keyUp__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + "", + ""); + I_ProtectedMethod2(void, _frame, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, x, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void___frame__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + "", + ""); + I_ProtectedMethod0(void, _adjustPosition, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void___adjustPosition, + "", + ""); I_SimpleProperty(const osg::Matrixd &, ByInverseMatrix, 0, __void__setByInverseMatrix__C5_osg_Matrixd_R1); diff --git a/src/osgWrappers/osgManipulator/Command.cpp b/src/osgWrappers/osgManipulator/Command.cpp index f788b4871..034eafb5b 100644 --- a/src/osgWrappers/osgManipulator/Command.cpp +++ b/src/osgWrappers/osgManipulator/Command.cpp @@ -94,6 +94,8 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::MotionCommand) __Stage__getStage, "", ""); + + I_SimpleProperty(const osg::Matrix &, LocalToWorld, __C5_osg_Matrix_R1__getLocalToWorld, 0); diff --git a/src/osgWrappers/osgManipulator/Constraint.cpp b/src/osgWrappers/osgManipulator/Constraint.cpp index fbe09e188..46cb502bc 100644 --- a/src/osgWrappers/osgManipulator/Constraint.cpp +++ b/src/osgWrappers/osgManipulator/Constraint.cpp @@ -55,6 +55,41 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Constraint) __bool__constrain__ScaleUniformCommand_R1, "", ""); + I_ProtectedConstructor1(IN, osg::Node &, refNode, + Properties::NON_EXPLICIT, + ____Constraint__osg_Node_R1, + "", + ""); + I_ProtectedMethod0(osg::Node &, getReferenceNode, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __osg_Node_R1__getReferenceNode, + "", + ""); + I_ProtectedMethod0(const osg::Node &, getReferenceNode, + Properties::NON_VIRTUAL, + Properties::CONST, + __C5_osg_Node_R1__getReferenceNode, + "", + ""); + I_ProtectedMethod0(const osg::Matrix &, getLocalToWorld, + Properties::NON_VIRTUAL, + Properties::CONST, + __C5_osg_Matrix_R1__getLocalToWorld, + "", + ""); + I_ProtectedMethod0(const osg::Matrix &, getWorldToLocal, + Properties::NON_VIRTUAL, + Properties::CONST, + __C5_osg_Matrix_R1__getWorldToLocal, + "", + ""); + I_ProtectedMethod0(void, computeLocalToWorldAndWorldToLocal, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__computeLocalToWorldAndWorldToLocal, + "", + ""); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgManipulator::GridConstraint) diff --git a/src/osgWrappers/osgManipulator/Dragger.cpp b/src/osgWrappers/osgManipulator/Dragger.cpp index fa5303281..2ebb36551 100644 --- a/src/osgWrappers/osgManipulator/Dragger.cpp +++ b/src/osgWrappers/osgManipulator/Dragger.cpp @@ -92,6 +92,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::CompositeDragger) __DraggerList_iterator__findDragger__C5_Dragger_P1, "", ""); + I_ProtectedConstructor0(____CompositeDragger, + "", + ""); I_SimpleProperty(osgManipulator::CommandManager *, CommandManager, 0, __void__setCommandManager__CommandManager_P1); @@ -157,6 +160,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Dragger) __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "", ""); + I_ProtectedConstructor0(____Dragger, + "", + ""); I_SimpleProperty(osgManipulator::CommandManager *, CommandManager, __CommandManager_P1__getCommandManager, __void__setCommandManager__CommandManager_P1); diff --git a/src/osgWrappers/osgParticle/Emitter.cpp b/src/osgWrappers/osgParticle/Emitter.cpp index 4bd994e07..a0849c1fa 100644 --- a/src/osgWrappers/osgParticle/Emitter.cpp +++ b/src/osgWrappers/osgParticle/Emitter.cpp @@ -73,6 +73,18 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::Emitter) __void__setUseDefaultTemplate__bool, "Set whether the default particle template should be used. ", "When this flag is true, the particle template is ignored, and the particle system's default template is used instead."); + I_ProtectedMethod1(void, process, IN, double, dt, + Properties::VIRTUAL, + Properties::NON_CONST, + __void__process__double, + "", + ""); + I_ProtectedMethod1(void, emit, IN, double, dt, + Properties::PURE_VIRTUAL, + Properties::NON_CONST, + __void__emit__double, + "", + ""); I_SimpleProperty(const osgParticle::Particle &, ParticleTemplate, __C5_Particle_R1__getParticleTemplate, __void__setParticleTemplate__C5_Particle_R1); diff --git a/src/osgWrappers/osgParticle/FluidProgram.cpp b/src/osgWrappers/osgParticle/FluidProgram.cpp index 9a5aea177..3cf710722 100644 --- a/src/osgWrappers/osgParticle/FluidProgram.cpp +++ b/src/osgWrappers/osgParticle/FluidProgram.cpp @@ -118,6 +118,12 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::FluidProgram) __void__setFluidToWater, "Set the fluid parameters as for pure water (20°C temperature). ", ""); + I_ProtectedMethod1(void, execute, IN, double, dt, + Properties::VIRTUAL, + Properties::NON_CONST, + __void__execute__double, + "Execute the program on the particle system. Must be overriden in descendant classes. ", + ""); I_SimpleProperty(const osg::Vec3 &, Acceleration, __C5_osg_Vec3_R1__getAcceleration, __void__setAcceleration__C5_osg_Vec3_R1); diff --git a/src/osgWrappers/osgParticle/ModularEmitter.cpp b/src/osgWrappers/osgParticle/ModularEmitter.cpp index 606c57608..577954c30 100644 --- a/src/osgWrappers/osgParticle/ModularEmitter.cpp +++ b/src/osgWrappers/osgParticle/ModularEmitter.cpp @@ -120,6 +120,12 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::ModularEmitter) __void__setShooter__Shooter_P1, "Set the Shooter object. ", ""); + I_ProtectedMethod1(void, emit, IN, double, dt, + Properties::VIRTUAL, + Properties::NON_CONST, + __void__emit__double, + "", + ""); I_SimpleProperty(osgParticle::Counter *, Counter, __Counter_P1__getCounter, __void__setCounter__Counter_P1); diff --git a/src/osgWrappers/osgParticle/ModularProgram.cpp b/src/osgWrappers/osgParticle/ModularProgram.cpp index 1d3fab8b0..1bf4ee5a8 100644 --- a/src/osgWrappers/osgParticle/ModularProgram.cpp +++ b/src/osgWrappers/osgParticle/ModularProgram.cpp @@ -88,5 +88,11 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::ModularProgram) __void__removeOperator__int, "Remove an operator from the list. ", ""); + I_ProtectedMethod1(void, execute, IN, double, dt, + Properties::VIRTUAL, + Properties::NON_CONST, + __void__execute__double, + "Execute the program on the particle system. Must be overriden in descendant classes. ", + ""); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/ParticleProcessor.cpp b/src/osgWrappers/osgParticle/ParticleProcessor.cpp index c84fd41cd..f4e6f65a8 100644 --- a/src/osgWrappers/osgParticle/ParticleProcessor.cpp +++ b/src/osgWrappers/osgParticle/ParticleProcessor.cpp @@ -201,6 +201,12 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ParticleProcessor) __osg_BoundingSphere__computeBound, "Compute the bounding sphere around Node's geometry or children. ", "This method is automatically called by getBound() when the bounding sphere has been marked dirty via dirtyBound(). "); + I_ProtectedMethod1(void, process, IN, double, dt, + Properties::PURE_VIRTUAL, + Properties::NON_CONST, + __void__process__double, + "", + ""); I_SimpleProperty(double, CurrentTime, __double__getCurrentTime, __void__setCurrentTime__double); diff --git a/src/osgWrappers/osgParticle/ParticleSystem.cpp b/src/osgWrappers/osgParticle/ParticleSystem.cpp index d767df264..bef2095e4 100644 --- a/src/osgWrappers/osgParticle/ParticleSystem.cpp +++ b/src/osgWrappers/osgParticle/ParticleSystem.cpp @@ -235,6 +235,18 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::ParticleSystem) __OpenThreads_ReadWriteMutex_P1__getReadWriteMutex, "", ""); + I_ProtectedMethod2(void, update_bounds, IN, const osg::Vec3 &, p, IN, float, r, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__update_bounds__C5_osg_Vec3_R1__float, + "", + ""); + I_ProtectedMethod2(void, single_pass_render, IN, osg::State &, state, IN, const osg::Matrix &, modelview, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__single_pass_render__osg_State_R1__C5_osg_Matrix_R1, + "", + ""); I_SimpleProperty(const osg::Vec3 &, AlignVectorX, __C5_osg_Vec3_R1__getAlignVectorX, __void__setAlignVectorX__C5_osg_Vec3_R1); diff --git a/src/osgWrappers/osgParticle/PrecipitationEffect.cpp b/src/osgWrappers/osgParticle/PrecipitationEffect.cpp index b9ad96f1e..0ab833972 100644 --- a/src/osgWrappers/osgParticle/PrecipitationEffect.cpp +++ b/src/osgWrappers/osgParticle/PrecipitationEffect.cpp @@ -219,6 +219,32 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::PrecipitationEffect) __osg_StateSet_P1__getPointStateSet, "", ""); + I_ProtectedMethod1(void, compileGLObjects, IN, osg::RenderInfo &, renderInfo, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__compileGLObjects__osg_RenderInfo_R1, + "", + ""); + I_ProtectedMethod0(void, update, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__update, + "", + ""); + I_ProtectedMethod4(void, createGeometry, IN, unsigned int, numParticles, IN, osg::Geometry *, quad_geometry, IN, osg::Geometry *, line_geometry, IN, osg::Geometry *, point_geometry, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__createGeometry__unsigned_int__osg_Geometry_P1__osg_Geometry_P1__osg_Geometry_P1, + "", + ""); + I_ProtectedMethod1(void, setUpGeometries, IN, unsigned int, numParticles, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setUpGeometries__unsigned_int, + "", + ""); + + I_SimpleProperty(const osg::Vec3 &, CellSize, __C5_osg_Vec3_R1__getCellSize, __void__setCellSize__C5_osg_Vec3_R1); diff --git a/src/osgWrappers/osgParticle/Program.cpp b/src/osgWrappers/osgParticle/Program.cpp index 9af93b226..a52f5296b 100644 --- a/src/osgWrappers/osgParticle/Program.cpp +++ b/src/osgWrappers/osgParticle/Program.cpp @@ -52,5 +52,17 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::Program) __void__accept__osg_NodeVisitor_R1, "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ", ""); + I_ProtectedMethod1(void, process, IN, double, dt, + Properties::VIRTUAL, + Properties::NON_CONST, + __void__process__double, + "Implementation of ParticleProcessor::process(). Do not call this method by yourself. ", + ""); + I_ProtectedMethod1(void, execute, IN, double, dt, + Properties::PURE_VIRTUAL, + Properties::NON_CONST, + __void__execute__double, + "Execute the program on the particle system. Must be overriden in descendant classes. ", + ""); END_REFLECTOR diff --git a/src/osgWrappers/osgShadow/OccluderGeometry.cpp b/src/osgWrappers/osgShadow/OccluderGeometry.cpp index de5998eb6..def762fdb 100644 --- a/src/osgWrappers/osgShadow/OccluderGeometry.cpp +++ b/src/osgWrappers/osgShadow/OccluderGeometry.cpp @@ -112,6 +112,50 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::OccluderGeometry) __void__processGeometry__osg_Drawable_P1__osg_Matrix_P1__float, "", ""); + + + I_ProtectedMethod0(void, setUpInternalStructures, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setUpInternalStructures, + "", + ""); + I_ProtectedMethod0(void, removeDuplicateVertices, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__removeDuplicateVertices, + "", + ""); + I_ProtectedMethod0(void, removeNullTriangles, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__removeNullTriangles, + "", + ""); + I_ProtectedMethod0(void, computeNormals, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__computeNormals, + "", + ""); + I_ProtectedMethod0(void, buildEdgeMaps, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__buildEdgeMaps, + "", + ""); + I_ProtectedMethod2(void, computeLightDirectionSlihouetteEdges, IN, const osg::Vec3 &, lightdirection, IN, osgShadow::OccluderGeometry::UIntList &, silhouetteIndices, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__computeLightDirectionSlihouetteEdges__C5_osg_Vec3_R1__UIntList_R1, + "", + ""); + I_ProtectedMethod2(void, computeLightPositionSlihouetteEdges, IN, const osg::Vec3 &, lightpos, IN, osgShadow::OccluderGeometry::UIntList &, silhouetteIndices, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__computeLightPositionSlihouetteEdges__C5_osg_Vec3_R1__UIntList_R1, + "", + ""); I_SimpleProperty(const osg::Polytope &, BoundingPolytope, __C5_osg_Polytope_R1__getBoundingPolytope, __void__setBoundingPolytope__C5_osg_Polytope_R1); diff --git a/src/osgWrappers/osgSim/Impostor.cpp b/src/osgWrappers/osgSim/Impostor.cpp index 5d81a66bb..207066367 100644 --- a/src/osgWrappers/osgSim/Impostor.cpp +++ b/src/osgWrappers/osgSim/Impostor.cpp @@ -112,6 +112,12 @@ BEGIN_OBJECT_REFLECTOR(osgSim::Impostor) __osg_BoundingSphere__computeBound, "Compute the bounding sphere around Node's geometry or children. ", "This method is automatically called by getBound() when the bounding sphere has been marked dirty via dirtyBound(). "); + I_ProtectedMethod1(osgSim::ImpostorSprite *, createImpostorSprite, IN, osgUtil::CullVisitor *, cv, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __ImpostorSprite_P1__createImpostorSprite__osgUtil_CullVisitor_P1, + "", + ""); I_SimpleProperty(float, ImpostorThreshold, __float__getImpostorThreshold, __void__setImpostorThreshold__float); diff --git a/src/osgWrappers/osgSim/ImpostorSprite.cpp b/src/osgWrappers/osgSim/ImpostorSprite.cpp index f43ce98b1..1a9f0ca97 100644 --- a/src/osgWrappers/osgSim/ImpostorSprite.cpp +++ b/src/osgWrappers/osgSim/ImpostorSprite.cpp @@ -213,6 +213,11 @@ BEGIN_OBJECT_REFLECTOR(osgSim::ImpostorSprite) __C5_osg_Camera_P1__getCamera, "Get the const camera node to use for pre rendering the impostor sprite's texture. ", ""); + I_ProtectedConstructor1(IN, const osgSim::ImpostorSprite &, x, + Properties::NON_EXPLICIT, + ____ImpostorSprite__C5_ImpostorSprite_R1, + "", + ""); I_SimpleProperty(osg::Camera *, Camera, __osg_Camera_P1__getCamera, __void__setCamera__osg_Camera_P1); diff --git a/src/osgWrappers/osgSim/MultiSwitch.cpp b/src/osgWrappers/osgSim/MultiSwitch.cpp index a4c74a6e0..09d4f6702 100644 --- a/src/osgWrappers/osgSim/MultiSwitch.cpp +++ b/src/osgWrappers/osgSim/MultiSwitch.cpp @@ -162,6 +162,12 @@ BEGIN_OBJECT_REFLECTOR(osgSim::MultiSwitch) __C5_ValueList_R1__getValueList__unsigned_int, "Get the a single set of different values for a particular switch set. ", ""); + I_ProtectedMethod1(void, expandToEncompassSwitchSet, IN, unsigned int, switchSet, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__expandToEncompassSwitchSet__unsigned_int, + "", + ""); I_SimpleProperty(unsigned int, ActiveSwitchSet, __unsigned_int__getActiveSwitchSet, __void__setActiveSwitchSet__unsigned_int); diff --git a/src/osgWrappers/osgSim/OpenFlightOptimizer.cpp b/src/osgWrappers/osgSim/OpenFlightOptimizer.cpp index 52cc4d7d0..931b1a826 100644 --- a/src/osgWrappers/osgSim/OpenFlightOptimizer.cpp +++ b/src/osgWrappers/osgSim/OpenFlightOptimizer.cpp @@ -74,6 +74,12 @@ BEGIN_OBJECT_REFLECTOR(osgFlightUtil::Optimizer::MergeGeodesVisitor) __void__mergeGeodes__osg_Group_R1, "", ""); + I_ProtectedMethod2(bool, mergeGeode, IN, osg::Geode &, lhs, IN, osg::Geode &, rhs, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __bool__mergeGeode__osg_Geode_R1__osg_Geode_R1, + "", + ""); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgFlightUtil::Optimizer::TessellateVisitor) @@ -86,5 +92,11 @@ BEGIN_OBJECT_REFLECTOR(osgFlightUtil::Optimizer::TessellateVisitor) __void__apply__osg_Geode_R1, "", ""); + I_ProtectedMethod1(bool, hasPolygons, IN, osg::Geometry &, geometry, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __bool__hasPolygons__osg_Geometry_R1, + "", + ""); END_REFLECTOR diff --git a/src/osgWrappers/osgSim/OverlayNode.cpp b/src/osgWrappers/osgSim/OverlayNode.cpp index 5f7585f5f..5ec83603a 100644 --- a/src/osgWrappers/osgSim/OverlayNode.cpp +++ b/src/osgWrappers/osgSim/OverlayNode.cpp @@ -166,6 +166,18 @@ BEGIN_OBJECT_REFLECTOR(osgSim::OverlayNode) __void__releaseGLObjects__osg_State_P1, "If State is non-zero, this function releases any associated OpenGL objects for the specified graphics context. ", "Otherwise, releases OpenGL objexts for all graphics contexts. "); + I_ProtectedMethod0(void, init, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__init, + "", + ""); + I_ProtectedMethod0(void, updateMainSubgraphStateSet, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__updateMainSubgraphStateSet, + "", + ""); I_SimpleProperty(osg::Camera *, Camera, __osg_Camera_P1__getCamera, 0); diff --git a/src/osgWrappers/osgSim/ScalarBar.cpp b/src/osgWrappers/osgSim/ScalarBar.cpp index 904c66ac5..661fa6212 100644 --- a/src/osgWrappers/osgSim/ScalarBar.cpp +++ b/src/osgWrappers/osgSim/ScalarBar.cpp @@ -178,6 +178,12 @@ BEGIN_OBJECT_REFLECTOR(osgSim::ScalarBar) __void__update, "force update the drawables used to render the scalar bar. ", ""); + I_ProtectedMethod0(void, createDrawables, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__createDrawables, + "", + ""); I_SimpleProperty(float, AspectRatio, __float__getAspectRatio, __void__setAspectRatio__float); diff --git a/src/osgWrappers/osgTerrain/Export.cpp b/src/osgWrappers/osgTerrain/Export.cpp new file mode 100644 index 000000000..cb84b725c --- /dev/null +++ b/src/osgWrappers/osgTerrain/Export.cpp @@ -0,0 +1,22 @@ +// *************************************************************************** +// +// 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 + diff --git a/src/osgWrappers/osgText/FadeText.cpp b/src/osgWrappers/osgText/FadeText.cpp index 7571b0565..4bf529313 100644 --- a/src/osgWrappers/osgText/FadeText.cpp +++ b/src/osgWrappers/osgText/FadeText.cpp @@ -73,6 +73,14 @@ BEGIN_OBJECT_REFLECTOR(osgText::FadeText) __void__drawImplementation__osg_RenderInfo_R1, "Draw the text. ", ""); + I_ProtectedMethod0(void, init, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__init, + "", + ""); + + I_SimpleProperty(float, FadeSpeed, __float__getFadeSpeed, __void__setFadeSpeed__float); diff --git a/src/osgWrappers/osgText/Font.cpp b/src/osgWrappers/osgText/Font.cpp index ea844b250..cc6c82b25 100644 --- a/src/osgWrappers/osgText/Font.cpp +++ b/src/osgWrappers/osgText/Font.cpp @@ -200,6 +200,12 @@ BEGIN_OBJECT_REFLECTOR(osgText::Font) __void__releaseGLObjects__osg_State_P1, "If State is non-zero, this function releases OpenGL objects for the specified graphics context. ", "Otherwise, releases OpenGL objexts for all graphics contexts. "); + I_ProtectedMethod4(void, addGlyph, IN, unsigned int, width, IN, unsigned int, height, IN, unsigned int, charcode, IN, osgText::Font::Glyph *, glyph, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__addGlyph__unsigned_int__unsigned_int__unsigned_int__Glyph_P1, + "", + ""); I_SimpleProperty(std::string, FileName, __std_string__getFileName, 0); diff --git a/src/osgWrappers/osgText/Text.cpp b/src/osgWrappers/osgText/Text.cpp index 46fac88ff..53ac28cf0 100644 --- a/src/osgWrappers/osgText/Text.cpp +++ b/src/osgWrappers/osgText/Text.cpp @@ -496,6 +496,138 @@ BEGIN_OBJECT_REFLECTOR(osgText::Text) __osg_BoundingBox__computeBound, "Compute the bounding box around Drawables's geometry. ", ""); + I_ProtectedMethod0(osgText::Font *, getActiveFont, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __Font_P1__getActiveFont, + "", + ""); + I_ProtectedMethod0(const osgText::Font *, getActiveFont, + Properties::NON_VIRTUAL, + Properties::CONST, + __C5_Font_P1__getActiveFont, + "", + ""); + I_ProtectedMethod3(osgText::String::iterator, computeLastCharacterOnLine, IN, osg::Vec2 &, cursor, IN, osgText::String::iterator, first, IN, osgText::String::iterator, last, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __String_iterator__computeLastCharacterOnLine__osg_Vec2_R1__String_iterator__String_iterator, + "", + ""); + I_ProtectedMethod0(void, computeGlyphRepresentation, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__computeGlyphRepresentation, + "", + ""); + I_ProtectedMethod2(bool, computeAverageGlypthWidthAndHeight, IN, float &, avg_width, IN, float &, avg_height, + Properties::NON_VIRTUAL, + Properties::CONST, + __bool__computeAverageGlypthWidthAndHeight__float_R1__float_R1, + "", + ""); + I_ProtectedMethod0(void, computePositions, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__computePositions, + "", + ""); + I_ProtectedMethod1(void, computePositions, IN, unsigned int, contextID, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__computePositions__unsigned_int, + "", + ""); + I_ProtectedMethod1(void, computeBackdropPositions, IN, unsigned int, contextID, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__computeBackdropPositions__unsigned_int, + "", + ""); + I_ProtectedMethod0(void, computeBackdropBoundingBox, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__computeBackdropBoundingBox, + "", + ""); + I_ProtectedMethod0(void, computeColorGradients, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__computeColorGradients, + "", + ""); + I_ProtectedMethod0(void, computeColorGradientsOverall, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__computeColorGradientsOverall, + "", + ""); + I_ProtectedMethod0(void, computeColorGradientsPerCharacter, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__computeColorGradientsPerCharacter, + "", + ""); + I_ProtectedMethod2(void, drawImplementation, IN, osg::State &, state, IN, const osg::Vec4 &, colorMultiplier, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__drawImplementation__osg_State_R1__C5_osg_Vec4_R1, + "", + ""); + I_ProtectedMethod3(void, drawForegroundText, IN, osg::State &, state, IN, const osgText::Text::GlyphQuads &, glyphquad, IN, const osg::Vec4 &, colorMultiplier, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__drawForegroundText__osg_State_R1__C5_GlyphQuads_R1__C5_osg_Vec4_R1, + "", + ""); + I_ProtectedMethod2(void, renderOnlyForegroundText, IN, osg::State &, state, IN, const osg::Vec4 &, colorMultiplier, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__renderOnlyForegroundText__osg_State_R1__C5_osg_Vec4_R1, + "", + ""); + I_ProtectedMethod2(void, renderWithPolygonOffset, IN, osg::State &, state, IN, const osg::Vec4 &, colorMultiplier, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__renderWithPolygonOffset__osg_State_R1__C5_osg_Vec4_R1, + "", + ""); + I_ProtectedMethod2(void, renderWithNoDepthBuffer, IN, osg::State &, state, IN, const osg::Vec4 &, colorMultiplier, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__renderWithNoDepthBuffer__osg_State_R1__C5_osg_Vec4_R1, + "", + ""); + I_ProtectedMethod2(void, renderWithDepthRange, IN, osg::State &, state, IN, const osg::Vec4 &, colorMultiplier, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__renderWithDepthRange__osg_State_R1__C5_osg_Vec4_R1, + "", + ""); + I_ProtectedMethod2(void, renderWithStencilBuffer, IN, osg::State &, state, IN, const osg::Vec4 &, colorMultiplier, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__renderWithStencilBuffer__osg_State_R1__C5_osg_Vec4_R1, + "", + ""); + I_ProtectedMethod10(float, bilinearInterpolate, IN, float, x1, IN, float, x2, IN, float, y1, IN, float, y2, IN, float, x, IN, float, y, IN, float, q11, IN, float, q12, IN, float, q21, IN, float, q22, + Properties::NON_VIRTUAL, + Properties::CONST, + __float__bilinearInterpolate__float__float__float__float__float__float__float__float__float__float, + "", + ""); + I_ProtectedMethod2(void, convertHsvToRgb, IN, float, hsv, IN, float, rgb, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__convertHsvToRgb__float__float, + "", + ""); + I_ProtectedMethod2(void, convertRgbToHsv, IN, float, rgb, IN, float, hsv, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__convertRgbToHsv__float__float, + "", + ""); I_SimpleProperty(osgText::Text::AlignmentType, Alignment, __AlignmentType__getAlignment, __void__setAlignment__AlignmentType); diff --git a/src/osgWrappers/osgUtil/CubeMapGenerator.cpp b/src/osgWrappers/osgUtil/CubeMapGenerator.cpp index b275d7a05..cdb617905 100644 --- a/src/osgWrappers/osgUtil/CubeMapGenerator.cpp +++ b/src/osgWrappers/osgUtil/CubeMapGenerator.cpp @@ -49,5 +49,17 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::CubeMapGenerator) __void__generateMap__bool, "Generate the six cube images. ", "If use_osg_system is true, then the OSG's coordinate system is used instead of the default OpenGL one."); + I_ProtectedMethod4(void, set_pixel, IN, int, index, IN, int, c, IN, int, r, IN, const osg::Vec4 &, color, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__set_pixel__int__int__int__C5_osg_Vec4_R1, + "", + ""); + I_ProtectedMethod1(osg::Vec4, compute_color, IN, const osg::Vec3 &, R, + Properties::PURE_VIRTUAL, + Properties::CONST, + __osg_Vec4__compute_color__C5_osg_Vec3_R1, + "Override this method to define how colors are computed. ", + "The parameter R is the reflection vector, pointing from the center of the cube. The return value should be the RGBA color associated with that reflection ray."); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/CullVisitor.cpp b/src/osgWrappers/osgUtil/CullVisitor.cpp index 963799d84..0e7ffdf26 100644 --- a/src/osgWrappers/osgUtil/CullVisitor.cpp +++ b/src/osgWrappers/osgUtil/CullVisitor.cpp @@ -321,6 +321,24 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::CullVisitor) __C5_osg_RenderInfo_R1__getRenderInfo, "", ""); + I_ProtectedMethod1(void, handle_cull_callbacks_and_traverse, IN, osg::Node &, node, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__handle_cull_callbacks_and_traverse__osg_Node_R1, + "", + ""); + I_ProtectedMethod2(void, handle_cull_callbacks_and_accept, IN, osg::Node &, node, IN, osg::Node *, acceptNode, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__handle_cull_callbacks_and_accept__osg_Node_R1__osg_Node_P1, + "", + ""); + I_ProtectedMethodWithDefaults4(osgUtil::RenderLeaf *, createOrReuseRenderLeaf, IN, osg::Drawable *, drawable, , IN, osg::RefMatrix *, projection, , IN, osg::RefMatrix *, matrix, , IN, float, depth, 0.0f, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __RenderLeaf_P1__createOrReuseRenderLeaf__osg_Drawable_P1__osg_RefMatrix_P1__osg_RefMatrix_P1__float, + "", + ""); I_SimpleProperty(osgUtil::CullVisitor::value_type, CalculatedFarPlane, __value_type__getCalculatedFarPlane, 0); diff --git a/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp b/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp index 7cd134516..bc83d2dcd 100644 --- a/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp +++ b/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp @@ -159,6 +159,12 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::DelaunayTriangulator) __void__removeInternalTriangles__DelaunayConstraint_P1, "remove the triangles internal to the constraint loops. ", "(Line strips cannot remove any internal triangles). "); + I_ProtectedMethod2(int, getindex, IN, const osg::Vec3, pt, IN, const osg::Vec3Array *, points, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __int__getindex__C5_osg_Vec3__C5_osg_Vec3Array_P1, + "", + ""); I_SimpleProperty(osg::Vec3Array *, InputPointArray, __osg_Vec3Array_P1__getInputPointArray, __void__setInputPointArray__osg_Vec3Array_P1); diff --git a/src/osgWrappers/osgUtil/HalfWayMapGenerator.cpp b/src/osgWrappers/osgUtil/HalfWayMapGenerator.cpp index 5fdfa26f3..cbeaa610b 100644 --- a/src/osgWrappers/osgUtil/HalfWayMapGenerator.cpp +++ b/src/osgWrappers/osgUtil/HalfWayMapGenerator.cpp @@ -32,5 +32,11 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::HalfWayMapGenerator) ____HalfWayMapGenerator__C5_HalfWayMapGenerator_R1__C5_osg_CopyOp_R1, "", ""); + I_ProtectedMethod1(osg::Vec4, compute_color, IN, const osg::Vec3 &, R, + Properties::VIRTUAL, + Properties::CONST, + __osg_Vec4__compute_color__C5_osg_Vec3_R1, + "Override this method to define how colors are computed. ", + "The parameter R is the reflection vector, pointing from the center of the cube. The return value should be the RGBA color associated with that reflection ray."); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/HighlightMapGenerator.cpp b/src/osgWrappers/osgUtil/HighlightMapGenerator.cpp index 92099173b..1f792ea52 100644 --- a/src/osgWrappers/osgUtil/HighlightMapGenerator.cpp +++ b/src/osgWrappers/osgUtil/HighlightMapGenerator.cpp @@ -33,5 +33,11 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::HighlightMapGenerator) ____HighlightMapGenerator__C5_HighlightMapGenerator_R1__C5_osg_CopyOp_R1, "", ""); + I_ProtectedMethod1(osg::Vec4, compute_color, IN, const osg::Vec3 &, R, + Properties::VIRTUAL, + Properties::CONST, + __osg_Vec4__compute_color__C5_osg_Vec3_R1, + "Override this method to define how colors are computed. ", + "The parameter R is the reflection vector, pointing from the center of the cube. The return value should be the RGBA color associated with that reflection ray."); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/IntersectVisitor.cpp b/src/osgWrappers/osgUtil/IntersectVisitor.cpp index 647cf8017..3c7f664cc 100644 --- a/src/osgWrappers/osgUtil/IntersectVisitor.cpp +++ b/src/osgWrappers/osgUtil/IntersectVisitor.cpp @@ -291,6 +291,36 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::IntersectVisitor) __void__apply__osg_LOD_R1, "", ""); + I_ProtectedMethod1(bool, intersect, IN, osg::Drawable &, gset, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __bool__intersect__osg_Drawable_R1, + "", + ""); + I_ProtectedMethod2(void, pushMatrix, IN, osg::RefMatrix *, matrix, IN, osg::Transform::ReferenceFrame, rf, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__pushMatrix__osg_RefMatrix_P1__osg_Transform_ReferenceFrame, + "", + ""); + I_ProtectedMethod0(void, popMatrix, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__popMatrix, + "", + ""); + I_ProtectedMethod1(bool, enterNode, IN, osg::Node &, node, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __bool__enterNode__osg_Node_R1, + "", + ""); + I_ProtectedMethod0(void, leaveNode, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__leaveNode, + "", + ""); I_SimpleProperty(osg::Vec3, EyePoint, __osg_Vec3__getEyePoint, __void__setEyePoint__C5_osg_Vec3_R1); diff --git a/src/osgWrappers/osgUtil/IntersectionVisitor.cpp b/src/osgWrappers/osgUtil/IntersectionVisitor.cpp index d057ded76..e8921f350 100644 --- a/src/osgWrappers/osgUtil/IntersectionVisitor.cpp +++ b/src/osgWrappers/osgUtil/IntersectionVisitor.cpp @@ -183,6 +183,36 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::IntersectionVisitor) __void__apply__osg_Camera_R1, "", ""); + I_ProtectedMethod1(bool, enter, IN, const osg::Node &, node, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __bool__enter__C5_osg_Node_R1, + "", + ""); + I_ProtectedMethod0(void, leave, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__leave, + "", + ""); + I_ProtectedMethod1(void, intersect, IN, osg::Drawable *, drawable, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__intersect__osg_Drawable_P1, + "", + ""); + I_ProtectedMethod0(void, push_clone, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__push_clone, + "", + ""); + I_ProtectedMethod0(void, pop_clone, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__pop_clone, + "", + ""); I_SimpleProperty(osgUtil::Intersector *, Intersector, __Intersector_P1__getIntersector, __void__setIntersector__Intersector_P1); diff --git a/src/osgWrappers/osgUtil/LineSegmentIntersector.cpp b/src/osgWrappers/osgUtil/LineSegmentIntersector.cpp index 95c6e2ce8..9fd973044 100644 --- a/src/osgWrappers/osgUtil/LineSegmentIntersector.cpp +++ b/src/osgWrappers/osgUtil/LineSegmentIntersector.cpp @@ -86,6 +86,18 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::LineSegmentIntersector) __bool__containsIntersections, "", ""); + I_ProtectedMethod1(bool, intersects, IN, const osg::BoundingSphere &, bs, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __bool__intersects__C5_osg_BoundingSphere_R1, + "", + ""); + I_ProtectedMethod3(bool, intersectAndClip, IN, osg::Vec3d &, s, IN, osg::Vec3d &, e, IN, const osg::BoundingBox &, bb, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __bool__intersectAndClip__osg_Vec3d_R1__osg_Vec3d_R1__C5_osg_BoundingBox_R1, + "", + ""); I_SimpleProperty(osgUtil::LineSegmentIntersector::Intersection, FirstIntersection, __Intersection__getFirstIntersection, 0); diff --git a/src/osgWrappers/osgUtil/Optimizer.cpp b/src/osgWrappers/osgUtil/Optimizer.cpp index abddc962e..840cd5870 100644 --- a/src/osgWrappers/osgUtil/Optimizer.cpp +++ b/src/osgWrappers/osgUtil/Optimizer.cpp @@ -380,6 +380,12 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::MergeGeodesVisitor) __bool__mergeGeodes__osg_Group_R1, "", ""); + I_ProtectedMethod2(bool, mergeGeode, IN, osg::Geode &, lhs, IN, osg::Geode &, rhs, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __bool__mergeGeode__osg_Geode_R1__osg_Geode_R1, + "", + ""); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::MergeGeometryVisitor) @@ -582,6 +588,12 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::StateVisitor) __void__optimize, "", ""); + I_ProtectedMethod2(void, addStateSet, IN, osg::StateSet *, stateset, IN, osg::Object *, obj, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__addStateSet__osg_StateSet_P1__osg_Object_P1, + "", + ""); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::StaticObjectDetectionVisitor) @@ -601,6 +613,18 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::StaticObjectDetectionVisitor) __void__apply__osg_Geode_R1, "", ""); + I_ProtectedMethod1(void, applyStateSet, IN, osg::StateSet &, stateset, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__applyStateSet__osg_StateSet_R1, + "", + ""); + I_ProtectedMethod1(void, applyDrawable, IN, osg::Drawable &, drawable, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__applyDrawable__osg_Drawable_R1, + "", + ""); END_REFLECTOR TYPE_NAME_ALIAS(std::set< osg::Group * >, osgUtil::Optimizer::TessellateVisitor::GroupList); @@ -729,6 +753,8 @@ BEGIN_VALUE_REFLECTOR(osgUtil::Optimizer::TextureAtlasBuilder) __osg_Matrix__getTextureMatrix__C5_osg_Texture2D_P1, "", ""); + + I_SimpleProperty(unsigned int, Margin, __unsigned_int__getMargin, __void__setMargin__unsigned_int); @@ -772,6 +798,18 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::TextureAtlasVisitor) __void__optimize, "", ""); + I_ProtectedMethod1(bool, pushStateSet, IN, osg::StateSet *, stateset, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __bool__pushStateSet__osg_StateSet_P1, + "", + ""); + I_ProtectedMethod0(void, popStateSet, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__popStateSet, + "", + ""); I_SimpleProperty(osgUtil::Optimizer::TextureAtlasBuilder &, TextureAtlasBuilder, __TextureAtlasBuilder_R1__getTextureAtlasBuilder, 0); diff --git a/src/osgWrappers/osgUtil/ReflectionMapGenerator.cpp b/src/osgWrappers/osgUtil/ReflectionMapGenerator.cpp index 7b3930c4a..02a65cb1e 100644 --- a/src/osgWrappers/osgUtil/ReflectionMapGenerator.cpp +++ b/src/osgWrappers/osgUtil/ReflectionMapGenerator.cpp @@ -32,5 +32,11 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::ReflectionMapGenerator) ____ReflectionMapGenerator__C5_ReflectionMapGenerator_R1__C5_osg_CopyOp_R1, "", ""); + I_ProtectedMethod1(osg::Vec4, compute_color, IN, const osg::Vec3 &, R, + Properties::VIRTUAL, + Properties::CONST, + __osg_Vec4__compute_color__C5_osg_Vec3_R1, + "Override this method to define how colors are computed. ", + "The parameter R is the reflection vector, pointing from the center of the cube. The return value should be the RGBA color associated with that reflection ray."); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/SceneView.cpp b/src/osgWrappers/osgUtil/SceneView.cpp index ff82cf4e8..76aa03424 100644 --- a/src/osgWrappers/osgUtil/SceneView.cpp +++ b/src/osgWrappers/osgUtil/SceneView.cpp @@ -741,6 +741,24 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::SceneView) __bool__getStats__Statistics_R1, "Extract stats for current draw list. ", ""); + I_ProtectedMethod5(void, cullStage, IN, const osg::Matrixd &, projection, IN, const osg::Matrixd &, modelview, IN, osgUtil::CullVisitor *, cullVisitor, IN, osgUtil::StateGraph *, rendergraph, IN, osgUtil::RenderStage *, renderStage, + Properties::VIRTUAL, + Properties::NON_CONST, + __void__cullStage__C5_osg_Matrixd_R1__C5_osg_Matrixd_R1__osgUtil_CullVisitor_P1__osgUtil_StateGraph_P1__osgUtil_RenderStage_P1, + "Do cull traversal of attached scene graph using Cull NodeVisitor. ", + ""); + I_ProtectedMethod0(const osg::Matrix, computeMVPW, + Properties::NON_VIRTUAL, + Properties::CONST, + __C5_osg_Matrix__computeMVPW, + "", + ""); + I_ProtectedMethod5(void, clearArea, IN, int, x, IN, int, y, IN, int, width, IN, int, height, IN, const osg::Vec4 &, color, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__clearArea__int__int__int__int__C5_osg_Vec4_R1, + "", + ""); I_SimpleProperty(int, ActiveUniforms, __int__getActiveUniforms, __void__setActiveUniforms__int); diff --git a/src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp b/src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp index acba2b519..24b1fe153 100644 --- a/src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp +++ b/src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp @@ -87,6 +87,12 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::TangentSpaceGenerator) __osg_IndexArray_P1__getIndices, "", ""); + I_ProtectedMethod7(void, compute, IN, osg::PrimitiveSet *, pset, IN, const osg::Array *, vx, IN, const osg::Array *, nx, IN, const osg::Array *, tx, IN, int, iA, IN, int, iB, IN, int, iC, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__compute__osg_PrimitiveSet_P1__C5_osg_Array_P1__C5_osg_Array_P1__C5_osg_Array_P1__int__int__int, + "", + ""); I_SimpleProperty(osg::Vec4Array *, BinormalArray, __osg_Vec4Array_P1__getBinormalArray, __void__setBinormalArray__osg_Vec4Array_P1); diff --git a/src/osgWrappers/osgUtil/Tessellator.cpp b/src/osgWrappers/osgUtil/Tessellator.cpp index 79c620708..8e04f97f8 100644 --- a/src/osgWrappers/osgUtil/Tessellator.cpp +++ b/src/osgWrappers/osgUtil/Tessellator.cpp @@ -125,6 +125,61 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Tessellator) __void__reset, "", ""); + I_ProtectedMethod2(void, reduceArray, IN, osg::Array *, cold, IN, const unsigned int, nnu, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__reduceArray__osg_Array_P1__C5_unsigned_int, + "remove unused parts of the array, eg for wehn retessellating tessellation can introduce extra vertices for concave or crossing boundaries, these will leak memory if not removed when retessellating. ", + ""); + I_ProtectedMethod2(void, collectTessellation, IN, osg::Geometry &, cxgeom, IN, unsigned int, originalIndex, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__collectTessellation__osg_Geometry_R1__unsigned_int, + "", + ""); + I_ProtectedMethod4(void, addContour, IN, GLenum, mode, IN, unsigned int, first, IN, unsigned int, last, IN, osg::Vec3Array *, vertices, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__addContour__GLenum__unsigned_int__unsigned_int__osg_Vec3Array_P1, + "", + ""); + I_ProtectedMethod2(void, addContour, IN, osg::PrimitiveSet *, primitive, IN, osg::Vec3Array *, vertices, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__addContour__osg_PrimitiveSet_P1__osg_Vec3Array_P1, + "", + ""); + + I_ProtectedMethod1(void, begin, IN, GLenum, mode, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__begin__GLenum, + "", + ""); + I_ProtectedMethod1(void, vertex, IN, osg::Vec3 *, vertex, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__vertex__osg_Vec3_P1, + "", + ""); + I_ProtectedMethod3(void, combine, IN, osg::Vec3 *, vertex, IN, void *, vertex_data, IN, GLfloat, weight, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__combine__osg_Vec3_P1__void_P1__GLfloat, + "", + ""); + I_ProtectedMethod0(void, end, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__end, + "", + ""); + I_ProtectedMethod1(void, error, IN, GLenum, errorCode, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__error__GLenum, + "", + ""); I_SimpleProperty(const bool, BoundaryOnly, __C5_bool__getBoundaryOnly, __void__setBoundaryOnly__C5_bool); diff --git a/src/osgWrappers/osgUtil/UpdateVisitor.cpp b/src/osgWrappers/osgUtil/UpdateVisitor.cpp index f1fac7ae0..4bb538881 100644 --- a/src/osgWrappers/osgUtil/UpdateVisitor.cpp +++ b/src/osgWrappers/osgUtil/UpdateVisitor.cpp @@ -90,5 +90,23 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::UpdateVisitor) __void__apply__osg_OccluderNode_R1, "", ""); + I_ProtectedMethod1(void, handle_callbacks, IN, osg::StateSet *, stateset, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__handle_callbacks__osg_StateSet_P1, + "", + ""); + I_ProtectedMethod1(void, handle_callbacks_and_traverse, IN, osg::Node &, node, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__handle_callbacks_and_traverse__osg_Node_R1, + "", + ""); + I_ProtectedMethod1(void, handle_geode_callbacks, IN, osg::Geode &, geode, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__handle_geode_callbacks__osg_Geode_R1, + "", + ""); END_REFLECTOR diff --git a/src/osgWrappers/osgViewer/CompositeViewer.cpp b/src/osgWrappers/osgViewer/CompositeViewer.cpp index e75c7896d..46e65c01f 100644 --- a/src/osgWrappers/osgViewer/CompositeViewer.cpp +++ b/src/osgWrappers/osgViewer/CompositeViewer.cpp @@ -263,6 +263,24 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::CompositeViewer) __void__setUpRenderingSupport, "Set up the Operations to render the various viewer cameras on the viewers graphics windows. ", ""); + I_ProtectedMethod0(void, init, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__init, + "", + ""); + I_ProtectedMethod0(void, checkWindowStatus, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__checkWindowStatus, + "", + ""); + I_ProtectedMethod0(unsigned int, computeNumberOfThreadsIncludingMainRequired, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __unsigned_int__computeNumberOfThreadsIncludingMainRequired, + "", + ""); I_SimpleProperty(osg::Camera *, CameraWithFocus, __osg_Camera_P1__getCameraWithFocus, __void__setCameraWithFocus__osg_Camera_P1); diff --git a/src/osgWrappers/osgViewer/GraphicsWindow.cpp b/src/osgWrappers/osgViewer/GraphicsWindow.cpp index ccdbaf5a1..2dc384be0 100644 --- a/src/osgWrappers/osgViewer/GraphicsWindow.cpp +++ b/src/osgWrappers/osgViewer/GraphicsWindow.cpp @@ -22,7 +22,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgViewer::GraphicsWindow) +BEGIN_OBJECT_REFLECTOR(osgViewer::GraphicsWindow) I_BaseType(osg::GraphicsContext); I_BaseType(osgGA::GUIActionAdapter); I_Constructor0(____GraphicsWindow, diff --git a/src/osgWrappers/osgViewer/HelpHandler.cpp b/src/osgWrappers/osgViewer/HelpHandler.cpp index 3f8064ccf..a927f1268 100644 --- a/src/osgWrappers/osgViewer/HelpHandler.cpp +++ b/src/osgWrappers/osgViewer/HelpHandler.cpp @@ -65,6 +65,18 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::HelpHandler) __void__getUsage__osg_ApplicationUsage_R1, "Get the keyboard and mouse usage of this manipulator. ", ""); + I_ProtectedMethod1(void, setUpHUDCamera, IN, osgViewer::Viewer *, viewer, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setUpHUDCamera__osgViewer_Viewer_P1, + "", + ""); + I_ProtectedMethod1(void, setUpScene, IN, osgViewer::Viewer *, viewer, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setUpScene__osgViewer_Viewer_P1, + "", + ""); I_SimpleProperty(osg::ApplicationUsage *, ApplicationUsage, __osg_ApplicationUsage_P1__getApplicationUsage, __void__setApplicationUsage__osg_ApplicationUsage_P1); diff --git a/src/osgWrappers/osgViewer/SimpleViewer.cpp b/src/osgWrappers/osgViewer/SimpleViewer.cpp index b7a249cbc..55af613f6 100644 --- a/src/osgWrappers/osgViewer/SimpleViewer.cpp +++ b/src/osgWrappers/osgViewer/SimpleViewer.cpp @@ -28,7 +28,7 @@ TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgGA::GUIEventHandler > >, osgViewer::SimpleViewer::EventHandlers); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgViewer::SimpleViewer) +BEGIN_OBJECT_REFLECTOR(osgViewer::SimpleViewer) I_VirtualBaseType(osgViewer::GraphicsWindow); I_Constructor0(____SimpleViewer, "", diff --git a/src/osgWrappers/osgViewer/StatsHandler.cpp b/src/osgWrappers/osgViewer/StatsHandler.cpp index 4c27a51ac..011f50a8d 100644 --- a/src/osgWrappers/osgViewer/StatsHandler.cpp +++ b/src/osgWrappers/osgViewer/StatsHandler.cpp @@ -71,6 +71,48 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::StatsHandler) __void__getUsage__osg_ApplicationUsage_R1, "Get the keyboard and mouse usage of this manipulator. ", ""); + I_ProtectedMethod1(void, setUpHUDCamera, IN, osgViewer::Viewer *, viewer, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setUpHUDCamera__osgViewer_Viewer_P1, + "", + ""); + I_ProtectedMethod4(osg::Geometry *, createGeometry, IN, const osg::Vec3 &, pos, IN, float, height, IN, const osg::Vec4 &, colour, IN, unsigned int, numBlocks, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __osg_Geometry_P1__createGeometry__C5_osg_Vec3_R1__float__C5_osg_Vec4_R1__unsigned_int, + "", + ""); + I_ProtectedMethod4(osg::Geometry *, createFrameMarkers, IN, const osg::Vec3 &, pos, IN, float, height, IN, const osg::Vec4 &, colour, IN, unsigned int, numBlocks, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __osg_Geometry_P1__createFrameMarkers__C5_osg_Vec3_R1__float__C5_osg_Vec4_R1__unsigned_int, + "", + ""); + I_ProtectedMethod4(osg::Geometry *, createTick, IN, const osg::Vec3 &, pos, IN, float, height, IN, const osg::Vec4 &, colour, IN, unsigned int, numTicks, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __osg_Geometry_P1__createTick__C5_osg_Vec3_R1__float__C5_osg_Vec4_R1__unsigned_int, + "", + ""); + I_ProtectedMethod7(osg::Node *, createCameraStats, IN, const std::string &, font, IN, osg::Vec3 &, pos, IN, float, startBlocks, IN, bool, aquireGPUStats, IN, float, characterSize, IN, osg::Stats *, viewerStats, IN, osg::Camera *, camera, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __osg_Node_P1__createCameraStats__C5_std_string_R1__osg_Vec3_R1__float__bool__float__osg_Stats_P1__osg_Camera_P1, + "", + ""); + I_ProtectedMethod1(void, setUpScene, IN, osgViewer::Viewer *, viewer, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setUpScene__osgViewer_Viewer_P1, + "", + ""); + I_ProtectedMethod0(void, updateThreadingModelText, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__updateThreadingModelText, + "", + ""); I_SimpleProperty(double, BlockMultiplier, __double__getBlockMultiplier, 0); diff --git a/src/osgWrappers/osgViewer/Viewer.cpp b/src/osgWrappers/osgViewer/Viewer.cpp index f42ec88ed..e4676c739 100644 --- a/src/osgWrappers/osgViewer/Viewer.cpp +++ b/src/osgWrappers/osgViewer/Viewer.cpp @@ -264,6 +264,24 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Viewer) __void__getUsage__osg_ApplicationUsage_R1, "Get the keyboard and mouse usage of this viewer. ", ""); + I_ProtectedMethod0(void, checkWindowStatus, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__checkWindowStatus, + "", + ""); + I_ProtectedMethod1(void, makeCurrent, IN, osg::GraphicsContext *, gc, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__makeCurrent__osg_GraphicsContext_P1, + "", + ""); + I_ProtectedMethod0(void, releaseContext, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__releaseContext, + "", + ""); I_SimpleProperty(osg::Camera *, CameraWithFocus, __osg_Camera_P1__getCameraWithFocus, __void__setCameraWithFocus__osg_Camera_P1);