From 62ce8b72c1dd4692bdbf3dff84d487c16b35c4d7 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 4 Apr 2007 08:05:45 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osg/TransferFunction.cpp | 34 +++++++++++++++++-- src/osgWrappers/osgTerrain/Layer.cpp | 13 +++++++ .../osgUtil/DelaunayTriangulator.cpp | 20 +++++------ 3 files changed, 55 insertions(+), 12 deletions(-) diff --git a/src/osgWrappers/osg/TransferFunction.cpp b/src/osgWrappers/osg/TransferFunction.cpp index c1389b262..f85ee293b 100644 --- a/src/osgWrappers/osg/TransferFunction.cpp +++ b/src/osgWrappers/osg/TransferFunction.cpp @@ -80,6 +80,26 @@ BEGIN_OBJECT_REFLECTOR(osg::TransferFunction1D) __void__setInputRange__float__float, "", ""); + I_Method1(void, setMinimum, IN, float, value, + Properties::NON_VIRTUAL, + __void__setMinimum__float, + "", + ""); + I_Method0(float, getMinimum, + Properties::NON_VIRTUAL, + __float__getMinimum, + "", + ""); + I_Method1(void, setMaximum, IN, float, value, + Properties::NON_VIRTUAL, + __void__setMaximum__float, + "", + ""); + I_Method0(float, getMaximum, + Properties::NON_VIRTUAL, + __float__getMaximum, + "", + ""); I_Method1(void, allocate, IN, unsigned int, numX, Properties::NON_VIRTUAL, __void__allocate__unsigned_int, @@ -95,9 +115,9 @@ BEGIN_OBJECT_REFLECTOR(osg::TransferFunction1D) __unsigned_int__getNumberCellsX, "", ""); - I_Method1(osg::Vec4 &, getValue, IN, unsigned int, i, + I_Method2(void, setValue, IN, unsigned int, i, IN, const osg::Vec4 &, color, Properties::NON_VIRTUAL, - __osg_Vec4_R1__getValue__unsigned_int, + __void__setValue__unsigned_int__C5_osg_Vec4_R1, "", ""); I_Method1(const osg::Vec4 &, getValue, IN, unsigned int, i, @@ -105,8 +125,18 @@ BEGIN_OBJECT_REFLECTOR(osg::TransferFunction1D) __C5_osg_Vec4_R1__getValue__unsigned_int, "", ""); + I_SimpleProperty(float, Maximum, + __float__getMaximum, + __void__setMaximum__float); + I_SimpleProperty(float, Minimum, + __float__getMinimum, + __void__setMinimum__float); I_SimpleProperty(unsigned int, NumberCellsX, __unsigned_int__getNumberCellsX, 0); + I_IndexedProperty(const osg::Vec4 &, Value, + __C5_osg_Vec4_R1__getValue__unsigned_int, + __void__setValue__unsigned_int__C5_osg_Vec4_R1, + 0); END_REFLECTOR diff --git a/src/osgWrappers/osgTerrain/Layer.cpp b/src/osgWrappers/osgTerrain/Layer.cpp index 399218707..a632cf97a 100644 --- a/src/osgWrappers/osgTerrain/Layer.cpp +++ b/src/osgWrappers/osgTerrain/Layer.cpp @@ -206,6 +206,16 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::Layer) __unsigned_int__getNumRows, "", ""); + I_Method1(void, setDefaultValue, IN, const osg::Vec4 &, value, + Properties::NON_VIRTUAL, + __void__setDefaultValue__C5_osg_Vec4_R1, + "", + ""); + I_Method0(const osg::Vec4 &, getDefaultValue, + Properties::NON_VIRTUAL, + __C5_osg_Vec4_R1__getDefaultValue, + "", + ""); I_Method3(bool, getValue, IN, unsigned, int, IN, unsigned, int, IN, float &, x, Properties::VIRTUAL, __bool__getValue__unsigned__unsigned__float_R1, @@ -241,6 +251,9 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::Layer) __osg_BoundingSphere__computeBound, "", ""); + I_SimpleProperty(const osg::Vec4 &, DefaultValue, + __C5_osg_Vec4_R1__getDefaultValue, + __void__setDefaultValue__C5_osg_Vec4_R1); I_SimpleProperty(osgTerrain::Locator *, Locator, __Locator_P1__getLocator, __void__setLocator__Locator_P1); diff --git a/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp b/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp index bc83d2dcd..0049c6b1f 100644 --- a/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp +++ b/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp @@ -29,9 +29,9 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::DelaunayConstraint) I_Constructor0(____DelaunayConstraint, "", ""); - I_Method3(void, addtriangle, IN, const int, i1, IN, const int, i2, IN, const int, i3, + I_Method3(void, addtriangle, IN, int, i1, IN, int, i2, IN, int, i3, Properties::NON_VIRTUAL, - __void__addtriangle__C5_int__C5_int__C5_int, + __void__addtriangle__int__int__int, "collect up indices of triangle from delaunay triangles. ", "The delaunay triangles inside the DelaunayConstraint area can be used to fill the area or generate geometry that terrain follows the area in some way. These triangles can form a canopy or a field. "); I_Method0(const osg::DrawElementsUInt *, getTriangles, @@ -64,19 +64,19 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::DelaunayConstraint) __void__removeVerticesInside__C5_DelaunayConstraint_P1, "remove from line the vertices that are inside dco ", ""); - I_Method1(float, windingNumber, IN, const osg::Vec3, testpoint, + I_Method1(float, windingNumber, IN, const osg::Vec3 &, testpoint, Properties::NON_VIRTUAL, - __float__windingNumber__C5_osg_Vec3, + __float__windingNumber__C5_osg_Vec3_R1, "return winding number as a float of loop around testpoint; may use multiple loops does not reject points on the edge or very very close to the edge ", ""); - I_Method1(bool, contains, IN, const osg::Vec3, testpoint, + I_Method1(bool, contains, IN, const osg::Vec3 &, testpoint, Properties::VIRTUAL, - __bool__contains__C5_osg_Vec3, + __bool__contains__C5_osg_Vec3_R1, "true if testpoint is internal (or external) to constraint. ", ""); - I_Method1(bool, outside, IN, const osg::Vec3, testpoint, + I_Method1(bool, outside, IN, const osg::Vec3 &, testpoint, Properties::VIRTUAL, - __bool__outside__C5_osg_Vec3, + __bool__outside__C5_osg_Vec3_R1, "", ""); I_Method0(void, handleOverlaps, @@ -159,10 +159,10 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::DelaunayTriangulator) __void__removeInternalTriangles__DelaunayConstraint_P1, "remove the triangles internal to the constraint loops. ", "(Line strips cannot remove any internal triangles). "); - I_ProtectedMethod2(int, getindex, IN, const osg::Vec3, pt, IN, const osg::Vec3Array *, points, + I_ProtectedMethod2(int, getindex, IN, const osg::Vec3 &, pt, IN, const osg::Vec3Array *, points, Properties::NON_VIRTUAL, Properties::NON_CONST, - __int__getindex__C5_osg_Vec3__C5_osg_Vec3Array_P1, + __int__getindex__C5_osg_Vec3_R1__C5_osg_Vec3Array_P1, "", ""); I_SimpleProperty(osg::Vec3Array *, InputPointArray,