Changeset 55 for osgVisual/include


Ignore:
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/include
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • osgVisual/include/core/visual_core.h

    r32 r55  
    130130         */
    131131        osg::ref_ptr<NodeTrackerSpaceMouse> mouseTrackerManip;
     132
     133        /**
     134         * Space mouse hardware driver instance
     135         */
     136        SpaceMouse* mouse;
    132137#endif
    133138
    … …  
    137142        osg::ref_ptr<objectMountedManipulator> objectMountedCameraManip;
    138143
    139         /**
    140          * Space mouse hardware driver instance
    141          */
    142         SpaceMouse* mouse;
    143144
    144145#ifdef USE_SKY_SILVERLINING

  • osgVisual/include/extLink/manip_extLink.h

    r32 r55  
    2929 * @date  Aug 2009
    3030 */
    31 class extLinkManipulator : public osgGA::MatrixManipulator
     31class extLinkManipulator : public osgGA::CameraManipulator
    3232{
    3333    public:

  • osgVisual/include/manip_ObjectMounted/manip_objectMounted.h

    r32 r55  
    1616*/
    1717
    18 #include <osgGA/MatrixManipulator>
     18#include <osgGA/CameraManipulator>
    1919
    2020#include <osg/Quat>
    … …  
    3333 * @date  Aug 2009
    3434 */
    35 class objectMountedManipulator : public osgGA::MatrixManipulator
     35class objectMountedManipulator : public osgGA::CameraManipulator
    3636{
    3737    public:

  • osgVisual/include/manip_Spacemouse/manip_freeSpaceMouse.h

    r32 r55  
    2020
    2121// OSG includes
    22 #include <osgGA/MatrixManipulator>
     22#include <osgGA/CameraManipulator>
    2323#include <osgGA/GUIEventAdapter>
    2424#include <osgGA/GUIActionAdapter>
    … …  
    3939 * @date  Aug 2009
    4040 */
    41 class FreeManipulator : public osgGA::MatrixManipulator
     41class FreeManipulator : public osgGA::CameraManipulator
    4242{
    4343    public:

  • osgVisual/include/manip_Spacemouse/manip_nodeTrackerSpaceMouse.h

    r32 r55  
    1515*/
    1616
    17 #include <osgGA/MatrixManipulator>
     17#include <osgGA/OrbitManipulator>
    1818
    1919#include <osg/ObserverNodePath>
    … …  
    4949 * @date  Apr 2010
    5050 */
    51 class NodeTrackerSpaceMouse : public osgGA::MatrixManipulator
     51class NodeTrackerSpaceMouse : public osgGA::OrbitManipulator
    5252{
    5353    public:

  • osgVisual/include/object/visual_object.h

    r32 r55  
    2727#include <osgText/Text>
    2828
    29 #include <osgGA/MatrixManipulator>
     29#include <osgGA/CameraManipulator>
    3030
    3131#include <object_updater.h>
Note: See TracChangeset for help on using the changeset viewer.