Changeset 11061 for OpenSceneGraph/trunk/include/osg/NodeTrackerCallback

Timestamp:

02/15/10 21:15:32 (3 years ago)

Author:

robert

Message:

Refactor various NodeTracker? and MatrixManipulator? classes to use the osg::ObserverNodePath? and osg::oberserver_ptr<> classes

Files:

• OpenSceneGraph/trunk/include/osg/NodeTrackerCallback (modified) (3 diffs)

OpenSceneGraph/trunk/include/osg/NodeTrackerCallback

@@ -19 +19 @@
 #include <osg/Node>
 #include <osg/NodeCallback>
-#include <osg/observer_ptr>
+#include <osg/ObserverNodePath>
 
 namespace osg
@@ -28 +28 @@
     public:
 
-
-        typedef std::vector< observer_ptr<Node> >   ObserverNodePath;
-
-        void setTrackNodePath(const osg::NodePath& nodePath)
-        {
-           _trackNodePath.clear();
-           _trackNodePath.reserve(nodePath.size());
-           std::copy(nodePath.begin(), nodePath.end(), std::back_inserter(_trackNodePath));
-        }
+        void setTrackNodePath(const osg::NodePath& nodePath) { _trackNodePath.setNodePath(nodePath); }
 
         void setTrackNodePath(const ObserverNodePath& nodePath) { _trackNodePath = nodePath; }
+
         ObserverNodePath& getTrackNodePath() { return _trackNodePath; }
 
         void setTrackNode(osg::Node* node);
-        osg::Node* getTrackNode() { return _trackNodePath.empty() ? 0 : _trackNodePath.back().get(); }
-        const osg::Node* getTrackNode() const { return _trackNodePath.empty() ? 0 : _trackNodePath.back().get(); }
+        osg::Node* getTrackNode();
+        const osg::Node* getTrackNode() const;
 
         /** Implements the callback. */
@@ -50 +43 @@
         /** Update the node to track the nodepath.*/
         void update(osg::Node& node);
-
-
-        bool validateNodePath() const;
 
     protected: