[Gcblue-commits] gcb_wx/include/graphics tc3DViewer.h,1.13,1.14 tcDatabaseInfoWindow.h,1.2,1.3 tcDat
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2006-03-28 02:44:50
|
Update of /cvsroot/gcblue/gcb_wx/include/graphics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1488/include/graphics Modified Files: tc3DViewer.h tcDatabaseInfoWindow.h tcDatabaseViewer.h Log Message: Index: tcDatabaseInfoWindow.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcDatabaseInfoWindow.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcDatabaseInfoWindow.h 27 Mar 2006 01:08:30 -0000 1.2 --- tcDatabaseInfoWindow.h 28 Mar 2006 02:44:45 -0000 1.3 *************** *** 54,58 **** --- 54,63 ---- //virtual void OnRButtonDown(wxMouseEvent& event); + /// set database class name to display info for + void SetDatabaseClassName(const std::string& className); + + /// set id of game object to display info for (must be classified if track) void SetDatabaseObject(long id); + void SetDragable(bool state); Index: tc3DViewer.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tc3DViewer.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** tc3DViewer.h 22 Mar 2006 01:23:28 -0000 1.13 --- tc3DViewer.h 28 Mar 2006 02:44:45 -0000 1.14 *************** *** 62,69 **** --- 62,71 ---- osg::ref_ptr<osgUtil::SceneView> sceneViewFar; osg::ref_ptr<osgUtil::SceneView> guiView; + osg::ref_ptr<osgUtil::SceneView> databaseView; ///< for viewing database objects osg::ref_ptr<osg::DisplaySettings> displaySettings; osg::ref_ptr<osg::NodeVisitor> updateVisitor; osg::ref_ptr<osg::NodeVisitor> updateVisitorFar; + osg::ref_ptr<osgUtil::CullVisitor> cullVisitor; osg::ref_ptr<osg::NodeVisitor> guiUpdateVisitor; *************** *** 71,74 **** --- 73,77 ---- osg::ref_ptr<osg::FrameStamp> frameStampFar; osg::ref_ptr<osg::FrameStamp> guiFrameStamp; + osg::ref_ptr<osgText::Text> viewerText; ///< text for debug/basic viewer info display osg::ref_ptr<osg::MatrixTransform> guiObjects; *************** *** 81,84 **** --- 84,89 ---- osg::ref_ptr<osg::Group> rootnode; osg::ref_ptr<osg::Group> rootnodeFar; + osg::ref_ptr<osg::Group> databaseViewGroup; + osg::ref_ptr<osgParticle::ParticleSystemUpdater> particleSystemUpdater; *************** *** 152,155 **** --- 157,162 ---- void SetCameraEl(float el); void SetCameraRange(float range_m); + void SetDatabaseView(bool state); + void SetDatabaseViewClass(const std::string& databaseClass); void SetFogMode(int mode); void SetShakeAirCamera(bool state); *************** *** 181,184 **** --- 188,193 ---- bool useRelativeChildPos; ///< true to add children as children of parent transform group bool shakeAirCamera; ///< true to shake camera for air objects to simulate turbulence + bool databaseViewEnabled; ///< true for special view mode with database model as target + tcSimState *simState; int mnWidth; *************** *** 231,238 **** --- 240,249 ---- void InitSceneView(wxPoint pos, wxSize size); void InitSceneViewFar(wxPoint pos, wxSize size); + void InitDatabaseView(const wxPoint& pos, const wxSize& size); void InitState(); void InitText(); void SetOrigin(double lon, double lat); ///< sets origin of 3D world coordinates void UpdateCamera(); + void UpdateCameraDatabaseView(); void UpdateChildModels(tcGameObject *gameObj); bool UpdateOrigin(); Index: tcDatabaseViewer.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcDatabaseViewer.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tcDatabaseViewer.h 27 Mar 2006 01:08:30 -0000 1.1 --- tcDatabaseViewer.h 28 Mar 2006 02:44:45 -0000 1.2 *************** *** 36,39 **** --- 36,40 ---- class tcDatabaseInfoWindow; + class tc3DViewer; namespace osg *************** *** 64,68 **** --- 65,71 ---- void OnLButtonDown(wxMouseEvent& event); void OnMouseMove(wxMouseEvent& event); + void SelectDisplayClass(const std::string& className); void SetClassificationMask(unsigned int mask); + void Set3DViewer(tc3DViewer* viewer_); tcDatabaseViewer(wxWindow *parent, *************** *** 76,83 **** private: unsigned int classificationMask; ///< mask for current platform type on browse list ! long displayId; ///< id of current platform displayed ! std::string displayName; ///< class name of current platform displayed std::vector<BrowseItem> browseInfo; tcDatabaseInfoWindow* databaseInfoWindow; const wxRealPoint basePosition; --- 79,86 ---- private: unsigned int classificationMask; ///< mask for current platform type on browse list ! std::string displayClassName; ///< class name of current platform displayed std::vector<BrowseItem> browseInfo; tcDatabaseInfoWindow* databaseInfoWindow; + tc3DViewer* viewer; const wxRealPoint basePosition; |