FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed osgGA::MatrixManipualtor to osgGA::CameraManipulator so its name better reflects it's function

Browse Source
This commit is contained in:
Robert Osfield 2010-05-27 15:54:37 +00:00
parent e8f3625ddf
commit d746f11650
32 changed files with 139 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/osghangglide/GliderManipulator.h
View File

@ -21,17 +21,17 @@
#ifndef OSGGA_GliderMANIPULATOR
#define OSGGA_GliderMANIPULATOR 1
#include <osgGA/MatrixManipulator>
#include <osgGA/CameraManipulator>
#include <osg/Quat>
/**
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:

4
examples/osgimpostor/TestManipulator.h
View File

@ -21,10 +21,10 @@
#ifndef OSGGA_TESTMANIPULATOR
#define OSGGA_TESTMANIPULATOR 1
#include <osgGA/MatrixManipulator>
#include <osgGA/CameraManipulator>
#include <osg/Quat>
class TestManipulator : public osgGA::MatrixManipulator
class TestManipulator : public osgGA::CameraManipulator
{
public:

4
include/osgGA/AnimationPathManipulator
View File

@ -16,7 +16,7 @@
#include <osg/AnimationPath>
#include <osg/Notify>
#include <osgGA/MatrixManipulator>
#include <osgGA/CameraManipulator>
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:

16
include/osgGA/MatrixManipulator → include/osgGA/CameraManipulator
View File

@ -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 <osg/Node>
#include <osg/Matrixd>
@ -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;

4
include/osgGA/CameraViewSwitchManipulator
View File

@ -14,13 +14,13 @@
#ifndef OSGGA_VIEWLISTMANIPULATOR
#define OSGGA_VIEWLISTMANIPULATOR 1
#include <osgGA/MatrixManipulator>
#include <osgGA/CameraManipulator>
#include <osg/Quat>
#include <osg/CameraView>
namespace osgGA{
class OSGGA_EXPORT CameraViewSwitchManipulator : public MatrixManipulator
class OSGGA_EXPORT CameraViewSwitchManipulator : public CameraManipulator
{
public:
CameraViewSwitchManipulator() {}

4
include/osgGA/DriveManipulator
View File

@ -14,7 +14,7 @@
#ifndef OSGGA_DRIVEMANIPULATOR
#define OSGGA_DRIVEMANIPULATOR 1
#include <osgGA/MatrixManipulator>
#include <osgGA/CameraManipulator>
#include <osg/Quat>
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:

26
include/osgGA/KeySwitchMatrixManipulator
View File

@ -15,7 +15,7 @@
#define OSGUTIL_KEYSWITCMATRIXMANIPULATOR 1
#include <osgGA/Export>
#include <osgGA/MatrixManipulator>
#include <osgGA/CameraManipulator>
#include <osgGA/GUIEventHandler>
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<std::string, osg::ref_ptr<MatrixManipulator> > NamedManipulator;
typedef std::pair<std::string, osg::ref_ptr<CameraManipulator> > NamedManipulator;
typedef std::map<int, NamedManipulator> 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<MatrixManipulator> _current;
osg::ref_ptr<CameraManipulator> _current;
};
}

4
include/osgGA/SphericalManipulator
View File

@ -14,14 +14,14 @@
#ifndef __SphericalManipulator_h__
#define __SphericalManipulator_h__
#include <osgGA/MatrixManipulator>
#include <osgGA/CameraManipulator>
#include <osg/Math>
#include <osg/Quat>
namespace osgGA
{
class OSGGA_EXPORT SphericalManipulator : public MatrixManipulator
class OSGGA_EXPORT SphericalManipulator : public CameraManipulator
{
public:
SphericalManipulator();

6
include/osgGA/StandardManipulator
View File

@ -19,7 +19,7 @@
#ifndef OSGGA_CAMERA_MANIPULATOR
#define OSGGA_CAMERA_MANIPULATOR 1
#include <osgGA/MatrixManipulator>
#include <osgGA/CameraManipulator>
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:

4
include/osgGA/UFOManipulator
View File

@ -16,7 +16,7 @@
#include <iostream>
#include <osgGA/MatrixManipulator>
#include <osgGA/CameraManipulator>
#include <osg/Node>
#include <osg/Matrix>
@ -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:

10
include/osgViewer/View
View File

@ -21,7 +21,7 @@
#include <osgUtil/UpdateVisitor>
#include <osgUtil/SceneView>
#include <osgGA/MatrixManipulator>
#include <osgGA/CameraManipulator>
#include <osgGA/EventVisitor>
#include <osgGA/EventQueue>
@ -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<osgViewer::Scene> _scene;
osg::ref_ptr<osgGA::EventQueue> _eventQueue;
osg::ref_ptr<osgGA::MatrixManipulator> _cameraManipulator;
osg::ref_ptr<osgGA::CameraManipulator> _cameraManipulator;
EventHandlers _eventHandlers;
osg::ObserverNodePath _coordinateSystemNodePath;

1
include/osgViewer/ViewerBase
View File

@ -19,7 +19,6 @@
#include <osgUtil/UpdateVisitor>
#include <osgUtil/IncrementalCompileOperation>
#include <osgGA/MatrixManipulator>
#include <osgGA/EventVisitor>
#include <osgGA/EventQueue>

2
include/osgViewer/ViewerEventHandlers
View File

@ -275,7 +275,7 @@ protected:
osg::Timer_t _lastFrameTime;
osg::ref_ptr<osg::AnimationPath> _animPath;
osg::ref_ptr<osgGA::AnimationPathManipulator> _animPathManipulator;
osg::ref_ptr<osgGA::MatrixManipulator> _oldManipulator;
osg::ref_ptr<osgGA::CameraManipulator> _oldManipulator;
};
/** Event handler for increase/decreasing LODScale.*/

4
src/osgGA/CMakeLists.txt
View File

@ -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

14
src/osgGA/MatrixManipulator.cpp → src/osgGA/CameraManipulator.cpp
View File

@ -1,13 +1,13 @@
#include <osg/GL>
#include <osg/Matrix>
#include <osg/ComputeBoundsVisitor>
#include <osgGA/MatrixManipulator>
#include <osgGA/CameraManipulator>
#include <string.h>
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())
{

16
src/osgGA/KeySwitchMatrixManipulator.cpp
View File

@ -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<MatrixManipulator>(cm));
_manips[key]=std::make_pair(name,osg::ref_ptr<CameraManipulator>(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();

4
src/osgGA/StandardManipulator.cpp
View File

@ -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

4
src/osgViewer/View.cpp
View File

@ -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;

2
src/osgViewer/ViewerEventHandlers.cpp
View File

@ -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();

2
src/osgWidget/ViewerEventHandlers.cpp
View File

@ -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);

2
src/osgWrappers/introspection/osgGA/AnimationPathManipulator.cpp
View File

@ -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,

24
src/osgWrappers/introspection/osgGA/MatrixManipulator.cpp → src/osgWrappers/introspection/osgGA/CameraManipulator.cpp
View File

@ -15,9 +15,9 @@
#include <osg/Matrixd>
#include <osg/Node>
#include <osg/Vec3d>
#include <osgGA/CameraManipulator>
#include <osgGA/GUIActionAdapter>
#include <osgGA/GUIEventAdapter>
#include <osgGA/MatrixManipulator>
#include <osgUtil/SceneView>
// 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,
"",

2
src/osgWrappers/introspection/osgGA/CameraViewSwitchManipulator.cpp
View File

@ -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,
"",
"");

2
src/osgWrappers/introspection/osgGA/DriveManipulator.cpp
View File

@ -27,7 +27,7 @@
BEGIN_OBJECT_REFLECTOR(osgGA::DriveManipulator)
I_DeclaringFile("osgGA/DriveManipulator");
I_BaseType(osgGA::MatrixManipulator);
I_BaseType(osgGA::CameraManipulator);
I_Constructor0(____DriveManipulator,
"",
"");

6
src/osgWrappers/introspection/osgGA/FlightManipulator.cpp
View File

@ -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,

62
src/osgWrappers/introspection/osgGA/KeySwitchMatrixManipulator.cpp
View File

@ -14,10 +14,10 @@
#include <osg/Matrixd>
#include <osg/Node>
#include <osg/Vec3d>
#include <osgGA/CameraManipulator>
#include <osgGA/GUIActionAdapter>
#include <osgGA/GUIEventAdapter>
#include <osgGA/KeySwitchMatrixManipulator>
#include <osgGA/MatrixManipulator>
#include <osgUtil/SceneView>
// 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 > >)

6
src/osgWrappers/introspection/osgGA/NodeTrackerManipulator.cpp
View File

@ -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,

2
src/osgWrappers/introspection/osgGA/SphericalManipulator.cpp
View File

@ -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,
"",
"");

4
src/osgWrappers/introspection/osgGA/TerrainManipulator.cpp
View File

@ -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,

2
src/osgWrappers/introspection/osgGA/UFOManipulator.cpp
View File

@ -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. ",
"");

12
src/osgWrappers/introspection/osgTerrain/Terrain.cpp
View File

@ -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,

18
src/osgWrappers/introspection/osgViewer/View.cpp
View File

@ -21,9 +21,9 @@
#include <osg/View>
#include <osgDB/DatabasePager>
#include <osgDB/ImagePager>
#include <osgGA/CameraManipulator>
#include <osgGA/EventQueue>
#include <osgGA/GUIEventHandler>
#include <osgGA/MatrixManipulator>
#include <osgUtil/LineSegmentIntersector>
#include <osgUtil/SceneView>
#include <osgViewer/Scene>
@ -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,