From 3c82058c68b0dc491d48069f6d9162490b61925e Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 16 Aug 2007 15:29:50 +0000 Subject: [PATCH] Updated wrappers --- include/osgTerrain/GeometryTechnique | 2 +- src/osgShadow/SoftShadowMap.cpp | 2 + src/osgTerrain/GeometryTechnique.cpp | 2 +- .../osgTerrain/GeometryTechnique.cpp | 37 +++++++++++++++++++ 4 files changed, 41 insertions(+), 2 deletions(-) diff --git a/include/osgTerrain/GeometryTechnique b/include/osgTerrain/GeometryTechnique index 8b3bb8626..3055f4558 100644 --- a/include/osgTerrain/GeometryTechnique +++ b/include/osgTerrain/GeometryTechnique @@ -36,7 +36,7 @@ class OSGTERRAIN_EXPORT GeometryTechnique : public TerrainTechnique virtual Locator* computeMasterLocator(); - virtual const osg::Vec3d computeCenterModel(Locator* masterLocator); + virtual osg::Vec3d computeCenterModel(Locator* masterLocator); virtual void generateGeometry(Locator* masterLocator, const osg::Vec3d& centerModel); diff --git a/src/osgShadow/SoftShadowMap.cpp b/src/osgShadow/SoftShadowMap.cpp index 2592e85d8..6ce041978 100755 --- a/src/osgShadow/SoftShadowMap.cpp +++ b/src/osgShadow/SoftShadowMap.cpp @@ -11,6 +11,8 @@ * OpenSceneGraph Public License for more details. */ +#include + #include #include #include diff --git a/src/osgTerrain/GeometryTechnique.cpp b/src/osgTerrain/GeometryTechnique.cpp index 74d974a00..d590e0bd6 100644 --- a/src/osgTerrain/GeometryTechnique.cpp +++ b/src/osgTerrain/GeometryTechnique.cpp @@ -143,7 +143,7 @@ Locator* GeometryTechnique::computeMasterLocator() return masterLocator; } -const osg::Vec3d GeometryTechnique::computeCenterModel(Locator* masterLocator) +osg::Vec3d GeometryTechnique::computeCenterModel(Locator* masterLocator) { BufferData& buffer = getWriteBuffer(); diff --git a/src/osgWrappers/osgTerrain/GeometryTechnique.cpp b/src/osgWrappers/osgTerrain/GeometryTechnique.cpp index ae8c9b8b9..319016c84 100644 --- a/src/osgWrappers/osgTerrain/GeometryTechnique.cpp +++ b/src/osgWrappers/osgTerrain/GeometryTechnique.cpp @@ -13,7 +13,9 @@ #include #include #include +#include #include +#include #include #include @@ -47,6 +49,41 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::GeometryTechnique) __void__init, "", ""); + I_Method0(osgTerrain::Locator *, computeMasterLocator, + Properties::VIRTUAL, + __Locator_P1__computeMasterLocator, + "", + ""); + I_Method1(osg::Vec3d, computeCenterModel, IN, osgTerrain::Locator *, masterLocator, + Properties::VIRTUAL, + __osg_Vec3d__computeCenterModel__Locator_P1, + "", + ""); + I_Method2(void, generateGeometry, IN, osgTerrain::Locator *, masterLocator, IN, const osg::Vec3d &, centerModel, + Properties::VIRTUAL, + __void__generateGeometry__Locator_P1__C5_osg_Vec3d_R1, + "", + ""); + I_Method0(void, applyColorLayers, + Properties::VIRTUAL, + __void__applyColorLayers, + "", + ""); + I_Method0(void, applyTransferFunctions, + Properties::VIRTUAL, + __void__applyTransferFunctions, + "", + ""); + I_Method0(void, applyTransparency, + Properties::VIRTUAL, + __void__applyTransparency, + "", + ""); + I_Method0(void, smoothGeometry, + Properties::VIRTUAL, + __void__smoothGeometry, + "", + ""); I_Method1(void, update, IN, osgUtil::UpdateVisitor *, nv, Properties::VIRTUAL, __void__update__osgUtil_UpdateVisitor_P1,