Changeset 9540

Show
Ignore:
Timestamp:
01/23/09 16:50:05 (6 years ago)
Author:
robert
Message:

Added forward declaration of callbacks to headers to avoid scoping issues of classes with same names.

Location:
OpenSceneGraph/trunk
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/include/osgShadow/DebugShadowMap

    r9113 r9540  
    7575        /** Classic protected OSG destructor */ 
    7676        virtual ~DebugShadowMap(); 
     77 
     78        // forward declare, interface and implementation provided in DebugShadowMap.cpp 
     79        class DrawableDrawWithDepthShadowComparisonOffCallback; 
    7780 
    7881        osg::Vec2s  _hudSize; 
  • OpenSceneGraph/trunk/include/osgShadow/ShadowMap

    r8891 r9540  
    9595 
    9696        virtual void createShaders(); 
     97         
     98        // forward declare, interface and implementation provided in ShadowMap.cpp 
     99        class DrawableDrawWithDepthShadowComparisonOffCallback; 
    97100 
    98101        osg::ref_ptr<osg::Camera>       _camera; 
  • OpenSceneGraph/trunk/src/osgShadow/DebugShadowMap.cpp

    r9376 r9540  
    406406} 
    407407 
     408 
    408409// Callback used by debugging hud to display Shadow Map to color buffer 
    409410// Had to do it this way because OSG does not allow to use  
     
    411412// Callback simply turns compare mode off via GL while rendering hud and  
    412413// restores it before rendering the scene with shadows.  
    413  
    414 class DrawableDrawWithDepthShadowComparisonOffCallback:  
     414class DebugShadowMap::DrawableDrawWithDepthShadowComparisonOffCallback:  
    415415    public osg::Drawable::DrawCallback 
    416416{ 
  • OpenSceneGraph/trunk/src/osgShadow/ShadowMap.cpp

    r9062 r9540  
    515515// restores it afterwards.  
    516516//////////////////////////////////////////////////////////////////////////////// 
    517 class DrawableDrawWithDepthShadowComparisonOffCallback:  
     517class ShadowMap::DrawableDrawWithDepthShadowComparisonOffCallback:  
    518518    public osg::Drawable::DrawCallback 
    519519{ 
     
    550550    unsigned                       _stage; 
    551551}; 
     552 
    552553//////////////////////////////////////////////////////////////////////////////// 
    553554osg::ref_ptr<osg::Camera> ShadowMap::makeDebugHUD()