From d746f116505f5fe806c91e3463eda4118afe33c9 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 27 May 2010 15:54:37 +0000 Subject: [PATCH] Renamed osgGA::MatrixManipualtor to osgGA::CameraManipulator so its name better reflects it's function --- examples/osghangglide/GliderManipulator.h | 6 +- examples/osgimpostor/TestManipulator.h | 4 +- include/osgGA/AnimationPathManipulator | 4 +- .../{MatrixManipulator => CameraManipulator} | 16 ++--- include/osgGA/CameraViewSwitchManipulator | 4 +- include/osgGA/DriveManipulator | 4 +- include/osgGA/KeySwitchMatrixManipulator | 26 ++++---- include/osgGA/SphericalManipulator | 4 +- include/osgGA/StandardManipulator | 6 +- include/osgGA/UFOManipulator | 4 +- include/osgViewer/View | 10 +-- include/osgViewer/ViewerBase | 1 - include/osgViewer/ViewerEventHandlers | 2 +- src/osgGA/CMakeLists.txt | 4 +- ...xManipulator.cpp => CameraManipulator.cpp} | 14 ++--- src/osgGA/KeySwitchMatrixManipulator.cpp | 16 ++--- src/osgGA/StandardManipulator.cpp | 4 +- src/osgViewer/View.cpp | 4 +- src/osgViewer/ViewerEventHandlers.cpp | 2 +- src/osgWidget/ViewerEventHandlers.cpp | 2 +- .../osgGA/AnimationPathManipulator.cpp | 2 +- ...xManipulator.cpp => CameraManipulator.cpp} | 24 +++---- .../osgGA/CameraViewSwitchManipulator.cpp | 2 +- .../introspection/osgGA/DriveManipulator.cpp | 2 +- .../introspection/osgGA/FlightManipulator.cpp | 6 +- .../osgGA/KeySwitchMatrixManipulator.cpp | 62 +++++++++---------- .../osgGA/NodeTrackerManipulator.cpp | 6 +- .../osgGA/SphericalManipulator.cpp | 2 +- .../osgGA/TerrainManipulator.cpp | 4 +- .../introspection/osgGA/UFOManipulator.cpp | 2 +- .../introspection/osgTerrain/Terrain.cpp | 12 ++-- .../introspection/osgViewer/View.cpp | 18 +++--- 32 files changed, 139 insertions(+), 140 deletions(-) rename include/osgGA/{MatrixManipulator => CameraManipulator} (95%) rename src/osgGA/{MatrixManipulator.cpp => CameraManipulator.cpp} (90%) rename src/osgWrappers/introspection/osgGA/{MatrixManipulator.cpp => CameraManipulator.cpp} (93%) diff --git a/examples/osghangglide/GliderManipulator.h b/examples/osghangglide/GliderManipulator.h index f435c9544..6de48d72a 100644 --- a/examples/osghangglide/GliderManipulator.h +++ b/examples/osghangglide/GliderManipulator.h @@ -21,17 +21,17 @@ #ifndef OSGGA_GliderMANIPULATOR #define OSGGA_GliderMANIPULATOR 1 -#include +#include #include /** -GliderManipulator is a MatrixManipulator which provides Glider simulator-like +GliderManipulator is a CameraManipulator which provides Glider simulator-like updating of the camera position & orientation. By default, the left mouse button accelerates, the right mouse button decelerates, and the middle mouse button (or left and right simultaneously) stops dead. */ -class GliderManipulator : public osgGA::MatrixManipulator +class GliderManipulator : public osgGA::CameraManipulator { public: diff --git a/examples/osgimpostor/TestManipulator.h b/examples/osgimpostor/TestManipulator.h index b7bb76d77..f4bfd8208 100644 --- a/examples/osgimpostor/TestManipulator.h +++ b/examples/osgimpostor/TestManipulator.h @@ -21,10 +21,10 @@ #ifndef OSGGA_TESTMANIPULATOR #define OSGGA_TESTMANIPULATOR 1 -#include +#include #include -class TestManipulator : public osgGA::MatrixManipulator +class TestManipulator : public osgGA::CameraManipulator { public: diff --git a/include/osgGA/AnimationPathManipulator b/include/osgGA/AnimationPathManipulator index f72f2970d..303b89bf2 100644 --- a/include/osgGA/AnimationPathManipulator +++ b/include/osgGA/AnimationPathManipulator @@ -16,7 +16,7 @@ #include #include -#include +#include namespace osgGA{ @@ -31,7 +31,7 @@ namespace osgGA{ // px py pz = World position in cartesian coordinates // ax ay az aw = Orientation (attitude) defined as a quaternion -class OSGGA_EXPORT AnimationPathManipulator : public MatrixManipulator +class OSGGA_EXPORT AnimationPathManipulator : public CameraManipulator { public: diff --git a/include/osgGA/MatrixManipulator b/include/osgGA/CameraManipulator similarity index 95% rename from include/osgGA/MatrixManipulator rename to include/osgGA/CameraManipulator index d2808823d..866210d71 100644 --- a/include/osgGA/MatrixManipulator +++ b/include/osgGA/CameraManipulator @@ -11,8 +11,8 @@ * OpenSceneGraph Public License for more details. */ -#ifndef OSGGA_MatrixManipulator -#define OSGGA_MatrixManipulator 1 +#ifndef OSGGA_CameraManipulator +#define OSGGA_CameraManipulator 1 #include #include @@ -31,12 +31,12 @@ namespace osgGA{ /** -MatrixManipulator is an abstract base class defining the interface, and a certain +CameraManipulator is an abstract base class defining the interface, and a certain amount of default functionality, for classes which wish to control OSG cameras in response to GUI events. */ -class OSGGA_EXPORT MatrixManipulator : public GUIEventHandler +class OSGGA_EXPORT CameraManipulator : public GUIEventHandler { typedef GUIEventHandler inherited; @@ -44,7 +44,7 @@ class OSGGA_EXPORT MatrixManipulator : public GUIEventHandler // We are not using META_Object as this is abstract class. // Use META_Object(osgGA,YourManipulator); in your descendant non-abstract classes. - virtual const char* className() const { return "MatrixManipulator"; } + virtual const char* className() const { return "CameraManipulator"; } /** callback class to use to allow matrix manipulators to query the application for the local coordinate frame.*/ class CoordinateFrameCallback : public osg::Referenced @@ -164,10 +164,10 @@ class OSGGA_EXPORT MatrixManipulator : public GUIEventHandler protected: - MatrixManipulator(); - MatrixManipulator(const MatrixManipulator& mm, const osg::CopyOp& copyOp = osg::CopyOp::SHALLOW_COPY); + CameraManipulator(); + CameraManipulator(const CameraManipulator& mm, const osg::CopyOp& copyOp = osg::CopyOp::SHALLOW_COPY); - virtual ~MatrixManipulator(); + virtual ~CameraManipulator(); std::string getManipulatorName() const; diff --git a/include/osgGA/CameraViewSwitchManipulator b/include/osgGA/CameraViewSwitchManipulator index 61d2b8860..52f97cc75 100644 --- a/include/osgGA/CameraViewSwitchManipulator +++ b/include/osgGA/CameraViewSwitchManipulator @@ -14,13 +14,13 @@ #ifndef OSGGA_VIEWLISTMANIPULATOR #define OSGGA_VIEWLISTMANIPULATOR 1 -#include +#include #include #include namespace osgGA{ -class OSGGA_EXPORT CameraViewSwitchManipulator : public MatrixManipulator +class OSGGA_EXPORT CameraViewSwitchManipulator : public CameraManipulator { public: CameraViewSwitchManipulator() {} diff --git a/include/osgGA/DriveManipulator b/include/osgGA/DriveManipulator index 2e24681a3..abbb438c1 100644 --- a/include/osgGA/DriveManipulator +++ b/include/osgGA/DriveManipulator @@ -14,7 +14,7 @@ #ifndef OSGGA_DRIVEMANIPULATOR #define OSGGA_DRIVEMANIPULATOR 1 -#include +#include #include namespace osgGA{ @@ -26,7 +26,7 @@ mouse button decelerates, and the middle mouse button (or left and right simultaneously) stops dead. */ -class OSGGA_EXPORT DriveManipulator : public MatrixManipulator +class OSGGA_EXPORT DriveManipulator : public CameraManipulator { public: diff --git a/include/osgGA/KeySwitchMatrixManipulator b/include/osgGA/KeySwitchMatrixManipulator index cf43b6dd1..d318008c1 100644 --- a/include/osgGA/KeySwitchMatrixManipulator +++ b/include/osgGA/KeySwitchMatrixManipulator @@ -15,7 +15,7 @@ #define OSGUTIL_KEYSWITCMATRIXMANIPULATOR 1 #include -#include +#include #include namespace osgGA{ @@ -28,11 +28,11 @@ being used to be switched by pressing a key. E.g. '1' for a TrackballManipultor, '2' for a DriveManipulator, '3' for a FlightManipulator. The manipulators available, and the associated switch keys, can be configured. */ -class OSGGA_EXPORT KeySwitchMatrixManipulator : public MatrixManipulator +class OSGGA_EXPORT KeySwitchMatrixManipulator : public CameraManipulator { public: - typedef std::pair > NamedManipulator; + typedef std::pair > NamedManipulator; typedef std::map KeyManipMap; virtual const char* className() const { return "KeySwitchMatrixManipulator"; } @@ -41,12 +41,12 @@ class OSGGA_EXPORT KeySwitchMatrixManipulator : public MatrixManipulator Add a camera manipulator with an associated name, and a key to trigger the switch, */ - void addMatrixManipulator(int key, std::string name, MatrixManipulator *cm); + void addMatrixManipulator(int key, std::string name, CameraManipulator *cm); /** Add a camera manipulator with an autogenerated keybinding which is '1' + previous number of camera's registerd. */ - void addNumberedMatrixManipulator(MatrixManipulator *cm); + void addNumberedMatrixManipulator(CameraManipulator *cm); unsigned int getNumMatrixManipulators() const { return _manips.size(); } @@ -60,26 +60,26 @@ class OSGGA_EXPORT KeySwitchMatrixManipulator : public MatrixManipulator /** Get the current active manipulators.*/ - MatrixManipulator* getCurrentMatrixManipulator() { return _current.get(); } + CameraManipulator* getCurrentMatrixManipulator() { return _current.get(); } /** Get the const current active manipulators.*/ - const MatrixManipulator* getCurrentMatrixManipulator() const { return _current.get(); } + const CameraManipulator* getCurrentMatrixManipulator() const { return _current.get(); } /** Get manipulator assigned to a specified index.*/ - MatrixManipulator* getMatrixManipulatorWithIndex(unsigned int key); + CameraManipulator* getMatrixManipulatorWithIndex(unsigned int key); /** Get const manipulator assigned to a specified index.*/ - const MatrixManipulator* getMatrixManipulatorWithIndex(unsigned int key) const; + const CameraManipulator* getMatrixManipulatorWithIndex(unsigned int key) const; /** Get manipulator assigned to a specified key.*/ - MatrixManipulator* getMatrixManipulatorWithKey(unsigned int key); + CameraManipulator* getMatrixManipulatorWithKey(unsigned int key); /** Get const manipulator assigned to a specified key.*/ - const MatrixManipulator* getMatrixManipulatorWithKey(unsigned int key) const; + const CameraManipulator* getMatrixManipulatorWithKey(unsigned int key) const; - // Overrides from MatrixManipulator... + // Overrides from CameraManipulator... /** set the coordinate frame which callback tells the manipulator which way is up, east and north.*/ virtual void setCoordinateFrameCallback(CoordinateFrameCallback* cb); @@ -128,7 +128,7 @@ class OSGGA_EXPORT KeySwitchMatrixManipulator : public MatrixManipulator KeyManipMap _manips; - osg::ref_ptr _current; + osg::ref_ptr _current; }; } diff --git a/include/osgGA/SphericalManipulator b/include/osgGA/SphericalManipulator index 08d887d8a..bc63fb287 100644 --- a/include/osgGA/SphericalManipulator +++ b/include/osgGA/SphericalManipulator @@ -14,14 +14,14 @@ #ifndef __SphericalManipulator_h__ #define __SphericalManipulator_h__ -#include +#include #include #include namespace osgGA { -class OSGGA_EXPORT SphericalManipulator : public MatrixManipulator +class OSGGA_EXPORT SphericalManipulator : public CameraManipulator { public: SphericalManipulator(); diff --git a/include/osgGA/StandardManipulator b/include/osgGA/StandardManipulator index ba73bf588..4b7709c9a 100644 --- a/include/osgGA/StandardManipulator +++ b/include/osgGA/StandardManipulator @@ -19,7 +19,7 @@ #ifndef OSGGA_CAMERA_MANIPULATOR #define OSGGA_CAMERA_MANIPULATOR 1 -#include +#include namespace osgGA { @@ -27,9 +27,9 @@ namespace osgGA { /** StandardManipulator class provides basic functionality for user controlled manipulation.*/ -class OSGGA_EXPORT StandardManipulator : public MatrixManipulator +class OSGGA_EXPORT StandardManipulator : public CameraManipulator { - typedef MatrixManipulator inherited; + typedef CameraManipulator inherited; public: diff --git a/include/osgGA/UFOManipulator b/include/osgGA/UFOManipulator index 83c89c968..f07eea82b 100644 --- a/include/osgGA/UFOManipulator +++ b/include/osgGA/UFOManipulator @@ -16,7 +16,7 @@ #include -#include +#include #include #include @@ -53,7 +53,7 @@ When the Shift key is released, up, down, linear left and/or linear right moveme namespace osgGA { -class OSGGA_EXPORT UFOManipulator : public osgGA::MatrixManipulator +class OSGGA_EXPORT UFOManipulator : public osgGA::CameraManipulator { public: diff --git a/include/osgViewer/View b/include/osgViewer/View index 9784859eb..5fdf5bfe2 100644 --- a/include/osgViewer/View +++ b/include/osgViewer/View @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include @@ -100,13 +100,13 @@ class OSGVIEWER_EXPORT View : public osg::View, public osgGA::GUIActionAdapter /** Set the CameraManipulator that moves the View's master Camera position in response to events. * The parameter resetPosition determines whether manipulator is set to its home position.*/ - void setCameraManipulator(osgGA::MatrixManipulator* manipulator, bool resetPosition = true); + void setCameraManipulator(osgGA::CameraManipulator* manipulator, bool resetPosition = true); /** Get the View's CameraManipulator.*/ - osgGA::MatrixManipulator* getCameraManipulator() { return _cameraManipulator.get(); } + osgGA::CameraManipulator* getCameraManipulator() { return _cameraManipulator.get(); } /** Get the const View's CameraManipulator.*/ - const osgGA::MatrixManipulator* getCameraManipulator() const { return _cameraManipulator.get(); } + const osgGA::CameraManipulator* getCameraManipulator() const { return _cameraManipulator.get(); } /** Set the view to the CameraManipulator's home position, if non is attached home() is does nothing. * Note, to set the home position use getCamaraManipulator()->setHomePosition(...). */ @@ -225,7 +225,7 @@ class OSGVIEWER_EXPORT View : public osg::View, public osgGA::GUIActionAdapter osg::ref_ptr _scene; osg::ref_ptr _eventQueue; - osg::ref_ptr _cameraManipulator; + osg::ref_ptr _cameraManipulator; EventHandlers _eventHandlers; osg::ObserverNodePath _coordinateSystemNodePath; diff --git a/include/osgViewer/ViewerBase b/include/osgViewer/ViewerBase index eba08acb0..8941bc05b 100644 --- a/include/osgViewer/ViewerBase +++ b/include/osgViewer/ViewerBase @@ -19,7 +19,6 @@ #include #include -#include #include #include diff --git a/include/osgViewer/ViewerEventHandlers b/include/osgViewer/ViewerEventHandlers index 06910a9ec..7d23b9290 100644 --- a/include/osgViewer/ViewerEventHandlers +++ b/include/osgViewer/ViewerEventHandlers @@ -275,7 +275,7 @@ protected: osg::Timer_t _lastFrameTime; osg::ref_ptr _animPath; osg::ref_ptr _animPathManipulator; - osg::ref_ptr _oldManipulator; + osg::ref_ptr _oldManipulator; }; /** Event handler for increase/decreasing LODScale.*/ diff --git a/src/osgGA/CMakeLists.txt b/src/osgGA/CMakeLists.txt index 6ff854a05..b93f57b49 100644 --- a/src/osgGA/CMakeLists.txt +++ b/src/osgGA/CMakeLists.txt @@ -19,7 +19,7 @@ SET(LIB_PUBLIC_HEADERS ${HEADER_PATH}/GUIEventAdapter ${HEADER_PATH}/GUIEventHandler ${HEADER_PATH}/KeySwitchMatrixManipulator - ${HEADER_PATH}/MatrixManipulator + ${HEADER_PATH}/CameraManipulator ${HEADER_PATH}/NodeTrackerManipulator ${HEADER_PATH}/OrbitManipulator ${HEADER_PATH}/StandardManipulator @@ -45,7 +45,7 @@ ADD_LIBRARY(${LIB_NAME} GUIEventAdapter.cpp GUIEventHandler.cpp KeySwitchMatrixManipulator.cpp - MatrixManipulator.cpp + CameraManipulator.cpp NodeTrackerManipulator.cpp OrbitManipulator.cpp StandardManipulator.cpp diff --git a/src/osgGA/MatrixManipulator.cpp b/src/osgGA/CameraManipulator.cpp similarity index 90% rename from src/osgGA/MatrixManipulator.cpp rename to src/osgGA/CameraManipulator.cpp index ed1be903f..55ef3bd96 100644 --- a/src/osgGA/MatrixManipulator.cpp +++ b/src/osgGA/CameraManipulator.cpp @@ -1,13 +1,13 @@ #include #include #include -#include +#include #include using namespace osg; using namespace osgGA; -MatrixManipulator::MatrixManipulator() +CameraManipulator::CameraManipulator() { _intersectTraversalMask = 0xffffffff; @@ -19,7 +19,7 @@ MatrixManipulator::MatrixManipulator() } -MatrixManipulator::MatrixManipulator(const MatrixManipulator& mm, const CopyOp& copyOp) +CameraManipulator::CameraManipulator(const CameraManipulator& mm, const CopyOp& copyOp) : inherited(mm, copyOp), _intersectTraversalMask(mm._intersectTraversalMask), _autoComputeHomePosition(mm._autoComputeHomePosition), @@ -31,12 +31,12 @@ MatrixManipulator::MatrixManipulator(const MatrixManipulator& mm, const CopyOp& } -MatrixManipulator::~MatrixManipulator() +CameraManipulator::~CameraManipulator() { } -std::string MatrixManipulator::getManipulatorName() const +std::string CameraManipulator::getManipulatorName() const { const char* className = this->className(); const char* manipString = strstr(className, "Manipulator"); @@ -47,7 +47,7 @@ std::string MatrixManipulator::getManipulatorName() const } -bool MatrixManipulator::handle(const GUIEventAdapter&,GUIActionAdapter&) +bool CameraManipulator::handle(const GUIEventAdapter&,GUIActionAdapter&) { return false; } @@ -65,7 +65,7 @@ bool MatrixManipulator::handle(const GUIEventAdapter&,GUIActionAdapter&) * useBoundingBox parameter enables to use bounding box instead of bounding sphere * for scene bounds. Bounding box provide more precise scene center that may be * important for many applications.*/ -void MatrixManipulator::computeHomePosition(const osg::Camera *camera, bool useBoundingBox) +void CameraManipulator::computeHomePosition(const osg::Camera *camera, bool useBoundingBox) { if (getNode()) { diff --git a/src/osgGA/KeySwitchMatrixManipulator.cpp b/src/osgGA/KeySwitchMatrixManipulator.cpp index 595fbe737..88cc23132 100644 --- a/src/osgGA/KeySwitchMatrixManipulator.cpp +++ b/src/osgGA/KeySwitchMatrixManipulator.cpp @@ -3,11 +3,11 @@ using namespace osgGA; -void KeySwitchMatrixManipulator::addMatrixManipulator(int key, std::string name, MatrixManipulator *cm) +void KeySwitchMatrixManipulator::addMatrixManipulator(int key, std::string name, CameraManipulator *cm) { if(!cm) return; - _manips[key]=std::make_pair(name,osg::ref_ptr(cm)); + _manips[key]=std::make_pair(name,osg::ref_ptr(cm)); if(!_current) { @@ -19,7 +19,7 @@ void KeySwitchMatrixManipulator::addMatrixManipulator(int key, std::string name, } } -void KeySwitchMatrixManipulator::addNumberedMatrixManipulator(MatrixManipulator *cm) +void KeySwitchMatrixManipulator::addNumberedMatrixManipulator(CameraManipulator *cm) { if(!cm) return; addMatrixManipulator('1'+_manips.size(),cm->className(),cm); @@ -68,7 +68,7 @@ void KeySwitchMatrixManipulator::setNode(osg::Node* node) void KeySwitchMatrixManipulator::setHomePosition(const osg::Vec3d& eye, const osg::Vec3d& center, const osg::Vec3d& up, bool autoComputeHomePosition) { - MatrixManipulator::setHomePosition(eye, center, up, autoComputeHomePosition); + CameraManipulator::setHomePosition(eye, center, up, autoComputeHomePosition); for(KeyManipMap::iterator itr=_manips.begin(); itr!=_manips.end(); ++itr) @@ -126,7 +126,7 @@ void KeySwitchMatrixManipulator::setCoordinateFrameCallback(CoordinateFrameCallb } } -MatrixManipulator* KeySwitchMatrixManipulator::getMatrixManipulatorWithIndex(unsigned int index) +CameraManipulator* KeySwitchMatrixManipulator::getMatrixManipulatorWithIndex(unsigned int index) { unsigned i=0; for(KeyManipMap::iterator itr = _manips.begin(); @@ -138,7 +138,7 @@ MatrixManipulator* KeySwitchMatrixManipulator::getMatrixManipulatorWithIndex(uns return 0; } -const MatrixManipulator* KeySwitchMatrixManipulator::getMatrixManipulatorWithIndex(unsigned int index) const +const CameraManipulator* KeySwitchMatrixManipulator::getMatrixManipulatorWithIndex(unsigned int index) const { unsigned i=0; for(KeyManipMap::const_iterator itr = _manips.begin(); @@ -150,14 +150,14 @@ const MatrixManipulator* KeySwitchMatrixManipulator::getMatrixManipulatorWithInd return 0; } -MatrixManipulator* KeySwitchMatrixManipulator::getMatrixManipulatorWithKey(unsigned int key) +CameraManipulator* KeySwitchMatrixManipulator::getMatrixManipulatorWithKey(unsigned int key) { KeyManipMap::iterator itr = _manips.find(key); if (itr!=_manips.end()) return itr->second.second.get(); else return 0; } -const MatrixManipulator* KeySwitchMatrixManipulator::getMatrixManipulatorWithKey(unsigned int key) const +const CameraManipulator* KeySwitchMatrixManipulator::getMatrixManipulatorWithKey(unsigned int key) const { KeyManipMap::const_iterator itr = _manips.find(key); if (itr!=_manips.end()) return itr->second.second.get(); diff --git a/src/osgGA/StandardManipulator.cpp b/src/osgGA/StandardManipulator.cpp index df076a679..f7a7d3bc3 100644 --- a/src/osgGA/StandardManipulator.cpp +++ b/src/osgGA/StandardManipulator.cpp @@ -120,7 +120,7 @@ Node* StandardManipulator::getNode() * * In general, fixed up vector makes camera control more user friendly. * - * To change up vector, use MatrixManipulator::setCoordinateFrameCallback.*/ + * To change up vector, use CameraManipulator::setCoordinateFrameCallback.*/ void StandardManipulator::setVerticalAxisFixed( bool value ) { _verticalAxisFixed = value; @@ -654,7 +654,7 @@ void StandardManipulator::rotateYawPitch( Quat& rotation, const double yaw, cons * Technically said, it makes the roll component of the rotation equal to zero. * * Up vector is given by CoordinateFrame and it is +z by default. - * It can be changed by osgGA::MatrixManipulator::setCoordinateFrameCallback(). + * It can be changed by osgGA::CameraManipulator::setCoordinateFrameCallback(). * * Eye parameter is user position, rotation is the rotation to be fixed, and * disallowFlipOver, when set on true, avoids pitch rotation component to grow diff --git a/src/osgViewer/View.cpp b/src/osgViewer/View.cpp index ade4760dd..1510e437a 100644 --- a/src/osgViewer/View.cpp +++ b/src/osgViewer/View.cpp @@ -65,7 +65,7 @@ public: /** callback class to use to allow matrix manipulators to query the application for the local coordinate frame.*/ -class ViewerCoordinateFrameCallback : public osgGA::MatrixManipulator::CoordinateFrameCallback +class ViewerCoordinateFrameCallback : public osgGA::CameraManipulator::CoordinateFrameCallback { public: @@ -338,7 +338,7 @@ const osgDB::ImagePager* View::getImagePager() const } -void View::setCameraManipulator(osgGA::MatrixManipulator* manipulator, bool resetPosition) +void View::setCameraManipulator(osgGA::CameraManipulator* manipulator, bool resetPosition) { _cameraManipulator = manipulator; diff --git a/src/osgViewer/ViewerEventHandlers.cpp b/src/osgViewer/ViewerEventHandlers.cpp index 520e306be..ed528fd83 100644 --- a/src/osgViewer/ViewerEventHandlers.cpp +++ b/src/osgViewer/ViewerEventHandlers.cpp @@ -534,7 +534,7 @@ bool RecordCameraPathHandler::handle(const osgGA::GUIEventAdapter &ea, osgGA::GU // If we successfully found our _filename file, set it and keep a copy - // around of the original MatrixManipulator to restore later. + // around of the original CameraManipulator to restore later. if (_animPathManipulator.valid() && _animPathManipulator->valid()) { _oldManipulator = view->getCameraManipulator(); diff --git a/src/osgWidget/ViewerEventHandlers.cpp b/src/osgWidget/ViewerEventHandlers.cpp index bee952d0f..1547ee9d3 100644 --- a/src/osgWidget/ViewerEventHandlers.cpp +++ b/src/osgWidget/ViewerEventHandlers.cpp @@ -236,7 +236,7 @@ bool CameraSwitchHandler::handle( osg::StateAttribute::OVERRIDE | osg::StateAttribute::OFF ); - osgGA::MatrixManipulator* mm = view->getCameraManipulator(); + osgGA::CameraManipulator* mm = view->getCameraManipulator(); // mm->setDistance(3000.0f); // mm->setMinimumZoomScale(10.0f); diff --git a/src/osgWrappers/introspection/osgGA/AnimationPathManipulator.cpp b/src/osgWrappers/introspection/osgGA/AnimationPathManipulator.cpp index 7cff2a385..e0cb4dde6 100644 --- a/src/osgWrappers/introspection/osgGA/AnimationPathManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/AnimationPathManipulator.cpp @@ -27,7 +27,7 @@ BEGIN_OBJECT_REFLECTOR(osgGA::AnimationPathManipulator) I_DeclaringFile("osgGA/AnimationPathManipulator"); - I_BaseType(osgGA::MatrixManipulator); + I_BaseType(osgGA::CameraManipulator); I_ConstructorWithDefaults1(IN, osg::AnimationPath *, animationPath, 0, Properties::NON_EXPLICIT, ____AnimationPathManipulator__osg_AnimationPath_P1, diff --git a/src/osgWrappers/introspection/osgGA/MatrixManipulator.cpp b/src/osgWrappers/introspection/osgGA/CameraManipulator.cpp similarity index 93% rename from src/osgWrappers/introspection/osgGA/MatrixManipulator.cpp rename to src/osgWrappers/introspection/osgGA/CameraManipulator.cpp index d9b6e9ab0..e9bce03ab 100644 --- a/src/osgWrappers/introspection/osgGA/MatrixManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/CameraManipulator.cpp @@ -15,9 +15,9 @@ #include #include #include +#include #include #include -#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -28,25 +28,25 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::MatrixManipulator) - I_DeclaringFile("osgGA/MatrixManipulator"); +BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::CameraManipulator) + I_DeclaringFile("osgGA/CameraManipulator"); I_BaseType(osgGA::GUIEventHandler); I_Method0(const char *, className, Properties::VIRTUAL, __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); - I_Method1(void, setCoordinateFrameCallback, IN, osgGA::MatrixManipulator::CoordinateFrameCallback *, cb, + I_Method1(void, setCoordinateFrameCallback, IN, osgGA::CameraManipulator::CoordinateFrameCallback *, cb, Properties::VIRTUAL, __void__setCoordinateFrameCallback__CoordinateFrameCallback_P1, "set the coordinate frame which callback tells the manipulator which way is up, east and north. ", ""); - I_Method0(osgGA::MatrixManipulator::CoordinateFrameCallback *, getCoordinateFrameCallback, + I_Method0(osgGA::CameraManipulator::CoordinateFrameCallback *, getCoordinateFrameCallback, Properties::NON_VIRTUAL, __CoordinateFrameCallback_P1__getCoordinateFrameCallback, "get the coordinate frame callback which tells the manipulator which way is up, east and north. ", ""); - I_Method0(const osgGA::MatrixManipulator::CoordinateFrameCallback *, getCoordinateFrameCallback, + I_Method0(const osgGA::CameraManipulator::CoordinateFrameCallback *, getCoordinateFrameCallback, Properties::NON_VIRTUAL, __C5_CoordinateFrameCallback_P1__getCoordinateFrameCallback, "get the coordinate frame callback which tells the manipulator which way is up, east and north. ", @@ -171,11 +171,11 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::MatrixManipulator) __bool__handle__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, "Handle events, return true if handled, false otherwise. ", ""); - I_ProtectedConstructor0(____MatrixManipulator, + I_ProtectedConstructor0(____CameraManipulator, "", ""); - I_ProtectedConstructorWithDefaults2(IN, const osgGA::MatrixManipulator &, mm, , IN, const osg::CopyOp &, copyOp, osg::CopyOp::SHALLOW_COPY, - ____MatrixManipulator__C5_MatrixManipulator_R1__C5_osg_CopyOp_R1, + I_ProtectedConstructorWithDefaults2(IN, const osgGA::CameraManipulator &, mm, , IN, const osg::CopyOp &, copyOp, osg::CopyOp::SHALLOW_COPY, + ____CameraManipulator__C5_CameraManipulator_R1__C5_osg_CopyOp_R1, "", ""); I_ProtectedMethod0(std::string, getManipulatorName, @@ -193,7 +193,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::MatrixManipulator) I_SimpleProperty(const osg::Matrixd &, ByMatrix, 0, __void__setByMatrix__C5_osg_Matrixd_R1); - I_SimpleProperty(osgGA::MatrixManipulator::CoordinateFrameCallback *, CoordinateFrameCallback, + I_SimpleProperty(osgGA::CameraManipulator::CoordinateFrameCallback *, CoordinateFrameCallback, __CoordinateFrameCallback_P1__getCoordinateFrameCallback, __void__setCoordinateFrameCallback__CoordinateFrameCallback_P1); I_SimpleProperty(osgUtil::SceneView::FusionDistanceMode, FusionDistanceMode, @@ -216,8 +216,8 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::MatrixManipulator) __void__setNode__osg_Node_P1); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::MatrixManipulator::CoordinateFrameCallback) - I_DeclaringFile("osgGA/MatrixManipulator"); +BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::CameraManipulator::CoordinateFrameCallback) + I_DeclaringFile("osgGA/CameraManipulator"); I_BaseType(osg::Referenced); I_Constructor0(____CoordinateFrameCallback, "", diff --git a/src/osgWrappers/introspection/osgGA/CameraViewSwitchManipulator.cpp b/src/osgWrappers/introspection/osgGA/CameraViewSwitchManipulator.cpp index b07329a51..ca7f38b4d 100644 --- a/src/osgWrappers/introspection/osgGA/CameraViewSwitchManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/CameraViewSwitchManipulator.cpp @@ -30,7 +30,7 @@ TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::CameraView > >, osgGA::CameraVie BEGIN_OBJECT_REFLECTOR(osgGA::CameraViewSwitchManipulator) I_DeclaringFile("osgGA/CameraViewSwitchManipulator"); - I_BaseType(osgGA::MatrixManipulator); + I_BaseType(osgGA::CameraManipulator); I_Constructor0(____CameraViewSwitchManipulator, "", ""); diff --git a/src/osgWrappers/introspection/osgGA/DriveManipulator.cpp b/src/osgWrappers/introspection/osgGA/DriveManipulator.cpp index b6af47c0d..28f21c3a6 100644 --- a/src/osgWrappers/introspection/osgGA/DriveManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/DriveManipulator.cpp @@ -27,7 +27,7 @@ BEGIN_OBJECT_REFLECTOR(osgGA::DriveManipulator) I_DeclaringFile("osgGA/DriveManipulator"); - I_BaseType(osgGA::MatrixManipulator); + I_BaseType(osgGA::CameraManipulator); I_Constructor0(____DriveManipulator, "", ""); diff --git a/src/osgWrappers/introspection/osgGA/FlightManipulator.cpp b/src/osgWrappers/introspection/osgGA/FlightManipulator.cpp index 2e63c5988..2b0662e89 100644 --- a/src/osgWrappers/introspection/osgGA/FlightManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/FlightManipulator.cpp @@ -141,19 +141,19 @@ BEGIN_OBJECT_REFLECTOR(osgGA::FlightManipulator) __bool__performMovement, "", ""); - I_ProtectedMethod3(bool, performMovementLeftMouseButton, IN, const double, dt, IN, const double, dx, IN, const double, dy, + I_ProtectedMethod3(bool, performMovementLeftMouseButton, IN, const double, eventTimeDelta, IN, const double, dx, IN, const double, dy, Properties::VIRTUAL, Properties::NON_CONST, __bool__performMovementLeftMouseButton__C5_double__C5_double__C5_double, "", ""); - I_ProtectedMethod3(bool, performMovementMiddleMouseButton, IN, const double, dt, IN, const double, dx, IN, const double, dy, + I_ProtectedMethod3(bool, performMovementMiddleMouseButton, IN, const double, eventTimeDelta, IN, const double, dx, IN, const double, dy, Properties::VIRTUAL, Properties::NON_CONST, __bool__performMovementMiddleMouseButton__C5_double__C5_double__C5_double, "", ""); - I_ProtectedMethod3(bool, performMovementRightMouseButton, IN, const double, dt, IN, const double, dx, IN, const double, dy, + I_ProtectedMethod3(bool, performMovementRightMouseButton, IN, const double, eventTimeDelta, IN, const double, dx, IN, const double, dy, Properties::VIRTUAL, Properties::NON_CONST, __bool__performMovementRightMouseButton__C5_double__C5_double__C5_double, diff --git a/src/osgWrappers/introspection/osgGA/KeySwitchMatrixManipulator.cpp b/src/osgWrappers/introspection/osgGA/KeySwitchMatrixManipulator.cpp index 3272018c2..cbf2925ed 100644 --- a/src/osgWrappers/introspection/osgGA/KeySwitchMatrixManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/KeySwitchMatrixManipulator.cpp @@ -14,10 +14,10 @@ #include #include #include +#include #include #include #include -#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -28,13 +28,13 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::pair< std::string COMMA osg::ref_ptr< osgGA::MatrixManipulator > >, osgGA::KeySwitchMatrixManipulator::NamedManipulator) +TYPE_NAME_ALIAS(std::pair< std::string COMMA osg::ref_ptr< osgGA::CameraManipulator > >, osgGA::KeySwitchMatrixManipulator::NamedManipulator) TYPE_NAME_ALIAS(std::map< int COMMA osgGA::KeySwitchMatrixManipulator::NamedManipulator >, osgGA::KeySwitchMatrixManipulator::KeyManipMap) BEGIN_OBJECT_REFLECTOR(osgGA::KeySwitchMatrixManipulator) I_DeclaringFile("osgGA/KeySwitchMatrixManipulator"); - I_BaseType(osgGA::MatrixManipulator); + I_BaseType(osgGA::CameraManipulator); I_Constructor0(____KeySwitchMatrixManipulator, "", ""); @@ -43,14 +43,14 @@ BEGIN_OBJECT_REFLECTOR(osgGA::KeySwitchMatrixManipulator) __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); - I_Method3(void, addMatrixManipulator, IN, int, key, IN, std::string, name, IN, osgGA::MatrixManipulator *, cm, + I_Method3(void, addMatrixManipulator, IN, int, key, IN, std::string, name, IN, osgGA::CameraManipulator *, cm, Properties::NON_VIRTUAL, - __void__addMatrixManipulator__int__std_string__MatrixManipulator_P1, + __void__addMatrixManipulator__int__std_string__CameraManipulator_P1, "Add a camera manipulator with an associated name, and a key to trigger the switch,. ", ""); - I_Method1(void, addNumberedMatrixManipulator, IN, osgGA::MatrixManipulator *, cm, + I_Method1(void, addNumberedMatrixManipulator, IN, osgGA::CameraManipulator *, cm, Properties::NON_VIRTUAL, - __void__addNumberedMatrixManipulator__MatrixManipulator_P1, + __void__addNumberedMatrixManipulator__CameraManipulator_P1, "Add a camera manipulator with an autogenerated keybinding which is '1' + previous number of camera's registerd. ", ""); I_Method0(unsigned int, getNumMatrixManipulators, @@ -73,37 +73,37 @@ BEGIN_OBJECT_REFLECTOR(osgGA::KeySwitchMatrixManipulator) __C5_KeyManipMap_R1__getKeyManipMap, "Get the const complete list of manipulators attached to this keyswitch manipulator. ", ""); - I_Method0(osgGA::MatrixManipulator *, getCurrentMatrixManipulator, + I_Method0(osgGA::CameraManipulator *, getCurrentMatrixManipulator, Properties::NON_VIRTUAL, - __MatrixManipulator_P1__getCurrentMatrixManipulator, + __CameraManipulator_P1__getCurrentMatrixManipulator, "Get the current active manipulators. ", ""); - I_Method0(const osgGA::MatrixManipulator *, getCurrentMatrixManipulator, + I_Method0(const osgGA::CameraManipulator *, getCurrentMatrixManipulator, Properties::NON_VIRTUAL, - __C5_MatrixManipulator_P1__getCurrentMatrixManipulator, + __C5_CameraManipulator_P1__getCurrentMatrixManipulator, "Get the const current active manipulators. ", ""); - I_Method1(osgGA::MatrixManipulator *, getMatrixManipulatorWithIndex, IN, unsigned int, key, + I_Method1(osgGA::CameraManipulator *, getMatrixManipulatorWithIndex, IN, unsigned int, key, Properties::NON_VIRTUAL, - __MatrixManipulator_P1__getMatrixManipulatorWithIndex__unsigned_int, + __CameraManipulator_P1__getMatrixManipulatorWithIndex__unsigned_int, "Get manipulator assigned to a specified index. ", ""); - I_Method1(const osgGA::MatrixManipulator *, getMatrixManipulatorWithIndex, IN, unsigned int, key, + I_Method1(const osgGA::CameraManipulator *, getMatrixManipulatorWithIndex, IN, unsigned int, key, Properties::NON_VIRTUAL, - __C5_MatrixManipulator_P1__getMatrixManipulatorWithIndex__unsigned_int, + __C5_CameraManipulator_P1__getMatrixManipulatorWithIndex__unsigned_int, "Get const manipulator assigned to a specified index. ", ""); - I_Method1(osgGA::MatrixManipulator *, getMatrixManipulatorWithKey, IN, unsigned int, key, + I_Method1(osgGA::CameraManipulator *, getMatrixManipulatorWithKey, IN, unsigned int, key, Properties::NON_VIRTUAL, - __MatrixManipulator_P1__getMatrixManipulatorWithKey__unsigned_int, + __CameraManipulator_P1__getMatrixManipulatorWithKey__unsigned_int, "Get manipulator assigned to a specified key. ", ""); - I_Method1(const osgGA::MatrixManipulator *, getMatrixManipulatorWithKey, IN, unsigned int, key, + I_Method1(const osgGA::CameraManipulator *, getMatrixManipulatorWithKey, IN, unsigned int, key, Properties::NON_VIRTUAL, - __C5_MatrixManipulator_P1__getMatrixManipulatorWithKey__unsigned_int, + __C5_CameraManipulator_P1__getMatrixManipulatorWithKey__unsigned_int, "Get const manipulator assigned to a specified key. ", ""); - I_Method1(void, setCoordinateFrameCallback, IN, osgGA::MatrixManipulator::CoordinateFrameCallback *, cb, + I_Method1(void, setCoordinateFrameCallback, IN, osgGA::CameraManipulator::CoordinateFrameCallback *, cb, Properties::VIRTUAL, __void__setCoordinateFrameCallback__CoordinateFrameCallback_P1, "set the coordinate frame which callback tells the manipulator which way is up, east and north. ", @@ -197,11 +197,11 @@ BEGIN_OBJECT_REFLECTOR(osgGA::KeySwitchMatrixManipulator) I_SimpleProperty(const osg::Matrixd &, ByMatrix, 0, __void__setByMatrix__C5_osg_Matrixd_R1); - I_SimpleProperty(osgGA::MatrixManipulator::CoordinateFrameCallback *, CoordinateFrameCallback, + I_SimpleProperty(osgGA::CameraManipulator::CoordinateFrameCallback *, CoordinateFrameCallback, 0, __void__setCoordinateFrameCallback__CoordinateFrameCallback_P1); - I_SimpleProperty(osgGA::MatrixManipulator *, CurrentMatrixManipulator, - __MatrixManipulator_P1__getCurrentMatrixManipulator, + I_SimpleProperty(osgGA::CameraManipulator *, CurrentMatrixManipulator, + __CameraManipulator_P1__getCurrentMatrixManipulator, 0); I_SimpleProperty(osgUtil::SceneView::FusionDistanceMode, FusionDistanceMode, __osgUtil_SceneView_FusionDistanceMode__getFusionDistanceMode, @@ -223,22 +223,22 @@ BEGIN_OBJECT_REFLECTOR(osgGA::KeySwitchMatrixManipulator) __void__setNode__osg_Node_P1); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgGA::MatrixManipulator >) +BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgGA::CameraManipulator >) I_DeclaringFile("osg/ref_ptr"); I_Constructor0(____ref_ptr, "", ""); - I_Constructor1(IN, osgGA::MatrixManipulator *, ptr, + I_Constructor1(IN, osgGA::CameraManipulator *, ptr, Properties::NON_EXPLICIT, ____ref_ptr__T_P1, "", ""); - I_Constructor1(IN, const osg::ref_ptr< osgGA::MatrixManipulator > &, rp, + I_Constructor1(IN, const osg::ref_ptr< osgGA::CameraManipulator > &, rp, Properties::NON_EXPLICIT, ____ref_ptr__C5_ref_ptr_R1, "", ""); - I_Method0(osgGA::MatrixManipulator *, get, + I_Method0(osgGA::CameraManipulator *, get, Properties::NON_VIRTUAL, __T_P1__get, "", @@ -248,22 +248,22 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgGA::MatrixManipulator >) __bool__valid, "", ""); - I_Method0(osgGA::MatrixManipulator *, release, + I_Method0(osgGA::CameraManipulator *, release, Properties::NON_VIRTUAL, __T_P1__release, "", ""); - I_Method1(void, swap, IN, osg::ref_ptr< osgGA::MatrixManipulator > &, rp, + I_Method1(void, swap, IN, osg::ref_ptr< osgGA::CameraManipulator > &, rp, Properties::NON_VIRTUAL, __void__swap__ref_ptr_R1, "", ""); - I_SimpleProperty(osgGA::MatrixManipulator *, , + I_SimpleProperty(osgGA::CameraManipulator *, , __T_P1__get, 0); END_REFLECTOR STD_MAP_REFLECTOR(std::map< int COMMA osgGA::KeySwitchMatrixManipulator::NamedManipulator >) -STD_PAIR_REFLECTOR(std::pair< std::string COMMA osg::ref_ptr< osgGA::MatrixManipulator > >) +STD_PAIR_REFLECTOR(std::pair< std::string COMMA osg::ref_ptr< osgGA::CameraManipulator > >) diff --git a/src/osgWrappers/introspection/osgGA/NodeTrackerManipulator.cpp b/src/osgWrappers/introspection/osgGA/NodeTrackerManipulator.cpp index 6a46e16df..1d619e248 100644 --- a/src/osgWrappers/introspection/osgGA/NodeTrackerManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/NodeTrackerManipulator.cpp @@ -151,19 +151,19 @@ BEGIN_OBJECT_REFLECTOR(osgGA::NodeTrackerManipulator) __void__computeHomePosition, "", ""); - I_ProtectedMethod3(bool, performMovementLeftMouseButton, IN, const double, dt, IN, const double, dx, IN, const double, dy, + I_ProtectedMethod3(bool, performMovementLeftMouseButton, IN, const double, eventTimeDelta, IN, const double, dx, IN, const double, dy, Properties::VIRTUAL, Properties::NON_CONST, __bool__performMovementLeftMouseButton__C5_double__C5_double__C5_double, "", ""); - I_ProtectedMethod3(bool, performMovementMiddleMouseButton, IN, const double, dt, IN, const double, dx, IN, const double, dy, + I_ProtectedMethod3(bool, performMovementMiddleMouseButton, IN, const double, eventTimeDelta, IN, const double, dx, IN, const double, dy, Properties::VIRTUAL, Properties::NON_CONST, __bool__performMovementMiddleMouseButton__C5_double__C5_double__C5_double, "", ""); - I_ProtectedMethod3(bool, performMovementRightMouseButton, IN, const double, dt, IN, const double, dx, IN, const double, dy, + I_ProtectedMethod3(bool, performMovementRightMouseButton, IN, const double, eventTimeDelta, IN, const double, dx, IN, const double, dy, Properties::VIRTUAL, Properties::NON_CONST, __bool__performMovementRightMouseButton__C5_double__C5_double__C5_double, diff --git a/src/osgWrappers/introspection/osgGA/SphericalManipulator.cpp b/src/osgWrappers/introspection/osgGA/SphericalManipulator.cpp index 0fcb13e17..9cb046d80 100644 --- a/src/osgWrappers/introspection/osgGA/SphericalManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/SphericalManipulator.cpp @@ -38,7 +38,7 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgGA::SphericalManipulator) I_DeclaringFile("osgGA/SphericalManipulator"); - I_BaseType(osgGA::MatrixManipulator); + I_BaseType(osgGA::CameraManipulator); I_Constructor0(____SphericalManipulator, "", ""); diff --git a/src/osgWrappers/introspection/osgGA/TerrainManipulator.cpp b/src/osgWrappers/introspection/osgGA/TerrainManipulator.cpp index 50da0a9db..d97a41d94 100644 --- a/src/osgWrappers/introspection/osgGA/TerrainManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/TerrainManipulator.cpp @@ -93,13 +93,13 @@ BEGIN_OBJECT_REFLECTOR(osgGA::TerrainManipulator) __void__setNode__osg_Node_P1, "Attach a node to the manipulator, automatically detaching any previously attached node. ", "setNode(NULL) detaches previous nodes. May be ignored by manipulators which do not require a reference model. "); - I_ProtectedMethod3(bool, performMovementMiddleMouseButton, IN, const double, dt, IN, const double, dx, IN, const double, dy, + I_ProtectedMethod3(bool, performMovementMiddleMouseButton, IN, const double, eventTimeDelta, IN, const double, dx, IN, const double, dy, Properties::VIRTUAL, Properties::NON_CONST, __bool__performMovementMiddleMouseButton__C5_double__C5_double__C5_double, "", ""); - I_ProtectedMethod3(bool, performMovementRightMouseButton, IN, const double, dt, IN, const double, dx, IN, const double, dy, + I_ProtectedMethod3(bool, performMovementRightMouseButton, IN, const double, eventTimeDelta, IN, const double, dx, IN, const double, dy, Properties::VIRTUAL, Properties::NON_CONST, __bool__performMovementRightMouseButton__C5_double__C5_double__C5_double, diff --git a/src/osgWrappers/introspection/osgGA/UFOManipulator.cpp b/src/osgWrappers/introspection/osgGA/UFOManipulator.cpp index 876307cfa..95d40f59d 100644 --- a/src/osgWrappers/introspection/osgGA/UFOManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/UFOManipulator.cpp @@ -28,7 +28,7 @@ BEGIN_OBJECT_REFLECTOR(osgGA::UFOManipulator) I_DeclaringFile("osgGA/UFOManipulator"); - I_BaseType(osgGA::MatrixManipulator); + I_BaseType(osgGA::CameraManipulator); I_Constructor0(____UFOManipulator, "Default constructor. ", ""); diff --git a/src/osgWrappers/introspection/osgTerrain/Terrain.cpp b/src/osgWrappers/introspection/osgTerrain/Terrain.cpp index e72589bad..575a8048c 100644 --- a/src/osgWrappers/introspection/osgTerrain/Terrain.cpp +++ b/src/osgWrappers/introspection/osgTerrain/Terrain.cpp @@ -130,12 +130,12 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::Terrain) __void__updateTerrainTileOnNextFrame__TerrainTile_P1, "Tell the Terrain node to call the terrainTile's TerrainTechnique on the next update traversal. ", ""); - I_ProtectedMethod0(void, dirtyRegisteredTiles, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __void__dirtyRegisteredTiles, - "", - ""); + I_ProtectedMethodWithDefaults1(void, dirtyRegisteredTiles, IN, int, dirtyMask, osgTerrain::TerrainTile::ALL_DIRTY, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__dirtyRegisteredTiles__int, + "", + ""); I_ProtectedMethod1(void, registerTerrainTile, IN, osgTerrain::TerrainTile *, tile, Properties::NON_VIRTUAL, Properties::NON_CONST, diff --git a/src/osgWrappers/introspection/osgViewer/View.cpp b/src/osgWrappers/introspection/osgViewer/View.cpp index 9dd018766..13b84df84 100644 --- a/src/osgWrappers/introspection/osgViewer/View.cpp +++ b/src/osgWrappers/introspection/osgViewer/View.cpp @@ -21,9 +21,9 @@ #include #include #include +#include #include #include -#include #include #include #include @@ -171,19 +171,19 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::View) __C5_osgGA_EventQueue_P1__getEventQueue, "", ""); - I_MethodWithDefaults2(void, setCameraManipulator, IN, osgGA::MatrixManipulator *, manipulator, , IN, bool, resetPosition, true, + I_MethodWithDefaults2(void, setCameraManipulator, IN, osgGA::CameraManipulator *, manipulator, , IN, bool, resetPosition, true, Properties::NON_VIRTUAL, - __void__setCameraManipulator__osgGA_MatrixManipulator_P1__bool, + __void__setCameraManipulator__osgGA_CameraManipulator_P1__bool, "Set the CameraManipulator that moves the View's master Camera position in response to events. ", "The parameter resetPosition determines whether manipulator is set to its home position. "); - I_Method0(osgGA::MatrixManipulator *, getCameraManipulator, + I_Method0(osgGA::CameraManipulator *, getCameraManipulator, Properties::NON_VIRTUAL, - __osgGA_MatrixManipulator_P1__getCameraManipulator, + __osgGA_CameraManipulator_P1__getCameraManipulator, "Get the View's CameraManipulator. ", ""); - I_Method0(const osgGA::MatrixManipulator *, getCameraManipulator, + I_Method0(const osgGA::CameraManipulator *, getCameraManipulator, Properties::NON_VIRTUAL, - __C5_osgGA_MatrixManipulator_P1__getCameraManipulator, + __C5_osgGA_CameraManipulator_P1__getCameraManipulator, "Get the const View's CameraManipulator. ", ""); I_Method0(void, home, @@ -337,8 +337,8 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::View) __osg_GraphicsOperation_P1__createRenderer__osg_Camera_P1, "", ""); - I_SimpleProperty(osgGA::MatrixManipulator *, CameraManipulator, - __osgGA_MatrixManipulator_P1__getCameraManipulator, + I_SimpleProperty(osgGA::CameraManipulator *, CameraManipulator, + __osgGA_CameraManipulator_P1__getCameraManipulator, 0); I_SimpleProperty(osg::NodePath, CoordinateSystemNodePath, __osg_NodePath__getCoordinateSystemNodePath,