[Gcblue-commits] gcb_wx/include/database tcDatabaseObject.h,1.28,1.29
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2006-03-27 01:08:34
|
Update of /cvsroot/gcblue/gcb_wx/include/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18413/include/database Modified Files: tcDatabaseObject.h Log Message: Index: tcDatabaseObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDatabaseObject.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** tcDatabaseObject.h 23 Mar 2006 01:12:11 -0000 1.28 --- tcDatabaseObject.h 27 Mar 2006 01:08:30 -0000 1.29 *************** *** 34,37 **** --- 34,38 ---- #include "gctypes.h" #include <osg/ref_ptr> + #include <wx/string.h> class tc3DModel; *************** *** 125,133 **** - #define DESCRIPTION_STRING_LENGTH 512 class tcDatabaseObject { public: tcDBString mzClass; ///< name of platform class, e.g. "Spruance" long mnKey; ///< key of this object in map --- 126,134 ---- class tcDatabaseObject { public: + enum {DESCRIPTION_STRING_LENGTH = 512}; tcDBString mzClass; ///< name of platform class, e.g. "Spruance" long mnKey; ///< key of this object in map *************** *** 136,140 **** UINT mnModelType; ///< model class to use, e.g. tcSurfaceObject, tcAirObject float cost; ///< default cost for scoring purposes ! tcDBString mzImageFileName; ///< used for icon file name tcDBString mz3DModelFileName; char mzDescription[DESCRIPTION_STRING_LENGTH]; --- 137,142 ---- UINT mnModelType; ///< model class to use, e.g. tcSurfaceObject, tcAirObject float cost; ///< default cost for scoring purposes ! std::string imageList; ///< semicolon delimited list of image files for DB info window ! tcDBString iconFileName; ///< used for icon file name tcDBString mz3DModelFileName; char mzDescription[DESCRIPTION_STRING_LENGTH]; *************** *** 146,149 **** --- 148,152 ---- virtual tc3DModel* Copy3DModel(); ///< creates copy of model (must be deleted) virtual tc3DModel* Get3DModel(); ///< gets pointer to database model + const wxArrayString& GetParsedImageList(); osg::Geometry* GetIcon(); bool IsLeaf() const; ///< returns true if db obj is a leaf obj *************** *** 171,174 **** --- 174,178 ---- tc3DModel *model; osg::ref_ptr<osg::Geometry> icon; ///< icon for drag/drop container gui + wxArrayString parsedImageList; }; |