Changeset 231 for osgVisual/trunk/include

Timestamp:

Feb 13, 2011, 6:08:42 PM (14 years ago)

Author:

Torben Dannhauer

Message:

Reloaced eventhandler and manipulator in a dedicated manipulator and tracking class (preparation for automatic tracking by extLink)

Location:

osgVisual/trunk/include/core

Files:

• core_manipulator.h (added)
• visual_core.h (modified) (6 diffs)

osgVisual/trunk/include/core/visual_core.h

@@ -24 +24 @@
 #include <osg/Referenced>
 #include <osg/Notify>
-
 #include <osgViewer/Viewer>
-
 #include <osgDB/ReadFile>
 
-// OSG eventhandler
-#include <osgViewer/ViewerEventHandlers>
+// Manipulator and eventhandler
+#include <core_manipulator.h>
 
-// OSG manipulator
-#include <osgGA/TrackballManipulator>
-#include <osgGA/FlightManipulator>
-#include <osgGA/DriveManipulator>
-#include <osgGA/KeySwitchMatrixManipulator>
-#include <osgGA/StateSetManipulator>
-#include <osgGA/AnimationPathManipulator>
-#include <osgGA/TerrainManipulator>
-#include <osgGA/NodeTrackerManipulator>
-
-// Spacenavigator manipulator
-#ifdef USE_SPACENAVIGATOR
-#include <manip_spaceMouse.h>
-#include <manip_nodeTrackerSpaceMouse.h>
-#include <manip_freeSpaceMouse.h>
-#endif
-
-// Object mounted manipulator
-#include <manip_objectMounted.h>
 
 #ifdef USE_DISTORTION
@@ -85 +64 @@
 #endif
 
+
+
 // Test
 #include <dataIO_transportContainer.h>
@@ -105 +86 @@
         void shutdown();
 
-        void addManipulators();
         void parseScenery(xmlNode * a_node);
         bool loadTerrain(osg::ArgumentParser& arguments_);
@@ -111 +91 @@
 
         void setupScenery();
-        void trackNode( osg::Node* node_ );
-        void trackNode( int trackingID );
-        int getCurrentTrackingID(){return currentTrackingID;};
 
 protected:
+        /**
+         * \brief Destrcutor
+         * 
+         */ 
         virtual ~visual_core(void);
 
-
 private:
+        /**
+         * \brief This function starts the main rendering loop
+         * 
+         */ 
         void mainLoop();
 
@@ -143 +127 @@
 
 
-#ifdef USE_SPACENAVIGATOR
-        /**
-         * Spacemouse node tracker manipulator
-         */ 
-        osg::ref_ptr<NodeTrackerSpaceMouse> mouseTrackerManip;
-
-        /**
-         * Space mouse hardware driver instance
-         */ 
-        SpaceMouse* mouse;
-#endif
-
-        /**
-         * This Matrix manipulator is used for controlling Camera by Nodes.
-         */ 
-        osg::ref_ptr<objectMountedManipulator> objectMountedCameraManip;
-
 
 #ifdef USE_SKY_SILVERLINING
@@ -181 +148 @@
         osg::ref_ptr<visual_object> testObj;
 
-        osg::ref_ptr<osgGA::NodeTrackerManipulator> nt;
-
         osg::ref_ptr<visual_debug_hud> hud;
 
-        int currentTrackingID;
+        osg::ref_ptr<core_manipulator> manipulators;
 };