Changeset 3205

Timestamp:

07/30/04 17:44:59 (9 years ago)

Author:

robert

Message:

Added beginnings of new TrackballManipulator?

Location:

OpenSceneGraph/trunk

Files:

• VisualStudio/osgGA/osgGA.dsp (modified) (2 diffs)
• examples/osglightpoint/osglightpoint.cpp (modified) (2 diffs)
• examples/osgsimulation/osgsimulation.cpp (modified) (6 diffs)
• include/osg/NodeVisitor (modified) (2 diffs)
• include/osgGA/TrackerManipulator (added)
• include/osgProducer/Viewer (modified) (1 diff)
• src/osgGA/GNUmakefile (modified) (1 diff)
• src/osgGA/TrackerManipulator.cpp (added)

OpenSceneGraph/trunk/VisualStudio/osgGA/osgGA.dsp

@@ -140 +140 @@
 # Begin Source File
 
+SOURCE=..\..\src\osgGA\TrackerManipulator.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\osgGA\Version.cpp
 # End Source File
@@ -201 +205 @@
 
 SOURCE=..\..\Include\osgGA\TrackballManipulator
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Include\osgGA\TrackerManipulator
 # End Source File
 # Begin Source File

OpenSceneGraph/trunk/examples/osglightpoint/osglightpoint.cpp

@@ -2 +2 @@
 #include <osgProducer/Viewer>
 
-#include <osg/Transform>
+#include <osg/MatrixTransform>
 #include <osg/Billboard>
 #include <osg/Geode>
@@ -60 +60 @@
     end._color.set(1.0f,1.0f,1.0f,1.0f);
     
-    osg::Transform* transform = new osg::Transform;
+    osg::MatrixTransform* transform = new osg::MatrixTransform;
+    
+    transform->setDataVariance(osg::Object::STATIC);
+    transform->setMatrix(osg::Matrix::scale(0.1,0.1,0.1));
 
     osg::Vec3 start_delta(0.0f,10.0f,0.0f);

OpenSceneGraph/trunk/examples/osgsimulation/osgsimulation.cpp

@@ -19 +19 @@
 #include <osgParticle/ParticleSystemUpdater>
 
+#include <osgGA/TrackerManipulator>
+
 // for the grid data..
 #include "../osghangglide/terrain_coords.h"
@@ -60 +62 @@
     if (glider)
     {
+        glider->setName("glider");
+
         const osg::BoundingSphere& bs = glider->getBound();
 
@@ -82 +86 @@
     if (cessna)
     {
+        cessna->setName("cessna");
+    
         const osg::BoundingSphere& bs = cessna->getBound();
 
@@ -246 +252 @@
 }
 
+class FindNamedNodeVisitor : public osg::NodeVisitor
+{
+public:
+    FindNamedNodeVisitor(const std::string& name):
+        osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN),
+        _name(name) {}
+    
+    virtual void apply(osg::Node& node)
+    {
+        if (node.getName()==_name)
+        {
+            _foundNodes.push_back(&node);
+        }
+        traverse(node);
+    }
+    
+    typedef std::vector< osg::ref_ptr<osg::Node> > NodeList;
+
+    std::string _name;
+    NodeList _foundNodes;
+};
+
+
 
 //////////////////////////////////////////////////////////////////////////////
@@ -268 +297 @@
     // set up the value with sensible default event handlers.
     viewer.setUpViewer(osgProducer::Viewer::STANDARD_SETTINGS);
+
+
 
     // get details on keyboard and mouse bindings used by the viewer.
@@ -295 +326 @@
     viewer.setSceneData(root);
         
+        
+    FindNamedNodeVisitor fnnv("cessna");
+    root->accept(fnnv);
+    
+    if (!fnnv._foundNodes.empty())
+    {
+        osgGA::TrackerManipulator* tm = new osgGA::TrackerManipulator;
+        tm->setTrackNode(fnnv._foundNodes[0].get());
+        
+        std::cout<<"Found "<<std::endl;
+        
+        unsigned int num = viewer.addCameraManipulator(tm);
+        viewer.selectCameraManipulator(num);
+    }
+
+
+
     // create the windows and run the threads.
     viewer.realize();

OpenSceneGraph/trunk/include/osg/NodeVisitor

@@ -185 +185 @@
           * Note, the user does not typically call pushNodeOnPath() as it
           * will be called automatically by the Node::accept() method.*/
-        inline void pushOntoNodePath(Node* node) { _nodePath.push_back(node); }
+        inline void pushOntoNodePath(Node* node) { if (_traversalMode!=TRAVERSE_PARENTS) _nodePath.push_back(node); else _nodePath.insert(_nodePath.begin(),node); }
         
         /** Method callby osg::Node::accept() method after
@@ -191 +191 @@
           * Note, the user does not typically call pushNodeOnPath() as it
           * will be called automatically by the Node::accept() method.*/
-        inline void popFromNodePath()            { _nodePath.pop_back(); }
+        inline void popFromNodePath()            { if (_traversalMode!=TRAVERSE_PARENTS) _nodePath.pop_back(); else _nodePath.erase(_nodePath.begin()); }
         
         /** Get the non const NodePath from the top most node applied down

OpenSceneGraph/trunk/include/osgProducer/Viewer

@@ -55 +55 @@
             FLIGHT_MANIPULATOR      = 4,
             TERRAIN_MANIPULATOR     = 8,
-            STATE_MANIPULATOR       = 16,
-            HEAD_LIGHT_SOURCE       = 32,
-            SKY_LIGHT_SOURCE        = 64,
-            STATS_MANIPULATOR       = 128,
-            VIEWER_MANIPULATOR      = 256,
-            ESCAPE_SETS_DONE        = 512,
+            STATE_MANIPULATOR       = 32,
+            HEAD_LIGHT_SOURCE       = 64,
+            SKY_LIGHT_SOURCE        = 128,
+            STATS_MANIPULATOR       = 256,
+            VIEWER_MANIPULATOR      = 512,
+            ESCAPE_SETS_DONE        = 1024,
             STANDARD_SETTINGS = TRACKBALL_MANIPULATOR|
                                 DRIVE_MANIPULATOR |

OpenSceneGraph/trunk/src/osgGA/GNUmakefile

@@ -14 +14 @@
         StateSetManipulator.cpp\
         TerrainManipulator.cpp\
+        TrackerManipulator.cpp\
         TrackballManipulator.cpp\
         Version.cpp\