From 98ca24ff4ef55ec83638c21a44b50034c98b8b52 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 17 Feb 2016 15:09:14 +0000 Subject: [PATCH] From Laurens Voerman, "a few additions in the repository (asDrawableEventCallback / asDrawableCullCallback) made this version a bit outdated, so I get so new warnings. This update can fix those warnings." --- include/osg/ClusterCullingCallback | 3 +++ include/osgGA/EventHandler | 3 +++ include/osgViewer/ViewerEventHandlers | 6 ++++++ include/osgVolume/Property | 3 +++ 4 files changed, 15 insertions(+) diff --git a/include/osg/ClusterCullingCallback b/include/osg/ClusterCullingCallback index 12d822015..6d7bea1c9 100644 --- a/include/osg/ClusterCullingCallback +++ b/include/osg/ClusterCullingCallback @@ -36,6 +36,9 @@ class OSG_EXPORT ClusterCullingCallback : public DrawableCullCallback, public No virtual NodeCallback* asNodeCallback() { return osg::NodeCallback::asNodeCallback(); } virtual const NodeCallback* asNodeCallback() const { return osg::NodeCallback::asNodeCallback(); } + virtual DrawableCullCallback* asDrawableCullCallback() { return osg::DrawableCullCallback::asDrawableCullCallback(); } + virtual const DrawableCullCallback* asDrawableCullCallback() const { return osg::DrawableCullCallback::asDrawableCullCallback(); } + // use the NodeCallbacks implementation of run. virtual bool run(osg::Object* object, osg::Object* data) { return NodeCallback::run(object, data); } diff --git a/include/osgGA/EventHandler b/include/osgGA/EventHandler index b6445fd6e..7156a443c 100644 --- a/include/osgGA/EventHandler +++ b/include/osgGA/EventHandler @@ -46,6 +46,9 @@ public: virtual NodeCallback* asNodeCallback() { return osg::NodeCallback::asNodeCallback(); } virtual const NodeCallback* asNodeCallback() const { return osg::NodeCallback::asNodeCallback(); } + virtual DrawableEventCallback* asDrawableEventCallback() { return osg::DrawableEventCallback::asDrawableEventCallback(); } + virtual const DrawableEventCallback* asDrawableEventCallback() const { return osg::DrawableEventCallback::asDrawableEventCallback(); } + virtual bool run(osg::Object* object, osg::Object* data) { osg::Node* node = dynamic_cast(object); diff --git a/include/osgViewer/ViewerEventHandlers b/include/osgViewer/ViewerEventHandlers index 113396ffb..b71bdbf9e 100644 --- a/include/osgViewer/ViewerEventHandlers +++ b/include/osgViewer/ViewerEventHandlers @@ -513,6 +513,12 @@ public: virtual NodeCallback* asNodeCallback() { return osg::NodeCallback::asNodeCallback(); } virtual const NodeCallback* asNodeCallback() const { return osg::NodeCallback::asNodeCallback(); } + virtual DrawableEventCallback* asDrawableEventCallback() { return osg::DrawableEventCallback::asDrawableEventCallback(); } + virtual const DrawableEventCallback* asDrawableEventCallback() const { return osg::DrawableEventCallback::asDrawableEventCallback(); } + + virtual DrawableCullCallback* asDrawableCullCallback() { return osg::DrawableCullCallback::asDrawableCullCallback(); } + virtual const DrawableCullCallback* asDrawableCullCallback() const { return osg::DrawableCullCallback::asDrawableCullCallback(); } + // use the osgGA::GUIEventHandler implementation of run. virtual bool run(osg::Object* object, osg::Object* data) { return osgGA::GUIEventHandler::run(object, data); } diff --git a/include/osgVolume/Property b/include/osgVolume/Property index 5fe8973a1..c4d2dfabb 100644 --- a/include/osgVolume/Property +++ b/include/osgVolume/Property @@ -490,6 +490,9 @@ class OSGVOLUME_EXPORT PropertyAdjustmentCallback : public osgGA::GUIEventHandle virtual NodeCallback* asNodeCallback() { return osg::NodeCallback::asNodeCallback(); } virtual const NodeCallback* asNodeCallback() const { return osg::NodeCallback::asNodeCallback(); } + virtual DrawableEventCallback* asDrawableEventCallback() { return osg::DrawableEventCallback::asDrawableEventCallback(); } + virtual const DrawableEventCallback* asDrawableEventCallback() const { return osg::DrawableEventCallback::asDrawableEventCallback(); } + virtual bool run(osg::Object* object, osg::Object* data) { return osgGA::GUIEventHandler::run(object, data); } void setKeyEventCycleForward(int key) { _cyleForwardKey = key; }