From 9e60a5d222c139984dbd3435a7b7f5f9095fefa3 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 14 May 2007 09:33:32 +0000 Subject: [PATCH] Updated wrappers and version numbers for 1.9.4 dev release --- CMakeLists.txt | 2 +- include/osg/Version | 4 +++- .../osgTerrain/GeometryTechnique.cpp | 2 +- src/osgWrappers/osgTerrain/TerrainNode.cpp | 20 ++++++++++++++++++- .../osgTerrain/TerrainTechnique.cpp | 7 ++++++- 5 files changed, 30 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bbe351bff..08f9231de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ PROJECT(OpenSceneGraph) SET(OPENSCENEGRAPH_MAJOR_VERSION 1) SET(OPENSCENEGRAPH_MINOR_VERSION 9) -SET(OPENSCENEGRAPH_PATCH_VERSION 3) +SET(OPENSCENEGRAPH_PATCH_VERSION 4) SET(OpenThreads_SOURCE_DIR ${OpenSceneGraph_SOURCE_DIR}) diff --git a/include/osg/Version b/include/osg/Version index d1d7945ff..7f9b1a177 100644 --- a/include/osg/Version +++ b/include/osg/Version @@ -20,7 +20,9 @@ extern "C" { #define OSG_VERSION_MAJOR 1 #define OSG_VERSION_MINOR 9 -#define OSG_VERSION_RELEASE 3 +#define OSG_VERSION_PATCH 4 + +#define OSG_VERSION_RELEASE OSG_VERSION_PATCH #define OSG_VERSION_REVISION 0 /** diff --git a/src/osgWrappers/osgTerrain/GeometryTechnique.cpp b/src/osgWrappers/osgTerrain/GeometryTechnique.cpp index dca8f904c..618fc31e2 100644 --- a/src/osgWrappers/osgTerrain/GeometryTechnique.cpp +++ b/src/osgWrappers/osgTerrain/GeometryTechnique.cpp @@ -60,7 +60,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::GeometryTechnique) I_Method0(void, dirty, Properties::VIRTUAL, __void__dirty, - "Dirty so that cached data structurese are updated. ", + "Dirty so that cached data structurese will be updated on next use. ", ""); END_REFLECTOR diff --git a/src/osgWrappers/osgTerrain/TerrainNode.cpp b/src/osgWrappers/osgTerrain/TerrainNode.cpp index 46ef0169f..855e3d6b4 100644 --- a/src/osgWrappers/osgTerrain/TerrainNode.cpp +++ b/src/osgWrappers/osgTerrain/TerrainNode.cpp @@ -77,6 +77,11 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainNode) __void__traverse__osg_NodeVisitor_R1, "Traverse downwards : calls children's accept method with NodeVisitor. ", ""); + I_Method0(void, init, + Properties::NON_VIRTUAL, + __void__init, + "Call init on any attached TerrainTechnique. ", + ""); I_Method1(void, setTerrainTechnique, IN, osgTerrain::TerrainTechnique *, TerrainTechnique, Properties::NON_VIRTUAL, __void__setTerrainTechnique__osgTerrain_TerrainTechnique_P1, @@ -170,13 +175,23 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainNode) I_Method1(void, setRequiresNormals, IN, bool, flag, Properties::NON_VIRTUAL, __void__setRequiresNormals__bool, - "Set whether the TerrainTechnique should create per vertex normals for lighting purposes. ", + "Set hint to whether the TerrainTechnique should create per vertex normals for lighting purposes. ", ""); I_Method0(bool, getRequiresNormals, Properties::NON_VIRTUAL, __bool__getRequiresNormals, "Get whether the TerrainTechnique should create per vertex normals for lighting purposes. ", ""); + I_Method1(void, setTreatBoundariesToValidDataAsDefaultValue, IN, bool, flag, + Properties::NON_VIRTUAL, + __void__setTreatBoundariesToValidDataAsDefaultValue__bool, + "Set the hint to whether the TerrainTechnique should treat the invalid Layer entries that at are neigbours to valid entries with the default value. ", + ""); + I_Method0(bool, getTreatBoundariesToValidDataAsDefaultValue, + Properties::NON_VIRTUAL, + __bool__getTreatBoundariesToValidDataAsDefaultValue, + "Get whether the TeatBoundariesToValidDataAsDefaultValue hint. ", + ""); I_Method0(osg::BoundingSphere, computeBound, Properties::VIRTUAL, __osg_BoundingSphere__computeBound, @@ -209,5 +224,8 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainNode) I_SimpleProperty(osgTerrain::TerrainTechnique *, TerrainTechnique, __TerrainTechnique_P1__getTerrainTechnique, __void__setTerrainTechnique__osgTerrain_TerrainTechnique_P1); + I_SimpleProperty(bool, TreatBoundariesToValidDataAsDefaultValue, + __bool__getTreatBoundariesToValidDataAsDefaultValue, + __void__setTreatBoundariesToValidDataAsDefaultValue__bool); END_REFLECTOR diff --git a/src/osgWrappers/osgTerrain/TerrainTechnique.cpp b/src/osgWrappers/osgTerrain/TerrainTechnique.cpp index 88d1a7faa..4e90711e4 100644 --- a/src/osgWrappers/osgTerrain/TerrainTechnique.cpp +++ b/src/osgWrappers/osgTerrain/TerrainTechnique.cpp @@ -98,7 +98,12 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainTechnique) I_Method0(void, dirty, Properties::VIRTUAL, __void__dirty, - "Dirty so that cached data structurese are updated. ", + "Dirty so that cached data structurese will be updated on next use. ", + ""); + I_Method0(bool, isDirty, + Properties::VIRTUAL, + __bool__isDirty, + "Return true if cached data structurese need updating. ", ""); I_SimpleProperty(osgTerrain::TerrainNode *, TerrainNode, __TerrainNode_P1__getTerrainNode,