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

Simplified Command and CommandManager

Browse Source
This commit is contained in:
Robert Osfield
2009-06-30 13:00:58 +00:00
parent 1ce5b648ab
commit 7904fe71a5
7 changed files with 43 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
include/osgManipulator/Command
View File

@@ -51,23 +51,8 @@ class OSGMANIPULATOR_EXPORT MotionCommand : public osg::Referenced
MotionCommand();
/** Execute the command. */
virtual bool execute() = 0;
/** Undo the command. The inverse of this command is executed. */
virtual bool unexecute() = 0;
/** Apply a constraint to the command. */
virtual void applyConstraint(const Constraint*) = 0;
/**
* Add Selection (receiver) to the command. The command will be
* executed on all the selections.
*/
void addSelection(Selection*);
/** Remove Selection (receiver) from the command. */
void removeSelection(Selection*);
/** create a MotionCommand that is the inverse of this command, and if applied will undo this commands changes. */
virtual MotionCommand* createCommandInverse() = 0;
/**
* Gets the matrix for transforming the Selection. This matrix is in the
@@ -103,18 +88,12 @@ class OSGMANIPULATOR_EXPORT MotionCommand : public osg::Referenced
protected:
virtual ~MotionCommand();
typedef std::vector< osg::ref_ptr<Selection> > SelectionList;
SelectionList& getSelectionList() { return _selectionList; }
const SelectionList& getSelectionList() const { return _selectionList; }
private:
osg::Matrix _localToWorld;
osg::Matrix _worldToLocal;
Stage _stage;
SelectionList _selectionList;
};
@@ -129,9 +108,7 @@ class OSGMANIPULATOR_EXPORT TranslateInLineCommand : public MotionCommand
TranslateInLineCommand(const osg::LineSegment::vec_type& s, const osg::LineSegment::vec_type& e);
virtual bool execute();
virtual bool unexecute();
virtual void applyConstraint(const Constraint*);
virtual MotionCommand* createCommandInverse();
inline void setLine(const osg::LineSegment::vec_type& s, const osg::LineSegment::vec_type& e) { _line->start() = s; _line->end() = e; }
inline const osg::LineSegment::vec_type& getLineStart() const { return _line->start(); }
@@ -165,9 +142,7 @@ class OSGMANIPULATOR_EXPORT TranslateInPlaneCommand : public MotionCommand
TranslateInPlaneCommand(const osg::Plane& plane);
virtual bool execute();
virtual bool unexecute();
virtual void applyConstraint(const Constraint*);
virtual MotionCommand* createCommandInverse();
inline void setPlane(const osg::Plane& plane) { _plane = plane; }
inline const osg::Plane& getPlane() const { return _plane; }
@@ -203,9 +178,7 @@ class OSGMANIPULATOR_EXPORT Scale1DCommand : public MotionCommand
Scale1DCommand();
virtual bool execute();
virtual bool unexecute();
virtual void applyConstraint(const Constraint*);
virtual MotionCommand* createCommandInverse();
inline void setScale(double s) { _scale = s; }
inline double getScale() const { return _scale; }
@@ -247,9 +220,7 @@ class OSGMANIPULATOR_EXPORT Scale2DCommand : public MotionCommand
Scale2DCommand();
virtual bool execute();
virtual bool unexecute();
virtual void applyConstraint(const Constraint*);
virtual MotionCommand* createCommandInverse();
inline void setScale(const osg::Vec2d& s) { _scale = s; }
inline const osg::Vec2d& getScale() const { return _scale; }
@@ -291,9 +262,7 @@ class OSGMANIPULATOR_EXPORT ScaleUniformCommand : public MotionCommand
ScaleUniformCommand();
virtual bool execute();
virtual bool unexecute();
virtual void applyConstraint(const Constraint*);
virtual MotionCommand* createCommandInverse();
inline void setScale(double s) { _scale = s; }
inline double getScale() const { return _scale; }
@@ -326,9 +295,7 @@ class OSGMANIPULATOR_EXPORT Rotate3DCommand : public MotionCommand
Rotate3DCommand();
virtual bool execute();
virtual bool unexecute();
virtual void applyConstraint(const Constraint*);
virtual MotionCommand* createCommandInverse();
inline void setRotation(const osg::Quat& rotation) { _rotation = rotation; }
inline const osg::Quat& getRotation() const { return _rotation; }

8
include/osgManipulator/CommandManager
View File

@@ -22,7 +22,7 @@
namespace osgManipulator {
/**
* Command manager receives commands from draggers and dispatches them to selections.
* Deprecated. CommandManager class is now no longer required as Dragger now matains all references to Constraints and Selections.
*/
class OSGMANIPULATOR_EXPORT CommandManager : public osg::Referenced
{
@@ -41,12 +41,6 @@ class OSGMANIPULATOR_EXPORT CommandManager : public osg::Referenced
/** Disconnect the selections from a dragger. */
virtual bool disconnect(Dragger& dragger);
/** Dispatches a command. Usually called from a dragger. */
virtual void dispatch(MotionCommand& command);
/** Add all selections connected to the dragger to the command. */
void addSelectionsToCommand(MotionCommand& command, Dragger& dragger);
typedef std::list< osg::ref_ptr<Selection> > Selections;
/** Returns the selections connected to the dragger */