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

From Laurens Voerman, "a few additions in the repository (asDrawableEventCallback / asDrawableCullCallback) made this version a bit outdated,

Browse Source 
so I get so new warnings. This update can fix those warnings."
This commit is contained in:
Robert Osfield 2016-02-17 15:09:14 +00:00
parent 67202b2662
commit 98ca24ff4e
4 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/osg/ClusterCullingCallback
View File

@ -36,6 +36,9 @@ class OSG_EXPORT ClusterCullingCallback : public DrawableCullCallback, public No
virtual NodeCallback* asNodeCallback() { return osg::NodeCallback::asNodeCallback(); } virtual NodeCallback* asNodeCallback() { return osg::NodeCallback::asNodeCallback(); }
virtual const NodeCallback* asNodeCallback() const { 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. // use the NodeCallbacks implementation of run.
virtual bool run(osg::Object* object, osg::Object* data) { return NodeCallback::run(object, data); } virtual bool run(osg::Object* object, osg::Object* data) { return NodeCallback::run(object, data); }

3
include/osgGA/EventHandler
View File

@ -46,6 +46,9 @@ public:
virtual NodeCallback* asNodeCallback() { return osg::NodeCallback::asNodeCallback(); } virtual NodeCallback* asNodeCallback() { return osg::NodeCallback::asNodeCallback(); }
virtual const NodeCallback* asNodeCallback() const { 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) virtual bool run(osg::Object* object, osg::Object* data)
{ {
osg::Node* node = dynamic_cast<osg::Node*>(object); osg::Node* node = dynamic_cast<osg::Node*>(object);

6
include/osgViewer/ViewerEventHandlers
View File

@ -513,6 +513,12 @@ public:
virtual NodeCallback* asNodeCallback() { return osg::NodeCallback::asNodeCallback(); } virtual NodeCallback* asNodeCallback() { return osg::NodeCallback::asNodeCallback(); }
virtual const NodeCallback* asNodeCallback() const { 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. // use the osgGA::GUIEventHandler implementation of run.
virtual bool run(osg::Object* object, osg::Object* data) { return osgGA::GUIEventHandler::run(object, data); } virtual bool run(osg::Object* object, osg::Object* data) { return osgGA::GUIEventHandler::run(object, data); }

3
include/osgVolume/Property
View File

@ -490,6 +490,9 @@ class OSGVOLUME_EXPORT PropertyAdjustmentCallback : public osgGA::GUIEventHandle
virtual NodeCallback* asNodeCallback() { return osg::NodeCallback::asNodeCallback(); } virtual NodeCallback* asNodeCallback() { return osg::NodeCallback::asNodeCallback(); }
virtual const NodeCallback* asNodeCallback() const { 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); } virtual bool run(osg::Object* object, osg::Object* data) { return osgGA::GUIEventHandler::run(object, data); }
void setKeyEventCycleForward(int key) { _cyleForwardKey = key; } void setKeyEventCycleForward(int key) { _cyleForwardKey = key; }