[Gcblue-commits] gcb_wx/include/sim tc3DViewer.h,1.15,1.16 tcDirector.h,1.3,1.4
Status: Alpha
Brought to you by:
ddcforge
From: <ddc...@us...> - 2003-12-31 00:23:26
|
Update of /cvsroot/gcblue/gcb_wx/include/sim In directory sc8-pr-cvs1:/tmp/cvs-serv31613/include/sim Modified Files: tc3DViewer.h tcDirector.h Log Message: More camera views Index: tc3DViewer.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tc3DViewer.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** tc3DViewer.h 11 Dec 2003 01:40:57 -0000 1.15 --- tc3DViewer.h 31 Dec 2003 00:23:22 -0000 1.16 *************** *** 103,112 **** --- 103,117 ---- void DirtyAll(); void Frame(); + Producer::Vec3 GetCameraPosition(); Producer::Vec3 GetObjectPosition(tcGameObject *obj); bool IsActive() {return isActive;} void LoadModel(tcGameObject *obj); void SetActive(bool b) {isActive = b;wxWindow::Enable(b);} + void SetCameraMode(bool lookAt, bool moveWith); void SetGameTime(double t); + void SetGeoPosition(double lon_rad, double lat_rad, float alt_m); void SetHookID(long id) {hookID = id;} + void SetLook(float az, float el); + void SetMoveWithVector(float az, float el, float range); void SetText(const char *s); void ToggleFog(); *************** *** 142,150 **** // camera parameters Producer::Vec3 cameraPosition; ///< current position of camera ! Producer::Vec3 cameraTarget; ///< point camera is looking at ! float cameraAz; ///< camera azimuth ! float cameraEl; ///< camera elevation ! float cameraRange; ///< range of camera wxPoint clickPoint; ///< anchor point for mouse look float azStart; ///< camera az start for mouse look --- 147,162 ---- // camera parameters + bool lookAtTarget; ///< true to make camera point at target + bool moveWithTarget; ///< true to make camera move with target + double cameraLongitude; ///< lon,lat,alt pos of camera for non moveWith modes + double cameraLatitude; ///< radians + float cameraAltitude; ///< meters Producer::Vec3 cameraPosition; ///< current position of camera ! Producer::Vec3 cameraTarget; ///< point camera is looking at for lookAt modes ! float cameraAz; ///< camera azimuth relative to target for moveWith modes ! float cameraEl; ///< camera elevation relative to target for moveWith modes ! float cameraRange; ///< range of camera relative to target for moveWith modes ! float cameraLookAz; ///< look az for non-lookat modes ! float cameraLookEl; ///< look el for non-lookat modes wxPoint clickPoint; ///< anchor point for mouse look float azStart; ///< camera az start for mouse look Index: tcDirector.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcDirector.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcDirector.h 29 Dec 2003 01:10:25 -0000 1.3 --- tcDirector.h 31 Dec 2003 00:23:22 -0000 1.4 *************** *** 33,36 **** --- 33,37 ---- class tcSound; class tcConsole; + class tc3DViewer; namespace MapView *************** *** 62,69 **** void Update(double t); ! tcDirector(tcMapView *mv, tcSound *soundInterface, tcConsole *console, wxWindow *win); ~tcDirector(); private: tcMapView *mapView; ///< tcMapView object for map events (only one supported currently) }; --- 63,71 ---- void Update(double t); ! tcDirector(tc3DViewer *view3D, tcMapView *mv, tcSound *soundInterface, tcConsole *console, wxWindow *win); ~tcDirector(); private: tcMapView *mapView; ///< tcMapView object for map events (only one supported currently) + tc3DViewer *viewer; ////< tc3DViewer object for camera events }; |