FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added key osgTerrain::GeometryPool methods virtual to make it easier to override the shaders

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14662 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield 2015-01-20 15:23:06 +00:00
parent 0a4efa35c3
commit 98f5fca9c2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/osgTerrain/GeometryPool
View File

@ -90,7 +90,7 @@ class OSGTERRAIN_EXPORT GeometryPool : public osg::Referenced
typedef std::map< GeometryKey, osg::ref_ptr<SharedGeometry> > GeometryMap; typedef std::map< GeometryKey, osg::ref_ptr<SharedGeometry> > GeometryMap;
bool createKeyForTile(TerrainTile* tile, GeometryKey& key); virtual bool createKeyForTile(TerrainTile* tile, GeometryKey& key);
enum LayerType enum LayerType
{ {
@ -102,13 +102,13 @@ class OSGTERRAIN_EXPORT GeometryPool : public osg::Referenced
typedef std::vector<LayerType> LayerTypes; typedef std::vector<LayerType> LayerTypes;
typedef std::map<LayerTypes, osg::ref_ptr<osg::Program> > ProgramMap; typedef std::map<LayerTypes, osg::ref_ptr<osg::Program> > ProgramMap;
osg::ref_ptr<osg::Program> getOrCreateProgram(LayerTypes& layerTypes); virtual osg::ref_ptr<osg::Program> getOrCreateProgram(LayerTypes& layerTypes);
osg::ref_ptr<SharedGeometry> getOrCreateGeometry(osgTerrain::TerrainTile* tile); virtual osg::ref_ptr<SharedGeometry> getOrCreateGeometry(osgTerrain::TerrainTile* tile);
osg::ref_ptr<osg::MatrixTransform> getTileSubgraph(osgTerrain::TerrainTile* tile); virtual osg::ref_ptr<osg::MatrixTransform> 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; } void setUseGeometryShader(bool flag) { _useGeometryShader = flag; }
bool getUseGeometryShader() const { return _useGeometryShader; } bool getUseGeometryShader() const { return _useGeometryShader; }