Changeset 73 for osgVisual/include

Timestamp:

Jul 24, 2010, 10:48:02 AM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual/include

Files:

• dataIO/dataIO_transportContainer.h (modified) (4 diffs)
• dataIO/visual_dataIO.h (modified) (1 diff)
• extLink/manip_extLink.h (modified) (1 diff)

osgVisual/include/dataIO/dataIO_transportContainer.h

@@ -18 +18 @@
 #include <osg/Object>
 #include <osg/Matrixd>
+#include <osg/Vec3d>
 
 #include <dataIO_executer.h>
@@ -34 +35 @@
                         frameID(tC_.frameID),
                         viewMatrix(tC_.viewMatrix),
-                        projectionMatrix(tC_.projectionMatrix),
+                        eye(tC_.eye),
+                        center(tC_.center),
+                        up(tC_.up),
                         executer(tC_.executer),
                         ioSlots(tC_.ioSlots){}
@@ -49 +52 @@
         int frameID;
         osg::Matrixd viewMatrix;
-        osg::Matrixd projectionMatrix;
+        osg::Vec3d eye, center, up;
         executerList executer;
         slotList ioSlots;
@@ -58 +61 @@
         void setFrameID(int frameID_ ){frameID=frameID_;}
 
-        void setViewMatrix(const osg::Matrixd& viewMatrix_){viewMatrix=viewMatrix_;}
+        void setViewMatrix(const osg::Matrixd& viewMatrix_){viewMatrix = viewMatrix_;}
         const osg::Matrixd& getViewMatrix() const {return viewMatrix;}
 
-        void setProjectionMatrix(const osg::Matrixd& projectionMatrix_){projectionMatrix=projectionMatrix_;}
-        const osg::Matrixd& getProjectionMatrix() const {return projectionMatrix;}
+        void setEye(const osg::Vec3d& eye_) { eye = eye_; }
+    const osg::Vec3d& getEye() const { return eye; }
+
+        void setCenter(const osg::Vec3d& center_) { center = center_; }
+    const osg::Vec3d& getCenter() const { return center; }
+
+        void setUp(const osg::Vec3d& up_) { up = up_; }
+    const osg::Vec3d& getUp() const { return up; }
 
         void setExecuter(const executerList& executer_) {executer=executer_;}

osgVisual/include/dataIO/visual_dataIO.h

@@ -152 +152 @@
         bool isStandalone(){if (clusterMode==osgVisual::dataIO_cluster::STANDALONE) return true; else return false;};
 
-
 // SLOT Access functions
         void* getSlotPointer(std::string slotName_, osgVisual::dataIO_slot::dataDirection direction_, osgVisual::dataIO_slot::varType variableTyp_ );

osgVisual/include/extLink/manip_extLink.h

@@ -24 +24 @@
 
 /**
- * \brief This class is a free spacemouse manipulator. It uses the 3DConnexion SpaceNavigator, which interface is implemented in manip_spaceMouse.h
+ * \brief This class is a camera manipulator based slots without objects.
  * 
  * @author Torben Dannhauer