[Gcblue-commits] gcb_wx/include/sim tcDirectorEvent.h,1.2,1.3
Status: Alpha
Brought to you by:
ddcforge
From: <ddc...@us...> - 2003-12-31 17:34:13
|
Update of /cvsroot/gcblue/gcb_wx/include/sim In directory sc8-pr-cvs1:/tmp/cvs-serv30143/include/sim Modified Files: tcDirectorEvent.h Log Message: FlybyCamera event Index: tcDirectorEvent.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcDirectorEvent.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcDirectorEvent.h 22 Dec 2003 02:32:37 -0000 1.2 --- tcDirectorEvent.h 31 Dec 2003 17:34:10 -0000 1.3 *************** *** 40,43 **** --- 40,44 ---- class tcSound; class tcConsole; + class tc3DViewer; using MapView::tcMapView; *************** *** 81,109 **** - - /** - * An event that manipulates the camera in the 3D viewer - */ - class tcCameraEvent : public tcDirectorEvent - { - public: - double latitudeDatum; ///< radian reference for fixed camera - double longitudeDatum; ///< radian reference for fixed camera - Producer::Vec3 cameraStartPosition; ///< cartesian coord offset from datum, meters - Producer::Vec3 cameraEndPosition; ///< cartesian coord offset from datum, meters - Producer::Vec3 cameraTargetPosition; ///< cartesian coord offset from datum, meters - - Producer::Vec3 GetPosition(double lon_zero, double lat_zero, double t); - void SetDatum(double lon_rad, double lat_rad); - void SetEndPosition(float x, float y, float z); - void SetTargetPosition(float x, float y, float z); - void SetStartPosition(float x, float y, float z); - virtual void Update(double t); - tcCameraEvent(); - virtual ~tcCameraEvent(); - }; - - - /** * Displays text on map window, updates text properties --- 82,85 ---- *************** *** 209,212 **** --- 185,223 ---- + + /** + * An event that manipulates the camera in the 3D viewer + */ + class tcCameraEvent : public tcDirectorEvent + { + public: + static tc3DViewer *viewer; + long targetID; + bool moveWithTarget; + bool lookAtTarget; + + static void AttachViewer(tc3DViewer *v) {viewer = v;} + virtual void Update(double t); + + tcCameraEvent(double tStart, double tStop); + virtual ~tcCameraEvent(); + }; + + class tcFlybyCameraEvent : public tcCameraEvent + { + public: + float startAz; + float startEl; + float startRange; + float stopAz; + float stopEl; + float stopRange; + + virtual void Update(double t); + + tcFlybyCameraEvent(double tStart, double tStop, long targID, + float az1, float az2, float el1, float el2, float r1, float r2); + virtual ~tcFlybyCameraEvent(); + }; |