diff --git a/include/osg/GLBeginEndAdapter b/include/osg/GLBeginEndAdapter index 1087ff6ab..de67ea7f6 100644 --- a/include/osg/GLBeginEndAdapter +++ b/include/osg/GLBeginEndAdapter @@ -31,8 +31,8 @@ class OSG_EXPORT GLBeginEndAdapter GLBeginEndAdapter(State* state=0); void setState(State* state) { _state = state; } - State* setState() { return _state; } - const State* setState() const { return _state; } + State* getState() { return _state; } + const State* getState() const { return _state; } enum MatrixMode { diff --git a/src/osgWrappers/osg/GLBeginEndAdapter.cpp b/src/osgWrappers/osg/GLBeginEndAdapter.cpp index a496e5a3b..08c45d549 100644 --- a/src/osgWrappers/osg/GLBeginEndAdapter.cpp +++ b/src/osgWrappers/osg/GLBeginEndAdapter.cpp @@ -39,14 +39,14 @@ BEGIN_VALUE_REFLECTOR(osg::GLBeginEndAdapter) __void__setState__State_P1, "", ""); - I_Method0(osg::State *, setState, + I_Method0(osg::State *, getState, Properties::NON_VIRTUAL, - __State_P1__setState, + __State_P1__getState, "", ""); - I_Method0(const osg::State *, setState, + I_Method0(const osg::State *, getState, Properties::NON_VIRTUAL, - __C5_State_P1__setState, + __C5_State_P1__getState, "", ""); I_Method1(void, setMatrixMode, IN, osg::GLBeginEndAdapter::MatrixMode, mode, @@ -278,7 +278,7 @@ BEGIN_VALUE_REFLECTOR(osg::GLBeginEndAdapter) 0, __void__setMatrixMode__MatrixMode); I_SimpleProperty(osg::State *, State, - 0, + __State_P1__getState, __void__setState__State_P1); END_REFLECTOR diff --git a/src/osgWrappers/osg/Geometry.cpp b/src/osgWrappers/osg/Geometry.cpp index a093d22ec..45552d2f2 100644 --- a/src/osgWrappers/osg/Geometry.cpp +++ b/src/osgWrappers/osg/Geometry.cpp @@ -609,7 +609,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Geometry) Properties::NON_VIRTUAL, __bool__areFastPathsUsed, "Return true if OpenGL fast paths will be used with drawing this Geometry. ", - "Fast paths use vertex arrays, and glDrawArrays/glDrawElements. Slow paths use glBegin()/glVertex.../glEnd(). Use of per primitive bindings or per vertex indexed arrays will drop the rendering path off the fast path. "); + "Fast paths directly use vertex arrays, and glDrawArrays/glDrawElements so have low CPU overhead. With Slow paths the osg::Geometry::drawImplementation has to dynamically assemble OpenGL compatible vertex arrays from the osg::Geometry arrays data and then dispatch these to OpenGL, so have higher CPU overhead than the Fast paths. Use of per primitive bindings or per vertex indexed arrays will drop the rendering path off the fast path. "); I_Method0(bool, computeFastPathsUsed, Properties::NON_VIRTUAL, __bool__computeFastPathsUsed, diff --git a/src/osgWrappers/osgAnimation/AnimationManagerBase.cpp b/src/osgWrappers/osgAnimation/AnimationManagerBase.cpp index 848d99642..ba5725faf 100644 --- a/src/osgWrappers/osgAnimation/AnimationManagerBase.cpp +++ b/src/osgWrappers/osgAnimation/AnimationManagerBase.cpp @@ -76,7 +76,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::AnimationManagerBase) I_Method0(void, clearTargets, Properties::NON_VIRTUAL, __void__clearTargets, - "Operation that must be done each frame. ", + "Reset the value of targets this Operation must be done each frame. ", ""); I_Method0(osgAnimation::LinkVisitor *, getOrCreateLinkVisitor, Properties::NON_VIRTUAL, @@ -88,9 +88,27 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::AnimationManagerBase) __void__setLinkVisitor__LinkVisitor_P1, "", ""); + I_Method1(void, setAutomaticLink, IN, bool, x, + Properties::NON_VIRTUAL, + __void__setAutomaticLink__bool, + "set a flag to define the behaviour ", + ""); + I_Method0(bool, isAutomaticLink, + Properties::NON_VIRTUAL, + __bool__isAutomaticLink, + "", + ""); + I_Method0(void, dirty, + Properties::NON_VIRTUAL, + __void__dirty, + "", + ""); I_SimpleProperty(const osgAnimation::AnimationList &, AnimationList, __C5_AnimationList_R1__getAnimationList, 0); + I_SimpleProperty(bool, AutomaticLink, + 0, + __void__setAutomaticLink__bool); I_SimpleProperty(osgAnimation::LinkVisitor *, LinkVisitor, 0, __void__setLinkVisitor__LinkVisitor_P1); diff --git a/src/osgWrappers/osgAnimation/VertexInfluence.cpp b/src/osgWrappers/osgAnimation/VertexInfluence.cpp index 6f20b6c90..281ec3f7f 100644 --- a/src/osgWrappers/osgAnimation/VertexInfluence.cpp +++ b/src/osgWrappers/osgAnimation/VertexInfluence.cpp @@ -117,9 +117,17 @@ BEGIN_VALUE_REFLECTOR(osgAnimation::VertexInfluenceSet) __void__clear, "", ""); + I_Method0(const osgAnimation::VertexInfluenceSet::VertexIndexToBoneWeightMap &, getVertexToBoneList, + Properties::NON_VIRTUAL, + __C5_VertexIndexToBoneWeightMap_R1__getVertexToBoneList, + "", + ""); I_SimpleProperty(const osgAnimation::VertexInfluenceSet::UniqVertexSetToBoneSetList &, UniqVertexSetToBoneSetList, __C5_UniqVertexSetToBoneSetList_R1__getUniqVertexSetToBoneSetList, 0); + I_SimpleProperty(const osgAnimation::VertexInfluenceSet::VertexIndexToBoneWeightMap &, VertexToBoneList, + __C5_VertexIndexToBoneWeightMap_R1__getVertexToBoneList, + 0); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgAnimation::VertexInfluenceSet::BoneWeight)