Changeset 230

Timestamp:

Feb 13, 2011, 3:19:38 PM (14 years ago)

Author:

Torben Dannhauer

Message:

Clean up the spacemouse Node tracker a little bit.

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) (2 diffs)

osgVisual/trunk/bin/osgVisualConfig.xml

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

osgVisual/trunk/include/manip_Spacemouse/manip_nodeTrackerSpaceMouse.h

@@ -200 +200 @@
         void addMouseEvent(const GUIEventAdapter& ea);
 
+                /** Computes the world to local matrix */ 
+                void computeNodeWorldToLocal(osg::Matrixd& worldToLocal) const;
+
+                /** Computes the local to world matrix */ 
+        void computeNodeLocalToWorld(osg::Matrixd& localToWorld) const;
+
         void computeNodeCenterAndRotation(osg::Vec3d& center, osg::Quat& rotation) const;
 

osgVisual/trunk/src/manip_Spacemouse/manip_nodeTrackerSpaceMouse.cpp

@@ -316 +316 @@
 }
 
+void NodeTrackerSpaceMouse::computeNodeWorldToLocal(osg::Matrixd& worldToLocal) const
+{
+    osg::NodePath nodePath;
+    if (_trackNodePath.getNodePath(nodePath))
+    {
+        worldToLocal = osg::computeWorldToLocal(nodePath);
+    }
+}
+
+void NodeTrackerSpaceMouse::computeNodeLocalToWorld(osg::Matrixd& localToWorld) const
+{
+    osg::NodePath nodePath;
+    if (_trackNodePath.getNodePath(nodePath))
+    {
+        localToWorld = osg::computeLocalToWorld(nodePath);
+    }
+
+}
+
 void NodeTrackerSpaceMouse::computeNodeCenterAndRotation(osg::Vec3d& nodeCenter, osg::Quat& nodeRotation) const
 {
@@ -321 +340 @@
                 return;
 
-    osg::Matrixd localToWorld, worldToLocal;
+    osg::Matrixd localToWorld;
+        computeNodeLocalToWorld(localToWorld);
+
     osg::NodePath 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;