From: <de...@us...> - 2004-04-07 13:03:40
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include/Views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19872 Modified Files: CameraKinematics.h CameraCommand.h CameraAgent.h Log Message: see CHANGES.current Index: CameraKinematics.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Views/CameraKinematics.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CameraKinematics.h 3 Apr 2004 22:19:01 -0000 1.1 --- CameraKinematics.h 7 Apr 2004 12:50:33 -0000 1.2 *************** *** 62,65 **** --- 62,67 ---- void zoomOut(); void zoomStop(); + void zoomStepIn(); + void zoomStepOut(); void displacement(int x, int y, int dx, int dy); void setAngleX(double angle_x) {m_AngleRotX = angle_x;} Index: CameraCommand.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Views/CameraCommand.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CameraCommand.h 3 Apr 2004 22:19:01 -0000 1.1 --- CameraCommand.h 7 Apr 2004 12:50:34 -0000 1.2 *************** *** 135,138 **** --- 135,155 ---- }; + class ZoomStepIn: public CameraCommand { + public: + virtual void execute() { + m_CameraKinematics->zoomStepIn(); + } + virtual ~ZoomStepIn(){} + }; + + + class ZoomStepOut: public CameraCommand { + public: + virtual void execute() { + m_CameraKinematics->zoomStepOut(); + } + virtual ~ZoomStepOut(){} + }; + class MouseCommand: public CameraCommand { int m_x,m_y,m_dx,m_dy; Index: CameraAgent.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Views/CameraAgent.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CameraAgent.h 3 Apr 2004 22:19:01 -0000 1.1 --- CameraAgent.h 7 Apr 2004 12:50:42 -0000 1.2 *************** *** 48,52 **** void attach(size_t mode,View* vm); void set(size_t vm, CameraCommand* ck = 0); ! void notifyObjectToViews(const simdata::Ref<DynamicObject> object); void updateCamera(double dt); const simdata::Vector3& getEyePoint() const {return m_EyePoint;} --- 48,52 ---- void attach(size_t mode,View* vm); void set(size_t vm, CameraCommand* ck = 0); ! void setObject(const simdata::Ref<DynamicObject> object); void updateCamera(double dt); const simdata::Vector3& getEyePoint() const {return m_EyePoint;} |