Updated version number for 2.1.6 release and updated wrappers
This commit is contained in:
Robert Osfield
parent
a8fd0ddfca
commit
5e7a7f6b3c
@ -16,8 +16,8 @@ PROJECT(OpenSceneGraph)
|
||||
|
||||
SET(OPENSCENEGRAPH_MAJOR_VERSION 2)
|
||||
SET(OPENSCENEGRAPH_MINOR_VERSION 1)
|
||||
SET(OPENSCENEGRAPH_PATCH_VERSION 5)
|
||||
SET(OPENSCENEGRAPH_SOVERSION 16)
|
||||
SET(OPENSCENEGRAPH_PATCH_VERSION 6)
|
||||
SET(OPENSCENEGRAPH_SOVERSION 17)
|
||||
|
||||
SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@ extern "C" {
|
||||
|
||||
#define OSG_VERSION_MAJOR 2
|
||||
#define OSG_VERSION_MINOR 1
|
||||
#define OSG_VERSION_PATCH 5
|
||||
#define OSG_VERSION_PATCH 6
|
||||
|
||||
#define OSG_VERSION_RELEASE OSG_VERSION_PATCH
|
||||
#define OSG_VERSION_REVISION 0
|
||||
|
||||
@ -30,6 +30,104 @@
|
||||
#undef OUT
|
||||
#endif
|
||||
|
||||
BEGIN_OBJECT_REFLECTOR(osgTerrain::CompositeLayer)
|
||||
I_DeclaringFile("osgTerrain/Layer");
|
||||
I_BaseType(osgTerrain::Layer);
|
||||
I_Constructor0(____CompositeLayer,
|
||||
"",
|
||||
"");
|
||||
I_ConstructorWithDefaults2(IN, const osgTerrain::CompositeLayer &, compositeLayer, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY,
|
||||
____CompositeLayer__C5_CompositeLayer_R1__C5_osg_CopyOp_R1,
|
||||
"Copy constructor using CopyOp to manage deep vs shallow copy. ",
|
||||
"");
|
||||
I_Method0(osg::Object *, cloneType,
|
||||
Properties::VIRTUAL,
|
||||
__osg_Object_P1__cloneType,
|
||||
"Clone the type of an object, with Object* return type. ",
|
||||
"Must be defined by derived classes. ");
|
||||
I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
|
||||
Properties::VIRTUAL,
|
||||
__osg_Object_P1__clone__C5_osg_CopyOp_R1,
|
||||
"Clone an object, with Object* return type. ",
|
||||
"Must be defined by derived classes. ");
|
||||
I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj,
|
||||
Properties::VIRTUAL,
|
||||
__bool__isSameKindAs__C5_osg_Object_P1,
|
||||
"",
|
||||
"");
|
||||
I_Method0(const char *, libraryName,
|
||||
Properties::VIRTUAL,
|
||||
__C5_char_P1__libraryName,
|
||||
"return the name of the object's library. ",
|
||||
"Must be defined by derived classes. The OpenSceneGraph convention is that the namespace of a library is the same as the library name. ");
|
||||
I_Method0(const char *, className,
|
||||
Properties::VIRTUAL,
|
||||
__C5_char_P1__className,
|
||||
"return the name of the object's class type. ",
|
||||
"Must be defined by derived classes. ");
|
||||
I_Method0(void, clear,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__clear,
|
||||
"",
|
||||
"");
|
||||
I_Method2(void, setFileName, IN, unsigned int, i, IN, const std::string &, filename,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__setFileName__unsigned_int__C5_std_string_R1,
|
||||
"",
|
||||
"");
|
||||
I_Method1(const std::string &, getFileName, IN, unsigned int, i,
|
||||
Properties::NON_VIRTUAL,
|
||||
__C5_std_string_R1__getFileName__unsigned_int,
|
||||
"",
|
||||
"");
|
||||
I_Method2(void, setLayer, IN, unsigned int, i, IN, osgTerrain::Layer *, layer,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__setLayer__unsigned_int__Layer_P1,
|
||||
"",
|
||||
"");
|
||||
I_Method1(osgTerrain::Layer *, getLayer, IN, unsigned int, i,
|
||||
Properties::NON_VIRTUAL,
|
||||
__Layer_P1__getLayer__unsigned_int,
|
||||
"",
|
||||
"");
|
||||
I_Method1(const osgTerrain::Layer *, getLayer, IN, unsigned int, i,
|
||||
Properties::NON_VIRTUAL,
|
||||
__C5_Layer_P1__getLayer__unsigned_int,
|
||||
"",
|
||||
"");
|
||||
I_Method1(void, addLayer, IN, const std::string &, filename,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__addLayer__C5_std_string_R1,
|
||||
"",
|
||||
"");
|
||||
I_Method1(void, addLayer, IN, osgTerrain::Layer *, layer,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__addLayer__Layer_P1,
|
||||
"",
|
||||
"");
|
||||
I_Method1(void, removeLayer, IN, unsigned int, i,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__removeLayer__unsigned_int,
|
||||
"",
|
||||
"");
|
||||
I_Method0(unsigned int, getNumLayers,
|
||||
Properties::NON_VIRTUAL,
|
||||
__unsigned_int__getNumLayers,
|
||||
"",
|
||||
"");
|
||||
I_IndexedProperty(const std::string &, FileName,
|
||||
__C5_std_string_R1__getFileName__unsigned_int,
|
||||
__void__setFileName__unsigned_int__C5_std_string_R1,
|
||||
0);
|
||||
I_ArrayProperty(osgTerrain::Layer *, Layer,
|
||||
__Layer_P1__getLayer__unsigned_int,
|
||||
__void__setLayer__unsigned_int__Layer_P1,
|
||||
__unsigned_int__getNumLayers,
|
||||
__void__addLayer__Layer_P1,
|
||||
0,
|
||||
__void__removeLayer__unsigned_int);
|
||||
END_REFLECTOR
|
||||
|
||||
BEGIN_OBJECT_REFLECTOR(osgTerrain::HeightFieldLayer)
|
||||
I_DeclaringFile("osgTerrain/Layer");
|
||||
I_BaseType(osgTerrain::Layer);
|
||||
@ -40,6 +138,41 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::HeightFieldLayer)
|
||||
____HeightFieldLayer__C5_HeightFieldLayer_R1__C5_osg_CopyOp_R1,
|
||||
"Copy constructor using CopyOp to manage deep vs shallow copy. ",
|
||||
"");
|
||||
I_Method0(osg::Object *, cloneType,
|
||||
Properties::VIRTUAL,
|
||||
__osg_Object_P1__cloneType,
|
||||
"Clone the type of an object, with Object* return type. ",
|
||||
"Must be defined by derived classes. ");
|
||||
I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
|
||||
Properties::VIRTUAL,
|
||||
__osg_Object_P1__clone__C5_osg_CopyOp_R1,
|
||||
"Clone an object, with Object* return type. ",
|
||||
"Must be defined by derived classes. ");
|
||||
I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj,
|
||||
Properties::VIRTUAL,
|
||||
__bool__isSameKindAs__C5_osg_Object_P1,
|
||||
"",
|
||||
"");
|
||||
I_Method0(const char *, libraryName,
|
||||
Properties::VIRTUAL,
|
||||
__C5_char_P1__libraryName,
|
||||
"return the name of the object's library. ",
|
||||
"Must be defined by derived classes. The OpenSceneGraph convention is that the namespace of a library is the same as the library name. ");
|
||||
I_Method0(const char *, className,
|
||||
Properties::VIRTUAL,
|
||||
__C5_char_P1__className,
|
||||
"return the name of the object's class type. ",
|
||||
"Must be defined by derived classes. ");
|
||||
I_Method1(void, setFileName, IN, const std::string &, filename,
|
||||
Properties::VIRTUAL,
|
||||
__void__setFileName__C5_std_string_R1,
|
||||
"",
|
||||
"");
|
||||
I_Method0(const std::string &, getFileName,
|
||||
Properties::VIRTUAL,
|
||||
__C5_std_string_R1__getFileName,
|
||||
"",
|
||||
"");
|
||||
I_Method2(bool, transform, IN, float, offset, IN, float, scale,
|
||||
Properties::VIRTUAL,
|
||||
__bool__transform__float__float,
|
||||
@ -105,6 +238,9 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::HeightFieldLayer)
|
||||
__unsigned_int__getModifiedCount,
|
||||
"Get modified count value. ",
|
||||
"");
|
||||
I_SimpleProperty(const std::string &, FileName,
|
||||
__C5_std_string_R1__getFileName,
|
||||
__void__setFileName__C5_std_string_R1);
|
||||
I_SimpleProperty(osg::HeightField *, HeightField,
|
||||
__osg_HeightField_P1__getHeightField,
|
||||
__void__setHeightField__osg_HeightField_P1);
|
||||
@ -123,6 +259,41 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::ImageLayer)
|
||||
____ImageLayer__C5_ImageLayer_R1__C5_osg_CopyOp_R1,
|
||||
"Copy constructor using CopyOp to manage deep vs shallow copy. ",
|
||||
"");
|
||||
I_Method0(osg::Object *, cloneType,
|
||||
Properties::VIRTUAL,
|
||||
__osg_Object_P1__cloneType,
|
||||
"Clone the type of an object, with Object* return type. ",
|
||||
"Must be defined by derived classes. ");
|
||||
I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
|
||||
Properties::VIRTUAL,
|
||||
__osg_Object_P1__clone__C5_osg_CopyOp_R1,
|
||||
"Clone an object, with Object* return type. ",
|
||||
"Must be defined by derived classes. ");
|
||||
I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj,
|
||||
Properties::VIRTUAL,
|
||||
__bool__isSameKindAs__C5_osg_Object_P1,
|
||||
"",
|
||||
"");
|
||||
I_Method0(const char *, libraryName,
|
||||
Properties::VIRTUAL,
|
||||
__C5_char_P1__libraryName,
|
||||
"return the name of the object's library. ",
|
||||
"Must be defined by derived classes. The OpenSceneGraph convention is that the namespace of a library is the same as the library name. ");
|
||||
I_Method0(const char *, className,
|
||||
Properties::VIRTUAL,
|
||||
__C5_char_P1__className,
|
||||
"return the name of the object's class type. ",
|
||||
"Must be defined by derived classes. ");
|
||||
I_Method1(void, setFileName, IN, const std::string &, filename,
|
||||
Properties::VIRTUAL,
|
||||
__void__setFileName__C5_std_string_R1,
|
||||
"",
|
||||
"");
|
||||
I_Method0(const std::string &, getFileName,
|
||||
Properties::VIRTUAL,
|
||||
__C5_std_string_R1__getFileName,
|
||||
"",
|
||||
"");
|
||||
I_Method2(bool, transform, IN, float, offset, IN, float, scale,
|
||||
Properties::VIRTUAL,
|
||||
__bool__transform__float__float,
|
||||
@ -188,6 +359,9 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::ImageLayer)
|
||||
__unsigned_int__getModifiedCount,
|
||||
"Get modified count value. ",
|
||||
"");
|
||||
I_SimpleProperty(const std::string &, FileName,
|
||||
__C5_std_string_R1__getFileName,
|
||||
__void__setFileName__C5_std_string_R1);
|
||||
I_SimpleProperty(osg::Image *, Image,
|
||||
__osg_Image_P1__getImage,
|
||||
__void__setImage__osg_Image_P1);
|
||||
@ -231,6 +405,16 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::Layer)
|
||||
__C5_char_P1__className,
|
||||
"return the name of the object's class type. ",
|
||||
"Must be defined by derived classes. ");
|
||||
I_Method1(void, setFileName, IN, const std::string &, filename,
|
||||
Properties::VIRTUAL,
|
||||
__void__setFileName__C5_std_string_R1,
|
||||
"",
|
||||
"");
|
||||
I_Method0(const std::string &, getFileName,
|
||||
Properties::VIRTUAL,
|
||||
__C5_std_string_R1__getFileName,
|
||||
"",
|
||||
"");
|
||||
I_Method1(void, setLocator, IN, osgTerrain::Locator *, locator,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__setLocator__Locator_P1,
|
||||
@ -359,6 +543,9 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::Layer)
|
||||
I_SimpleProperty(const osg::Vec4 &, DefaultValue,
|
||||
__C5_osg_Vec4_R1__getDefaultValue,
|
||||
__void__setDefaultValue__C5_osg_Vec4_R1);
|
||||
I_SimpleProperty(const std::string &, FileName,
|
||||
__C5_std_string_R1__getFileName,
|
||||
__void__setFileName__C5_std_string_R1);
|
||||
I_SimpleProperty(osgTerrain::Locator *, Locator,
|
||||
__Locator_P1__getLocator,
|
||||
__void__setLocator__Locator_P1);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user