From 656efbf03f0aa631e1d70773fe06173109b2d184 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 1 Apr 2010 21:18:39 +0000 Subject: [PATCH] Removed getNeighbours() method to avoid problems with introspection wrappers --- include/osgTerrain/TerrainTechnique | 3 --- .../introspection/osgTerrain/TerrainTechnique.cpp | 13 ------------- 2 files changed, 16 deletions(-) diff --git a/include/osgTerrain/TerrainTechnique b/include/osgTerrain/TerrainTechnique index 3dcd32b64..2046a02fa 100644 --- a/include/osgTerrain/TerrainTechnique +++ b/include/osgTerrain/TerrainTechnique @@ -82,10 +82,7 @@ class OSGTERRAIN_EXPORT TerrainTechnique : public osg::Object, public osg::Obser void addNeighbour(TerrainTile* tile) { _neighbours.addNeighbour(tile); } void removeNeighbour(TerrainTile* tile) { _neighbours.removeNeighbour(tile); } - bool containsNeighbour(TerrainTile* tile) { return _neighbours.containsNeighbour(tile); } - TerrainNeighbours& getNeighbours() { return _neighbours; } - const TerrainNeighbours& getNeighbours() const { return _neighbours; } protected: diff --git a/src/osgWrappers/introspection/osgTerrain/TerrainTechnique.cpp b/src/osgWrappers/introspection/osgTerrain/TerrainTechnique.cpp index cbbe07234..8a58c6f20 100644 --- a/src/osgWrappers/introspection/osgTerrain/TerrainTechnique.cpp +++ b/src/osgWrappers/introspection/osgTerrain/TerrainTechnique.cpp @@ -118,16 +118,6 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainTechnique) __bool__containsNeighbour__TerrainTile_P1, "", ""); - I_Method0(osgTerrain::TerrainNeighbours &, getNeighbours, - Properties::NON_VIRTUAL, - __TerrainNeighbours_R1__getNeighbours, - "", - ""); - I_Method0(const osgTerrain::TerrainNeighbours &, getNeighbours, - Properties::NON_VIRTUAL, - __C5_TerrainNeighbours_R1__getNeighbours, - "", - ""); I_ProtectedMethod1(void, setTerrainTile, IN, osgTerrain::TerrainTile *, tile, Properties::NON_VIRTUAL, Properties::NON_CONST, @@ -140,9 +130,6 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainTechnique) __void__setDirty__bool, "", ""); - I_SimpleProperty(osgTerrain::TerrainNeighbours &, Neighbours, - __TerrainNeighbours_R1__getNeighbours, - 0); I_SimpleProperty(osgTerrain::TerrainTile *, TerrainTile, __TerrainTile_P1__getTerrainTile, 0);