Changeset 55

Timestamp:

May 29, 2010, 11:52:47 PM (14 years ago)

Author:

Torben Dannhauer

Message:

Updated to new osg version with new manipulator schema.
Updated integration of 3dx SpaceNavigator? to allow disabling without compile errors.

Location:

osgVisual

Files:

• include/core/visual_core.h (modified) (2 diffs)
• include/extLink/manip_extLink.h (modified) (1 diff)
• include/manip_ObjectMounted/manip_objectMounted.h (modified) (2 diffs)
• include/manip_Spacemouse/manip_freeSpaceMouse.h (modified) (2 diffs)
• include/manip_Spacemouse/manip_nodeTrackerSpaceMouse.h (modified) (2 diffs)
• include/object/visual_object.h (modified) (1 diff)
• src/core/visual_core.cpp (modified) (1 diff)
• src/extLink/dataIO_extLinkDummy.cpp (modified) (1 diff)
• src/manip_Spacemouse/manip_spaceMouse.cpp (modified) (1 diff)
• src/sky_Silverlining/skySilverLining_skyDrawable.cpp (modified) (1 diff)

osgVisual/include/core/visual_core.h

@@ -130 +130 @@
          */ 
         osg::ref_ptr<NodeTrackerSpaceMouse> mouseTrackerManip;
+
+        /**
+         * Space mouse hardware driver instance
+         */ 
+        SpaceMouse* mouse;
 #endif
 
@@ -137 +142 @@
         osg::ref_ptr<objectMountedManipulator> objectMountedCameraManip;
 
-        /**
-         * Space mouse hardware driver instance
-         */ 
-        SpaceMouse* mouse;
 
 #ifdef USE_SKY_SILVERLINING

osgVisual/include/extLink/manip_extLink.h

@@ -29 +29 @@
  * @date  Aug 2009
  */ 
-class extLinkManipulator : public osgGA::MatrixManipulator
+class extLinkManipulator : public osgGA::CameraManipulator
 {
     public:

osgVisual/include/manip_ObjectMounted/manip_objectMounted.h

@@ -16 +16 @@
 */
 
-#include <osgGA/MatrixManipulator>
+#include <osgGA/CameraManipulator>
 
 #include <osg/Quat>
@@ -33 +33 @@
  * @date  Aug 2009
  */ 
-class objectMountedManipulator : public osgGA::MatrixManipulator
+class objectMountedManipulator : public osgGA::CameraManipulator
 {
     public:

osgVisual/include/manip_Spacemouse/manip_freeSpaceMouse.h

@@ -20 +20 @@
 
 // OSG includes
-#include <osgGA/MatrixManipulator>
+#include <osgGA/CameraManipulator>
 #include <osgGA/GUIEventAdapter>
 #include <osgGA/GUIActionAdapter>
@@ -39 +39 @@
  * @date  Aug 2009
  */ 
-class FreeManipulator : public osgGA::MatrixManipulator
+class FreeManipulator : public osgGA::CameraManipulator
 {
     public:

osgVisual/include/manip_Spacemouse/manip_nodeTrackerSpaceMouse.h

@@ -15 +15 @@
 */
 
-#include <osgGA/MatrixManipulator>
+#include <osgGA/OrbitManipulator>
 
 #include <osg/ObserverNodePath>
@@ -49 +49 @@
  * @date  Apr 2010
  */ 
-class NodeTrackerSpaceMouse : public osgGA::MatrixManipulator
+class NodeTrackerSpaceMouse : public osgGA::OrbitManipulator
 {
     public:

osgVisual/include/object/visual_object.h

@@ -27 +27 @@
 #include <osgText/Text>
 
-#include <osgGA/MatrixManipulator>
+#include <osgGA/CameraManipulator>
 
 #include <object_updater.h>

osgVisual/src/core/visual_core.cpp

@@ -36 +36 @@
         //double* test = new double[1000];
 
-        mouse = NULL;
+        #ifdef USE_SPACENAVIGATOR
+                mouse = NULL;
+        #endif
+
+        //osg::DisplaySettings::instance()->setNumOfDatabaseThreadsHint( 8 );
 }
 

osgVisual/src/extLink/dataIO_extLinkDummy.cpp

@@ -16 +16 @@
 
 #include "dataIO_extLinkDummy.h"
-
-#include "memoryLeakDetection.h"
 
 dataIO_extLinkDummy::dataIO_extLinkDummy(std::vector<dataIOSlot>& dataSlots_) : dataIO_extLink(dataSlots_)

osgVisual/src/manip_Spacemouse/manip_spaceMouse.cpp

@@ -37 +37 @@
 using namespace osgVisual;
 
-
 #import "progid:TDxInput.Device" no_namespace
 

osgVisual/src/sky_Silverlining/skySilverLining_skyDrawable.cpp

@@ -87 +87 @@
 void skySilverLining_skyDrawable::setSceneFog(SilverLining::Atmosphere *atmosphere) const
 {    
-        //glEnable(GL_FOG);
- //   glFogi(GL_FOG_MODE, GL_EXP);
-
-        ////float hazeR, hazeG, hazeB;
-        ////double hazeDepth, hazeDensity;
-        ////atmosphere->GetHaze(hazeR, hazeG, hazeB, hazeDepth, hazeDensity);
-
- //   //hazeDensity = 1.0 / 40000;
-        ////hazeDensity = 0;
-        //float hazeDensity = 1.0 / atmosphere->GetConditions()->GetVisibility();
-
- //   // Decrease fog density with altitude, to avoid fog effects through the vacuum of space.
- //   static const double H = 8435.0; // Pressure scale height of Earth's atmosphere
- //   double isothermalEffect = exp(-(atmosphere->GetConditions()->GetLocation().GetAltitude() / H));     
- //   if (isothermalEffect <= 0) isothermalEffect = 1E-9;
- //   if (isothermalEffect > 1.0) isothermalEffect = 1.0;
- //   hazeDensity *= isothermalEffect;
-
- //   bool silverLiningHandledTheFog = false;
-
- //   if (atmosphere->GetFogEnabled())
- //   {
- //           float density, r, g, b;
- //           // Note, the fog color returned is already lit
- //           atmosphere->GetFogSettings(&density, &r, &g, &b);
-
- //           if (density > hazeDensity)
- //           {
- //                   glFogf(GL_FOG_DENSITY, density);
-
- //                   GLfloat fogColor[4] = {r, g, b, 1.0};
- //                   glFogfv(GL_FOG_COLOR, fogColor);
-
- //                   silverLiningHandledTheFog = true;
- //           }
- //   }
- //   
- //   if (!silverLiningHandledTheFog)
- //   {
- //           GLfloat fogColor[4];
- //           //atmosphere->GetHorizonColor(yaw, &fogColor[0], &fogColor[1], &fogColor[2]);     // New version of this call: SL_1.94 /** \todo transmit the yaw value of the center channel to all slaves for consistent fog color. */
-        //              atmosphere->GetHorizonColor( 0, &fogColor[0], &fogColor[1], &fogColor[2]);
- //           glFogfv(GL_FOG_COLOR, fogColor);
-
- //           glFogf(GL_FOG_DENSITY, hazeDensity);
- //   }
-
-
-
-
-
-        
         osg::ref_ptr<osg::Fog> fog = new osg::Fog;
     fog->setMode(osg::Fog::EXP);