[Gcblue-commits] gcb_wx/include/database tcDatabaseObject.h,1.22,1.23

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/include/database
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5785/include/database

Modified Files:
	tcDatabaseObject.h 
Log Message:
Initial commit for drag and drop icon gui

Index: tcDatabaseObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDatabaseObject.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** tcDatabaseObject.h	1 Jun 2005 00:13:26 -0000	1.22
--- tcDatabaseObject.h	11 Jun 2005 21:01:42 -0000	1.23
***************
*** 29,33 ****
  #include "wx/wx.h" 
  
- 
  #include "tcString.h"
  #include "tcFile.h"
--- 29,32 ----
***************
*** 138,142 ****
          UINT mnType;                        ///< functional classification type: helo, air, surf, sub, land
          UINT mnModelType;                   ///<  model class to use, e.g. tcSurfaceObject, tcAirObject
!         tcDBString mzImageFileName;
          tcDBString mz3DModelFileName;
          char mzDescription[DESCRIPTION_STRING_LENGTH];
--- 137,141 ----
          UINT mnType;                        ///< functional classification type: helo, air, surf, sub, land
          UINT mnModelType;                   ///<  model class to use, e.g. tcSurfaceObject, tcAirObject
!         tcDBString mzImageFileName;         ///< used for icon file name
          tcDBString mz3DModelFileName;
          char mzDescription[DESCRIPTION_STRING_LENGTH];
***************
*** 146,151 ****
--- 145,152 ----
          virtual tc3DModel* Copy3DModel(); ///< creates copy of model (must be deleted)
          virtual tc3DModel* Get3DModel(); ///< gets pointer to database model
+ 		osg::Geometry* GetIcon();
          bool IsLeaf() const; ///< returns true if db obj is a leaf obj
          void Load3DModel();
+ 		void LoadIcon();
          void RandInit(void);
          virtual void PrintToFile(tcFile& file);
***************
*** 169,173 ****
          tc3DModel *model;
  		osg::ref_ptr<osg::Geometry> icon; ///< icon for drag/drop container gui
- 
      };
      
--- 170,173 ----