From c949789ac777c64d509dad38e92479ea7d609de5 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 10 Apr 2009 11:00:54 +0000 Subject: [PATCH] Updated version info for 2.9.3 dev release, fixed typo and updated wrappers --- CMakeLists.txt | 4 +- include/osg/Version | 4 +- include/osgManipulator/CommandManager | 2 +- .../osgManipulator/CommandManager.cpp | 44 ++++++++++++++++++- 4 files changed, 47 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a2ac4a98..bbab673b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,8 +30,8 @@ PROJECT(OpenSceneGraph) SET(OPENSCENEGRAPH_MAJOR_VERSION 2) SET(OPENSCENEGRAPH_MINOR_VERSION 9) -SET(OPENSCENEGRAPH_PATCH_VERSION 2) -SET(OPENSCENEGRAPH_SOVERSION 57) +SET(OPENSCENEGRAPH_PATCH_VERSION 3) +SET(OPENSCENEGRAPH_SOVERSION 58) # set to 0 when not a release candidate, non zero means that any generated # svn tags will be treated as release candidates of given number diff --git a/include/osg/Version b/include/osg/Version index 0fed16597..33498d128 100644 --- a/include/osg/Version +++ b/include/osg/Version @@ -21,8 +21,8 @@ extern "C" { #define OPENSCENEGRAPH_MAJOR_VERSION 2 #define OPENSCENEGRAPH_MINOR_VERSION 9 -#define OPENSCENEGRAPH_PATCH_VERSION 2 -#define OPENSCENEGRAPH_SOVERSION 57 +#define OPENSCENEGRAPH_PATCH_VERSION 3 +#define OPENSCENEGRAPH_SOVERSION 58 /** * osgGetVersion() returns the library version number. diff --git a/include/osgManipulator/CommandManager b/include/osgManipulator/CommandManager index 6f793b785..25fce6c7c 100644 --- a/include/osgManipulator/CommandManager +++ b/include/osgManipulator/CommandManager @@ -47,7 +47,7 @@ class OSGMANIPULATOR_EXPORT CommandManager : public osg::Referenced /** Add all selections connected to the dragger to the command. */ void addSelectionsToCommand(MotionCommand& command, Dragger& dragger); - typedef std::list osg::ref_ptr > Selections; + typedef std::list< osg::ref_ptr > Selections; /** Returns the selections connected to the dragger */ Selections getConnectedSelections(Dragger& dragger); diff --git a/src/osgWrappers/osgManipulator/CommandManager.cpp b/src/osgWrappers/osgManipulator/CommandManager.cpp index ea4905177..ae811c9af 100644 --- a/src/osgWrappers/osgManipulator/CommandManager.cpp +++ b/src/osgWrappers/osgManipulator/CommandManager.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::list osg::ref_ptr< osgManipulator::Selection >, osgManipulator::CommandManager::Selections) +TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgManipulator::Selection > >, osgManipulator::CommandManager::Selections) BEGIN_OBJECT_REFLECTOR(osgManipulator::CommandManager) I_DeclaringFile("osgManipulator/CommandManager"); @@ -64,5 +64,45 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::CommandManager) ""); END_REFLECTOR -STD_LIST_REFLECTOR(std::list osg::ref_ptr< osgManipulator::Selection >) +BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgManipulator::Selection >) + I_DeclaringFile("osg/ref_ptr"); + I_Constructor0(____ref_ptr, + "", + ""); + I_Constructor1(IN, osgManipulator::Selection *, ptr, + Properties::NON_EXPLICIT, + ____ref_ptr__T_P1, + "", + ""); + I_Constructor1(IN, const osg::ref_ptr< osgManipulator::Selection > &, rp, + Properties::NON_EXPLICIT, + ____ref_ptr__C5_ref_ptr_R1, + "", + ""); + I_Method0(osgManipulator::Selection *, get, + Properties::NON_VIRTUAL, + __T_P1__get, + "", + ""); + I_Method0(bool, valid, + Properties::NON_VIRTUAL, + __bool__valid, + "", + ""); + I_Method0(osgManipulator::Selection *, release, + Properties::NON_VIRTUAL, + __T_P1__release, + "", + ""); + I_Method1(void, swap, IN, osg::ref_ptr< osgManipulator::Selection > &, rp, + Properties::NON_VIRTUAL, + __void__swap__ref_ptr_R1, + "", + ""); + I_SimpleProperty(osgManipulator::Selection *, , + __T_P1__get, + 0); +END_REFLECTOR + +STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osgManipulator::Selection > >)