FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated version info for 2.9.3 dev release, fixed typo and updated wrappers

Browse Source
This commit is contained in:
Robert Osfield 2009-04-10 11:00:54 +00:00
parent 57f6f9f6df
commit c949789ac7
4 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -30,8 +30,8 @@ PROJECT(OpenSceneGraph)
SET(OPENSCENEGRAPH_MAJOR_VERSION 2) SET(OPENSCENEGRAPH_MAJOR_VERSION 2)
SET(OPENSCENEGRAPH_MINOR_VERSION 9) SET(OPENSCENEGRAPH_MINOR_VERSION 9)
SET(OPENSCENEGRAPH_PATCH_VERSION 2) SET(OPENSCENEGRAPH_PATCH_VERSION 3)
SET(OPENSCENEGRAPH_SOVERSION 57) SET(OPENSCENEGRAPH_SOVERSION 58)
# set to 0 when not a release candidate, non zero means that any generated # 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 # svn tags will be treated as release candidates of given number

4
include/osg/Version
View File

@ -21,8 +21,8 @@ extern "C" {
#define OPENSCENEGRAPH_MAJOR_VERSION 2 #define OPENSCENEGRAPH_MAJOR_VERSION 2
#define OPENSCENEGRAPH_MINOR_VERSION 9 #define OPENSCENEGRAPH_MINOR_VERSION 9
#define OPENSCENEGRAPH_PATCH_VERSION 2 #define OPENSCENEGRAPH_PATCH_VERSION 3
#define OPENSCENEGRAPH_SOVERSION 57 #define OPENSCENEGRAPH_SOVERSION 58
/** /**
* osgGetVersion() returns the library version number. * osgGetVersion() returns the library version number.

2
include/osgManipulator/CommandManager
View File

@ -47,7 +47,7 @@ class OSGMANIPULATOR_EXPORT CommandManager : public osg::Referenced
/** Add all selections connected to the dragger to the command. */ /** Add all selections connected to the dragger to the command. */
void addSelectionsToCommand(MotionCommand& command, Dragger& dragger); void addSelectionsToCommand(MotionCommand& command, Dragger& dragger);
typedef std::list osg::ref_ptr<Selection> > Selections; typedef std::list< osg::ref_ptr<Selection> > Selections;
/** Returns the selections connected to the dragger */ /** Returns the selections connected to the dragger */
Selections getConnectedSelections(Dragger& dragger); Selections getConnectedSelections(Dragger& dragger);

44
src/osgWrappers/osgManipulator/CommandManager.cpp
View File

@ -24,7 +24,7 @@
#undef OUT #undef OUT
#endif #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) BEGIN_OBJECT_REFLECTOR(osgManipulator::CommandManager)
I_DeclaringFile("osgManipulator/CommandManager"); I_DeclaringFile("osgManipulator/CommandManager");
@ -64,5 +64,45 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::CommandManager)
""); "");
END_REFLECTOR 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 > >)