From 526f8cd8dcbc839978d6bd45a6c4f7482d2d2d66 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 27 May 2008 15:42:40 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osg/Texture2DArray.cpp | 4 ++-- .../osgTerrain/GeometryTechnique.cpp | 5 ----- src/osgWrappers/osgTerrain/Terrain.cpp | 19 +++++++++++++++++++ .../osgTerrain/TerrainTechnique.cpp | 16 ++++++---------- src/osgWrappers/osgTerrain/TerrainTile.cpp | 13 +++++++++++++ 5 files changed, 40 insertions(+), 17 deletions(-) diff --git a/src/osgWrappers/osg/Texture2DArray.cpp b/src/osgWrappers/osg/Texture2DArray.cpp index 45325c5cf..fa48afb7a 100644 --- a/src/osgWrappers/osg/Texture2DArray.cpp +++ b/src/osgWrappers/osg/Texture2DArray.cpp @@ -196,10 +196,10 @@ BEGIN_OBJECT_REFLECTOR(osg::Texture2DArray) __void__allocateMipmap__State_R1, "Allocate mipmap levels of the texture by subsequent calling of glTexImage* function. ", ""); - I_ProtectedMethod6(void, applyTexImage2DArray_subload, IN, osg::State &, state, IN, osg::Image *, image, IN, GLsizei &, inwidth, IN, GLsizei &, inheight, IN, GLsizei &, indepth, IN, GLsizei &, numMipmapLevels, + I_ProtectedMethod7(void, applyTexImage2DArray_subload, IN, osg::State &, state, IN, osg::Image *, image, IN, GLsizei, inwidth, IN, GLsizei, inheight, IN, GLsizei, indepth, IN, GLenum, inInternalFormat, IN, GLsizei &, numMipmapLevels, Properties::NON_VIRTUAL, Properties::CONST, - __void__applyTexImage2DArray_subload__State_R1__Image_P1__GLsizei_R1__GLsizei_R1__GLsizei_R1__GLsizei_R1, + __void__applyTexImage2DArray_subload__State_R1__Image_P1__GLsizei__GLsizei__GLsizei__GLenum__GLsizei_R1, "", ""); I_ArrayProperty(osg::Image *, Image, diff --git a/src/osgWrappers/osgTerrain/GeometryTechnique.cpp b/src/osgWrappers/osgTerrain/GeometryTechnique.cpp index 24acdb9a2..d351562b3 100644 --- a/src/osgWrappers/osgTerrain/GeometryTechnique.cpp +++ b/src/osgWrappers/osgTerrain/GeometryTechnique.cpp @@ -125,11 +125,6 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::GeometryTechnique) __void__cleanSceneGraph, "Clean scene graph from any terrain technique specific nodes. ", ""); - I_Method0(void, dirty, - Properties::VIRTUAL, - __void__dirty, - "Dirty so that cached data structures will be updated on next use. ", - ""); I_Method1(void, setFilterBias, IN, float, filterBias, Properties::NON_VIRTUAL, __void__setFilterBias__float, diff --git a/src/osgWrappers/osgTerrain/Terrain.cpp b/src/osgWrappers/osgTerrain/Terrain.cpp index 339c12d20..00a33a129 100644 --- a/src/osgWrappers/osgTerrain/Terrain.cpp +++ b/src/osgWrappers/osgTerrain/Terrain.cpp @@ -79,6 +79,16 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::Terrain) __float__getSampleRatio, "Get the sample ratio hint. ", ""); + I_Method1(void, setVerticalScale, IN, float, scale, + Properties::NON_VIRTUAL, + __void__setVerticalScale__float, + "Set the vertical scale hint. ", + ""); + I_Method0(float, getVerticalScale, + Properties::NON_VIRTUAL, + __float__getVerticalScale, + "Get the vertical scale hint. ", + ""); I_Method1(osgTerrain::TerrainTile *, getTile, IN, const osgTerrain::TileID &, tileID, Properties::NON_VIRTUAL, __TerrainTile_P1__getTile__C5_TileID_R1, @@ -89,6 +99,12 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::Terrain) __C5_TerrainTile_P1__getTile__C5_TileID_R1, "Get the const TerrainTile for a given TileID. ", ""); + I_ProtectedMethod0(void, dirtyRegisteredTiles, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__dirtyRegisteredTiles, + "", + ""); I_ProtectedMethod1(void, registerTerrainTile, IN, osgTerrain::TerrainTile *, tile, Properties::NON_VIRTUAL, Properties::NON_CONST, @@ -104,5 +120,8 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::Terrain) I_SimpleProperty(float, SampleRatio, __float__getSampleRatio, __void__setSampleRatio__float); + I_SimpleProperty(float, VerticalScale, + __float__getVerticalScale, + __void__setVerticalScale__float); END_REFLECTOR diff --git a/src/osgWrappers/osgTerrain/TerrainTechnique.cpp b/src/osgWrappers/osgTerrain/TerrainTechnique.cpp index 28398d9f8..9280885be 100644 --- a/src/osgWrappers/osgTerrain/TerrainTechnique.cpp +++ b/src/osgWrappers/osgTerrain/TerrainTechnique.cpp @@ -96,16 +96,12 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainTechnique) __void__traverse__osg_NodeVisitor_R1, "Traverse the terrain subgraph. ", ""); - I_Method0(void, dirty, - Properties::VIRTUAL, - __void__dirty, - "Dirty so that cached data structures will be updated on next use. ", - ""); - I_Method0(bool, isDirty, - Properties::VIRTUAL, - __bool__isDirty, - "Return true if cached data structures need updating. ", - ""); + I_ProtectedMethod1(void, setDirty, IN, bool, dirty, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setDirty__bool, + "", + ""); I_SimpleProperty(osgTerrain::TerrainTile *, TerrainTile, __TerrainTile_P1__getTerrainTile, 0); diff --git a/src/osgWrappers/osgTerrain/TerrainTile.cpp b/src/osgWrappers/osgTerrain/TerrainTile.cpp index 60143760b..35679c9b6 100644 --- a/src/osgWrappers/osgTerrain/TerrainTile.cpp +++ b/src/osgWrappers/osgTerrain/TerrainTile.cpp @@ -188,6 +188,16 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainTile) __bool__getTreatBoundariesToValidDataAsDefaultValue, "Get whether the TeatBoundariesToValidDataAsDefaultValue hint. ", ""); + I_Method1(void, setDirty, IN, bool, dirty, + Properties::NON_VIRTUAL, + __void__setDirty__bool, + "Set the dirty flag on/off. ", + ""); + I_Method0(bool, getDirty, + Properties::NON_VIRTUAL, + __bool__getDirty, + "return true if the tile is dirty and needs to be updated, ", + ""); I_Method0(osg::BoundingSphere, computeBound, Properties::VIRTUAL, __osg_BoundingSphere__computeBound, @@ -200,6 +210,9 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainTile) 0, 0, 0); + I_SimpleProperty(bool, Dirty, + __bool__getDirty, + __void__setDirty__bool); I_SimpleProperty(osgTerrain::Layer *, ElevationLayer, __Layer_P1__getElevationLayer, __void__setElevationLayer__Layer_P1);