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

Renamed DrawableUpdate/Event/Cull callbacks to use new include/osg/Callback versions

Browse Source
This commit is contained in:
Robert Osfield
2016-01-19 11:39:28 +00:00
parent e8fd414661
commit 55a8f4abbc
18 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/ClusterCullingCallback
View File

@@ -22,7 +22,7 @@ namespace osg {
/** Implements cluster culling to cull back facing drawables. Derived from
* Drawable::CullCallback.
*/
class OSG_EXPORT ClusterCullingCallback : public Drawable::CullCallback, public NodeCallback
class OSG_EXPORT ClusterCullingCallback : public DrawableCullCallback, public NodeCallback
{
public:

2
include/osgAnimation/MorphGeometry
View File

@@ -137,7 +137,7 @@ namespace osgAnimation
bool link(osgAnimation::Channel* channel);
};
struct UpdateMorphGeometry : public osg::Drawable::UpdateCallback
struct UpdateMorphGeometry : public osg::DrawableUpdateCallback
{
UpdateMorphGeometry() {}

2
include/osgAnimation/RigGeometry
View File

@@ -123,7 +123,7 @@ namespace osgAnimation
};
struct UpdateRigGeometry : public osg::Drawable::UpdateCallback
struct UpdateRigGeometry : public osg::DrawableUpdateCallback
{
UpdateRigGeometry() {}

4
include/osgGA/EventHandler
View File

@@ -30,7 +30,7 @@ namespace osgGA{
EventHandler is base class for adding handling of events, either as node event callback, drawable event callback or an event handler attached directly to the view(er)
*/
class OSGGA_EXPORT EventHandler : public osg::NodeCallback, public osg::Drawable::EventCallback
class OSGGA_EXPORT EventHandler : public osg::NodeCallback, public osg::DrawableEventCallback
{
public:
@@ -39,7 +39,7 @@ public:
osg::Object(eh, copyop),
osg::Callback(eh, copyop),
osg::NodeCallback(eh, copyop),
osg::Drawable::EventCallback(eh, copyop) {}
osg::DrawableEventCallback(eh, copyop) {}
META_Object(osgGA, EventHandler);

4
include/osgViewer/ViewerEventHandlers
View File

@@ -499,7 +499,7 @@ class OSGVIEWER_EXPORT ScreenCaptureHandler : public osgGA::GUIEventHandler
/** InteractiveImage is an event handler that computes the mouse coordinates in an images coordinate frame
* and then passes keyboard and mouse events to it. This event handler is useful for vnc or browser
* surfaces in the 3D scene.*/
class OSGVIEWER_EXPORT InteractiveImageHandler : public osgGA::GUIEventHandler, public osg::Drawable::CullCallback
class OSGVIEWER_EXPORT InteractiveImageHandler : public osgGA::GUIEventHandler, public osg::DrawableCullCallback
{
public:
@@ -524,7 +524,7 @@ protected:
InteractiveImageHandler() {}
InteractiveImageHandler(const InteractiveImageHandler&,const osg::CopyOp& = osg::CopyOp::SHALLOW_COPY):
osg::Object(), osg::Callback(), osgGA::GUIEventHandler(), osg::Drawable::CullCallback(), _fullscreen(false) {}
osg::Object(), osg::Callback(), osgGA::GUIEventHandler(), osg::DrawableCullCallback(), _fullscreen(false) {}
bool mousePosition(osgViewer::View* view, osg::NodeVisitor* nv, const osgGA::GUIEventAdapter& ea, int& x, int &y) const;