Changeset 228

Timestamp:

Feb 10, 2011, 2:18:04 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual/trunk

Files:

• include/core/visual_core.h (modified) (2 diffs)
• src/core/visual_core.cpp (modified) (4 diffs)
• src/manip_Spacemouse/manip_nodeTrackerSpaceMouse.cpp (modified) (2 diffs)

osgVisual/trunk/include/core/visual_core.h

@@ -113 +113 @@
         void trackNode( osg::Node* node_ );
         void trackNode( int trackingID );
+        int getCurrentTrackingID(){return currentTrackingID;};
 
 protected:
@@ -183 +184 @@
 
         osg::ref_ptr<visual_debug_hud> hud;
+
+        int currentTrackingID;
 };
 

osgVisual/trunk/src/core/visual_core.cpp

@@ -23 +23 @@
 {
         OSG_NOTIFY( osg::ALWAYS ) << "visual_core instantiated." << std::endl;
+
+        currentTrackingID = -1;
 }
 
@@ -203 +205 @@
         keyswitchManipulator->addMatrixManipulator( '3', "Terrain", new osgGA::TerrainManipulator() );
                 nt = new osgGA::NodeTrackerManipulator();
+                nt->setTrackNode(NULL);
                 keyswitchManipulator->addMatrixManipulator( '4', "NodeTrackerManipulator", nt );
                 
@@ -294 +297 @@
                                                 std::string attr_name=reinterpret_cast<const char*>(attr->name);
                                                 std::string attr_value=reinterpret_cast<const char*>(attr->children->content);
-                                                if( attr_name == "id" ) 
-                                                        trackNode( util::strToInt(attr_value) );
+                                                if( attr_name == "id" ) trackNode( util::strToInt(attr_value) );
+
+
                                                 attr = attr->next; 
                                         }
@@ -553 +557 @@
         osg::ref_ptr<osg::Node> tmp = visual_object::findNodeByTrackingID(trackingID, rootNode);
         if(tmp.valid())
+        {
+                currentTrackingID = trackingID;
                 trackNode(tmp);
-}
+        }
+}

osgVisual/trunk/src/manip_Spacemouse/manip_nodeTrackerSpaceMouse.cpp

@@ -39 +39 @@
         RY=0;
         RZ=0;
-
 }
 
@@ -319 +318 @@
 void NodeTrackerSpaceMouse::computeNodeCenterAndRotation(osg::Vec3d& nodeCenter, osg::Quat& nodeRotation) const
 {
+        if (_trackNodePath.empty())
+                return;
+
     osg::Matrixd localToWorld, worldToLocal;
     osg::NodePath nodePath;
-    if (_trackNodePath.getNodePath(nodePath))
+        
+    if (  _trackNodePath.getNodePath(nodePath))
     {
         worldToLocal = osg::computeWorldToLocal(nodePath);