From 536384457a249f8d6896fa461b1d5fe452ea0794 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 7 Jan 2009 13:16:38 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osg/NodeVisitor.cpp | 5 +++++ src/osgWrappers/osgAnimation/Bone.cpp | 2 +- src/osgWrappers/osgAnimation/Timeline.cpp | 4 ++-- src/osgWrappers/osgAnimation/VertexInfluence.cpp | 2 +- src/osgWrappers/osgAnimation/modified.gw | 3 +++ src/osgWrappers/osgTerrain/Layer.cpp | 2 +- src/osgWrappers/osgViewer/ViewerEventHandlers.cpp | 2 +- 7 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/osgWrappers/osg/NodeVisitor.cpp b/src/osgWrappers/osg/NodeVisitor.cpp index 874653d6b..3efebc66f 100644 --- a/src/osgWrappers/osg/NodeVisitor.cpp +++ b/src/osgWrappers/osg/NodeVisitor.cpp @@ -54,6 +54,11 @@ BEGIN_VALUE_REFLECTOR(osg::NodeAcceptOp) ____NodeAcceptOp__NodeVisitor_R1, "", ""); + I_Constructor1(IN, const osg::NodeAcceptOp &, naop, + Properties::NON_EXPLICIT, + ____NodeAcceptOp__C5_NodeAcceptOp_R1, + "", + ""); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::NodeVisitor::TraversalMode) diff --git a/src/osgWrappers/osgAnimation/Bone.cpp b/src/osgWrappers/osgAnimation/Bone.cpp index 10b8ce124..559e2aa10 100644 --- a/src/osgWrappers/osgAnimation/Bone.cpp +++ b/src/osgWrappers/osgAnimation/Bone.cpp @@ -241,7 +241,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Bone::BoneMapVisitor) __C5_char_P1__className, "return the name of the visitor's class type. ", "Should be defined by derived classes. "); - I_Method1(void, apply, IN, osg::Node &, node, + I_Method1(void, apply, IN, osg::Node &, x, Properties::VIRTUAL, __void__apply__osg_Node_R1, "", diff --git a/src/osgWrappers/osgAnimation/Timeline.cpp b/src/osgWrappers/osgAnimation/Timeline.cpp index f64d95979..40e3bdf6a 100644 --- a/src/osgWrappers/osgAnimation/Timeline.cpp +++ b/src/osgWrappers/osgAnimation/Timeline.cpp @@ -57,7 +57,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Action) I_Constructor0(____Action, "", ""); - I_Constructor2(IN, const osgAnimation::Action &, nc, IN, const osg::CopyOp &, x, + I_Constructor2(IN, const osgAnimation::Action &, x, IN, const osg::CopyOp &, x, ____Action__C5_Action_R1__C5_osg_CopyOp_R1, "", ""); @@ -142,7 +142,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Action::Callback) I_Constructor0(____Callback, "", ""); - I_Constructor2(IN, const osgAnimation::Action::Callback &, nc, IN, const osg::CopyOp &, x, + I_Constructor2(IN, const osgAnimation::Action::Callback &, x, IN, const osg::CopyOp &, x, ____Callback__C5_Callback_R1__C5_osg_CopyOp_R1, "", ""); diff --git a/src/osgWrappers/osgAnimation/VertexInfluence.cpp b/src/osgWrappers/osgAnimation/VertexInfluence.cpp index f0cfd8a82..86372459c 100644 --- a/src/osgWrappers/osgAnimation/VertexInfluence.cpp +++ b/src/osgWrappers/osgAnimation/VertexInfluence.cpp @@ -73,7 +73,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::VertexInfluenceMap) I_Constructor0(____VertexInfluenceMap, "", ""); - I_Constructor2(IN, const osgAnimation::VertexInfluenceMap &, infl, IN, const osg::CopyOp &, x, + I_Constructor2(IN, const osgAnimation::VertexInfluenceMap &, x, IN, const osg::CopyOp &, x, ____VertexInfluenceMap__C5_osgAnimation_VertexInfluenceMap_R1__C5_osg_CopyOp_R1, "", ""); diff --git a/src/osgWrappers/osgAnimation/modified.gw b/src/osgWrappers/osgAnimation/modified.gw index e69de29bb..3e37d6002 100644 --- a/src/osgWrappers/osgAnimation/modified.gw +++ b/src/osgWrappers/osgAnimation/modified.gw @@ -0,0 +1,3 @@ +Bone.cpp +Timeline.cpp +VertexInfluence.cpp diff --git a/src/osgWrappers/osgTerrain/Layer.cpp b/src/osgWrappers/osgTerrain/Layer.cpp index ebb6b775d..f4c7ca720 100644 --- a/src/osgWrappers/osgTerrain/Layer.cpp +++ b/src/osgWrappers/osgTerrain/Layer.cpp @@ -701,7 +701,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::Layer) __C5_osg_Image_P1__getImage, "Return const image associated with layer if supported. ", ""); - I_Method2(bool, transform, IN, float, offset, IN, float, scale, + I_Method2(bool, transform, IN, float, x, IN, float, x, Properties::VIRTUAL, __bool__transform__float__float, "", diff --git a/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp b/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp index 39edebe10..c44bd98e6 100644 --- a/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp +++ b/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp @@ -159,7 +159,7 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::InteractiveImageHandler) I_ProtectedConstructor0(____InteractiveImageHandler, "", ""); - I_ProtectedConstructorWithDefaults2(IN, const osgViewer::InteractiveImageHandler &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, + I_ProtectedConstructorWithDefaults2(IN, const osgViewer::InteractiveImageHandler &, x, , IN, const osg::CopyOp &, x, osg::CopyOp::SHALLOW_COPY, ____InteractiveImageHandler__C5_InteractiveImageHandler_R1__C5_osg_CopyOp_R1, "", "");