Added forward declaration of callbacks to headers to avoid scoping issues of classes with same names.
This commit is contained in:
parent
7b598c5701
commit
e0c279bf3d
@ -75,6 +75,9 @@ class OSGSHADOW_EXPORT DebugShadowMap : public ViewDependentShadowTechnique
|
||||
/** Classic protected OSG destructor */
|
||||
virtual ~DebugShadowMap();
|
||||
|
||||
// forward declare, interface and implementation provided in DebugShadowMap.cpp
|
||||
class DrawableDrawWithDepthShadowComparisonOffCallback;
|
||||
|
||||
osg::Vec2s _hudSize;
|
||||
osg::Vec2s _hudOrigin;
|
||||
osg::Vec2s _viewportSize;
|
||||
|
@ -94,6 +94,9 @@ class OSGSHADOW_EXPORT ShadowMap : public ShadowTechnique
|
||||
virtual void createUniforms();
|
||||
|
||||
virtual void createShaders();
|
||||
|
||||
// forward declare, interface and implementation provided in ShadowMap.cpp
|
||||
class DrawableDrawWithDepthShadowComparisonOffCallback;
|
||||
|
||||
osg::ref_ptr<osg::Camera> _camera;
|
||||
osg::ref_ptr<osg::TexGen> _texgen;
|
||||
|
@ -405,13 +405,13 @@ void DebugShadowMap::ViewData::init( ThisClass *st, osgUtil::CullVisitor *cv )
|
||||
_cameraDebugHUD = NULL;//Force debug HUD rebuild ( if needed )
|
||||
}
|
||||
|
||||
|
||||
// Callback used by debugging hud to display Shadow Map to color buffer
|
||||
// Had to do it this way because OSG does not allow to use
|
||||
// the same GL Texture Id with different glTexParams.
|
||||
// Callback simply turns compare mode off via GL while rendering hud and
|
||||
// restores it before rendering the scene with shadows.
|
||||
|
||||
class DrawableDrawWithDepthShadowComparisonOffCallback:
|
||||
class DebugShadowMap::DrawableDrawWithDepthShadowComparisonOffCallback:
|
||||
public osg::Drawable::DrawCallback
|
||||
{
|
||||
public:
|
||||
|
@ -514,7 +514,7 @@ void ShadowMap::cleanSceneGraph()
|
||||
// Callback simply turns shadow compare mode off via GL while rendering hud and
|
||||
// restores it afterwards.
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
class DrawableDrawWithDepthShadowComparisonOffCallback:
|
||||
class ShadowMap::DrawableDrawWithDepthShadowComparisonOffCallback:
|
||||
public osg::Drawable::DrawCallback
|
||||
{
|
||||
public:
|
||||
@ -549,6 +549,7 @@ public:
|
||||
osg::ref_ptr< osg::Texture2D > _texture;
|
||||
unsigned _stage;
|
||||
};
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
osg::ref_ptr<osg::Camera> ShadowMap::makeDebugHUD()
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user