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

Removed redudent NodeVisitor::s/getUserData() as osg::Object provide this.

Browse Source 
Added using run entry to InteractiveImageHandler to quieten warning




git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14247 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield 2014-06-06 15:05:31 +00:00
parent 1c699a3664
commit a316c30b4a
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/osg/NodeVisitor
View File

@ -92,7 +92,7 @@ class OSG_EXPORT NodeVisitor : public virtual Object
NodeVisitor(const NodeVisitor& nv, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
virtual ~NodeVisitor();
META_Object(osg, NodeVisitor)
/** Method to call to reset visitor. Useful if your visitor accumulates
@ -168,21 +168,6 @@ class OSG_EXPORT NodeVisitor : public virtual Object
/** Get the traversal mode.*/
inline TraversalMode getTraversalMode() const { return _traversalMode; }
/**
* Set user data, data must be subclassed from Referenced to allow
* automatic memory handling. If your own data isn't directly
* subclassed from Referenced then create an adapter object
* which points to your own objects and handles the memory addressing.
*/
inline void setUserData(Referenced* obj) { _userData = obj; }
/** Get user data.*/
inline Referenced* getUserData() { return _userData.get(); }
/** Get const user data.*/
inline const Referenced* getUserData() const { return _userData.get(); }
/** Method for handling traversal of a nodes.
If you intend to use the visitor for actively traversing
the scene graph then make sure the accept() methods call
@ -340,8 +325,6 @@ class OSG_EXPORT NodeVisitor : public virtual Object
NodePath _nodePath;
ref_ptr<Referenced> _userData;
ref_ptr<DatabaseRequestHandler> _databaseRequestHandler;
ref_ptr<ImageRequestHandler> _imageRequestHandler;

2
include/osgViewer/ViewerEventHandlers
View File

@ -514,6 +514,8 @@ public:
META_Object(osgViewer, InteractiveImageHandler);
using osgGA::GUIEventHandler::run;
virtual bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter& aa, osg::Object*, osg::NodeVisitor* nv);
virtual bool cull(osg::NodeVisitor* nv, osg::Drawable* drawable, osg::RenderInfo* renderInfo) const;