diff --git a/src/osgWrappers/osg/AutoTransform.cpp b/src/osgWrappers/osg/AutoTransform.cpp index 042bf3fad..af3b324e4 100644 --- a/src/osgWrappers/osg/AutoTransform.cpp +++ b/src/osgWrappers/osg/AutoTransform.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -60,6 +61,7 @@ BEGIN_OBJECT_REFLECTOR(osg::AutoTransform) I_Method0(bool, getAutoScaleToScreen); I_Method2(bool, computeLocalToWorldMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, nv); I_Method2(bool, computeWorldToLocalMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, nv); + I_Method0(osg::BoundingSphere, computeBound); I_Property(osg::AutoTransform::AutoRotateMode, AutoRotateMode); I_Property(bool, AutoScaleToScreen); I_Property(float, AutoUpdateEyeMovementTolerance); diff --git a/src/osgWrappers/osg/CameraNode.cpp b/src/osgWrappers/osg/CameraNode.cpp index 2f9f01d08..7b1f21bfd 100644 --- a/src/osgWrappers/osg/CameraNode.cpp +++ b/src/osgWrappers/osg/CameraNode.cpp @@ -36,8 +36,8 @@ TYPE_NAME_ALIAS(std::map< osg::CameraNode::BufferComponent COMMA osg::CameraNode::Attachment >, osg::CameraNode::BufferAttachmentMap); BEGIN_ENUM_REFLECTOR(osg::CameraNode::TransformOrder) - I_EnumLabel(osg::CameraNode::PRE_MULTIPLE); - I_EnumLabel(osg::CameraNode::POST_MULTIPLE); + I_EnumLabel(osg::CameraNode::PRE_MULTIPLY); + I_EnumLabel(osg::CameraNode::POST_MULTIPLY); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::CameraNode::RenderOrder) diff --git a/src/osgWrappers/osg/PointSprite.cpp b/src/osgWrappers/osg/PointSprite.cpp index b1a73f87a..5e726947a 100644 --- a/src/osgWrappers/osg/PointSprite.cpp +++ b/src/osgWrappers/osg/PointSprite.cpp @@ -35,6 +35,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PointSprite) I_Method0(osg::StateAttribute::Type, getType); I_Method1(int, compare, IN, const osg::StateAttribute &, sa); I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); + I_Method1(bool, checkValidityOfAssociatedModes, IN, osg::State &, x); I_Method0(bool, isTextureAttribute); I_Method1(void, apply, IN, osg::State &, state); I_ReadOnlyProperty(osg::StateAttribute::Type, Type); diff --git a/src/osgWrappers/osg/State.cpp b/src/osgWrappers/osg/State.cpp index ed787fa0c..a5a73d6bb 100644 --- a/src/osgWrappers/osg/State.cpp +++ b/src/osgWrappers/osg/State.cpp @@ -58,6 +58,8 @@ BEGIN_OBJECT_REFLECTOR(osg::State) I_Method0(osg::Polytope, getViewFrustum); I_Method1(void, apply, IN, const osg::StateSet *, dstate); I_Method0(void, apply); + I_Method2(void, setModeValidity, IN, osg::StateAttribute::GLMode, mode, IN, bool, valid); + I_Method1(bool, getModeValidity, IN, osg::StateAttribute::GLMode, mode); I_Method2(void, setGlobalDefaultModeValue, IN, osg::StateAttribute::GLMode, mode, IN, bool, enabled); I_Method1(bool, getGlobalDefaultModeValue, IN, osg::StateAttribute::GLMode, mode); I_Method2(bool, applyMode, IN, osg::StateAttribute::GLMode, mode, IN, bool, enabled); @@ -152,6 +154,7 @@ BEGIN_OBJECT_REFLECTOR(osg::State) I_ReadOnlyProperty(const osg::Matrix &, InitialInverseViewMatrix); I_WriteOnlyProperty(const osg::RefMatrix *, InitialViewMatrix); I_Property(const osg::Program::PerContextProgram *, LastAppliedProgramObject); + I_IndexedProperty1(bool, ModeValidity, osg::StateAttribute::GLMode, mode); I_ReadOnlyProperty(const osg::Matrix &, ModelViewMatrix); I_ReadOnlyProperty(const osg::Matrix &, ProjectionMatrix); I_ReadOnlyProperty(osg::Polytope, ViewFrustum); diff --git a/src/osgWrappers/osg/StateAttribute.cpp b/src/osgWrappers/osg/StateAttribute.cpp index 8c351068d..0cef51a9f 100644 --- a/src/osgWrappers/osg/StateAttribute.cpp +++ b/src/osgWrappers/osg/StateAttribute.cpp @@ -110,6 +110,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateAttribute) I_Method1(const osg::StateSet *, getParent, IN, unsigned int, i); I_Method0(unsigned int, getNumParents); I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x); + I_Method1(bool, checkValidityOfAssociatedModes, IN, osg::State &, x); I_Method1(void, setUpdateCallback, IN, osg::StateAttribute::Callback *, uc); I_Method0(osg::StateAttribute::Callback *, getUpdateCallback); I_Method0(const osg::StateAttribute::Callback *, getUpdateCallback); diff --git a/src/osgWrappers/osg/StateSet.cpp b/src/osgWrappers/osg/StateSet.cpp index fc50e4cd0..2c1ab3547 100644 --- a/src/osgWrappers/osg/StateSet.cpp +++ b/src/osgWrappers/osg/StateSet.cpp @@ -139,6 +139,7 @@ BEGIN_OBJECT_REFLECTOR(osg::StateSet) I_Method0(bool, requiresEventTraversal); I_Method0(unsigned int, getNumChildrenRequiringEventTraversal); I_Method1(void, runEventCallbacks, IN, osg::NodeVisitor *, nv); + I_Method1(bool, checkValidityOfAssociatedModes, IN, osg::State &, state); I_Method1(void, compileGLObjects, IN, osg::State &, state); I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); I_Property(osg::StateSet::AttributeList &, AttributeList); diff --git a/src/osgWrappers/osgSim/OverlayNode.cpp b/src/osgWrappers/osgSim/OverlayNode.cpp index 1ed3e88b1..e1677ae5e 100644 --- a/src/osgWrappers/osgSim/OverlayNode.cpp +++ b/src/osgWrappers/osgSim/OverlayNode.cpp @@ -40,8 +40,8 @@ BEGIN_OBJECT_REFLECTOR(osgSim::OverlayNode) I_Method0(osg::Node *, getOverlaySubgraph); I_Method0(const osg::Node *, getOverlaySubgraph); I_Method0(void, dirtyOverlayTexture); - I_Method1(void, setContinousUpdate, IN, bool, update); - I_Method0(bool, getContinousUpdate); + I_Method1(void, setContinuousUpdate, IN, bool, update); + I_Method0(bool, getContinuousUpdate); I_Method1(void, setOverlayClearColor, IN, const osg::Vec4 &, color); I_Method0(const osg::Vec4 &, getOverlayClearColor); I_Method1(void, setTexEnvMode, IN, GLenum, mode); @@ -53,7 +53,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::OverlayNode) I_Method0(osg::CameraNode *, getCamera); I_Method0(const osg::CameraNode *, getCamera); I_ReadOnlyProperty(osg::CameraNode *, Camera); - I_Property(bool, ContinousUpdate); + I_Property(bool, ContinuousUpdate); I_Property(const osg::Vec4 &, OverlayClearColor); I_Property(osg::Node *, OverlaySubgraph); I_Property(unsigned int, OverlayTextureSizeHint); diff --git a/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp b/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp index 42ead34d4..69f0a697d 100644 --- a/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp +++ b/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp @@ -35,11 +35,13 @@ BEGIN_ENUM_REFLECTOR(osgUtil::GLObjectsVisitor::ModeValues) I_EnumLabel(osgUtil::GLObjectsVisitor::RELEASE_STATE_ATTRIBUTES); I_EnumLabel(osgUtil::GLObjectsVisitor::SWITCH_ON_VERTEX_BUFFER_OBJECTS); I_EnumLabel(osgUtil::GLObjectsVisitor::SWITCH_OFF_VERTEX_BUFFER_OBJECTS); + I_EnumLabel(osgUtil::GLObjectsVisitor::CHECK_BLACK_LISTED_MODES); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgUtil::GLObjectsVisitor) I_BaseType(osg::NodeVisitor); - I_ConstructorWithDefaults1(IN, osgUtil::GLObjectsVisitor::Mode, mode, osgUtil::GLObjectsVisitor::COMPILE_DISPLAY_LISTS|osgUtil::GLObjectsVisitor::COMPILE_STATE_ATTRIBUTES); + I_ConstructorWithDefaults1(IN, osgUtil::GLObjectsVisitor::Mode, mode, osgUtil::GLObjectsVisitor::COMPILE_DISPLAY_LISTS|osgUtil::GLObjectsVisitor::COMPILE_STATE_ATTRIBUTES|osgUtil::GLObjectsVisitor::CHECK_BLACK_LISTED_MODES); + I_Method0(void, reset); I_Method1(void, setMode, IN, osgUtil::GLObjectsVisitor::Mode, mode); I_Method0(osgUtil::GLObjectsVisitor::Mode, getMode); I_Method1(void, setState, IN, osg::State *, state);