Changeset 229 for osgVisual

Timestamp:

Feb 13, 2011, 2:00:53 PM (14 years ago)

Author:

Torben Dannhauer

Message:

Fixed NodeTrackerManipulators?: Now the don't crash even if they are activated without a valid node to track.

Location:

osgVisual/trunk

Files:

• bin/osgVisualConfig.xml (modified) (1 diff)
• include/manip_Spacemouse/manip_nodeTrackerSpaceMouse.h (modified) (1 diff)
• src/manip_Spacemouse/manip_nodeTrackerSpaceMouse.cpp (modified) (1 diff)

osgVisual/trunk/bin/osgVisualConfig.xml

@@ -71 +71 @@
         </geometry>
       </model>
-      <trackmodel id="2" updater_slot=""></trackmodel> 
+      <trackmodel id="1" updater_slot=""></trackmodel> 
     </models>
     <datetime day="0" month="0" year="0" hour="12" minute="30"></datetime>

osgVisual/trunk/include/manip_Spacemouse/manip_nodeTrackerSpaceMouse.h

@@ -271 +271 @@
 
                 /** 
-                 * Pointer to Space Navigator interfacce class.
+                 * Pointer to Space Navigator interface class.
                  */ 
                 SpaceMouse* _spaceMouse;

osgVisual/trunk/src/manip_Spacemouse/manip_nodeTrackerSpaceMouse.cpp

@@ -324 +324 @@
     osg::NodePath nodePath;
         
-    if (  _trackNodePath.getNodePath(nodePath))
-    {
-        worldToLocal = osg::computeWorldToLocal(nodePath);
-        localToWorld = osg::computeLocalToWorld(nodePath);
+        if (_trackNodePath.getNodePath(nodePath) && !nodePath.empty())
+        {
+                worldToLocal = osg::computeWorldToLocal(nodePath);
+                localToWorld = osg::computeLocalToWorld(nodePath);
         nodeCenter = osg::Vec3d(nodePath.back()->getBound().center())*localToWorld;
-    }
+        }
     else
-    {
         nodeCenter = osg::Vec3d(0.0f,0.0f,0.0f)*localToWorld;
-    }