From 98f5fca9c2a028a5b35e6967669a3099ef259ccd Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 20 Jan 2015 15:23:06 +0000 Subject: [PATCH] Added key osgTerrain::GeometryPool methods virtual to make it easier to override the shaders git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14662 16af8721-9629-0410-8352-f15c8da7e697 --- include/osgTerrain/GeometryPool | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/osgTerrain/GeometryPool b/include/osgTerrain/GeometryPool index 8cf2e5992..ba5a836ac 100644 --- a/include/osgTerrain/GeometryPool +++ b/include/osgTerrain/GeometryPool @@ -90,7 +90,7 @@ class OSGTERRAIN_EXPORT GeometryPool : public osg::Referenced typedef std::map< GeometryKey, osg::ref_ptr > GeometryMap; - bool createKeyForTile(TerrainTile* tile, GeometryKey& key); + virtual bool createKeyForTile(TerrainTile* tile, GeometryKey& key); enum LayerType { @@ -102,13 +102,13 @@ class OSGTERRAIN_EXPORT GeometryPool : public osg::Referenced typedef std::vector LayerTypes; typedef std::map > ProgramMap; - osg::ref_ptr getOrCreateProgram(LayerTypes& layerTypes); + virtual osg::ref_ptr getOrCreateProgram(LayerTypes& layerTypes); - osg::ref_ptr getOrCreateGeometry(osgTerrain::TerrainTile* tile); + virtual osg::ref_ptr getOrCreateGeometry(osgTerrain::TerrainTile* tile); - osg::ref_ptr getTileSubgraph(osgTerrain::TerrainTile* tile); + virtual osg::ref_ptr getTileSubgraph(osgTerrain::TerrainTile* tile); - void applyLayers(osgTerrain::TerrainTile* tile, osg::StateSet* stateset); + virtual void applyLayers(osgTerrain::TerrainTile* tile, osg::StateSet* stateset); void setUseGeometryShader(bool flag) { _useGeometryShader = flag; } bool getUseGeometryShader() const { return _useGeometryShader; }