[Gcblue-commits] gcb_wx/include/graphics tcFlightportGui.h,1.1,1.2 tcLauncherContainerItem.h,1.1,1.2 tcPlatformGui.h,1.2,1.3 tcScenarioSelectView.h,1.3,1.4 tcStoresContainerItem.h,1.1,1.2 tcStoresGui.h,1.1,1.2

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

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

Modified Files:
	tcFlightportGui.h tcLauncherContainerItem.h tcPlatformGui.h 
	tcScenarioSelectView.h tcStoresContainerItem.h tcStoresGui.h 
Log Message:
Misc housekeeping, updates for infrared and anti-radiation seekers, more info for multiplayer airfield units, icon gui enhancements

Index: tcStoresContainerItem.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcStoresContainerItem.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcStoresContainerItem.h	11 Jun 2005 21:01:43 -0000	1.1
--- tcStoresContainerItem.h	22 Jun 2005 01:21:26 -0000	1.2
***************
*** 40,50 ****
  public:
  	tcStores* GetStores() const;
! 	void SetStores(tcStores* stores);
  
      tcStoresContainerItem();
      virtual ~tcStoresContainerItem(); 
  private:
! 
! 	tcStores* parent; ///< stores object that holds this item
  };
  
--- 40,51 ----
  public:
  	tcStores* GetStores() const;
! 	void SetStores(long id, long host, unsigned int idx);
  
      tcStoresContainerItem();
      virtual ~tcStoresContainerItem(); 
  private:
! 	long platformId;
! 	long hostId;
! 	unsigned int storesIdx;
  };
  

Index: tcLauncherContainerItem.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcLauncherContainerItem.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcLauncherContainerItem.h	11 Jun 2005 21:01:43 -0000	1.1
--- tcLauncherContainerItem.h	22 Jun 2005 01:21:26 -0000	1.2
***************
*** 41,50 ****
  	tcLauncher* GetLauncher() const;
  	unsigned int GetLauncherIndex() const;
! 	void SetLauncher(tcLauncher* launcher, unsigned int idx);
  
      tcLauncherContainerItem();
      virtual ~tcLauncherContainerItem(); 
  private:
! 	tcLauncher* parent; ///< launcher object that holds this item
  	unsigned int launcherIdx; ///< index of launcher on parent platform
  };
--- 41,51 ----
  	tcLauncher* GetLauncher() const;
  	unsigned int GetLauncherIndex() const;
! 	void SetLauncher(long id, long host, unsigned int idx);
  
      tcLauncherContainerItem();
      virtual ~tcLauncherContainerItem(); 
  private:
! 	long platformId;
! 	long hostId;
  	unsigned int launcherIdx; ///< index of launcher on parent platform
  };

Index: tcStoresGui.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcStoresGui.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcStoresGui.h	11 Jun 2005 21:01:43 -0000	1.1
--- tcStoresGui.h	22 Jun 2005 01:21:26 -0000	1.2
***************
*** 52,61 ****
  
  
!     tcStoresGui(tcStores* obj, const wxPoint& pos, 
  		const wxString& configFile);
  
      virtual ~tcStoresGui();
  private:
! 	tcStores* stores;
  
      float slotSize; ///< dimension of (square) slot
--- 52,63 ----
  
  
!     tcStoresGui(long id, long host, unsigned int idx, const wxPoint& pos, 
  		const wxString& configFile);
  
      virtual ~tcStoresGui();
  private:
! 	const long platformId; ///< id of platform that holds the stores object
! 	const long hostId; ///< -1 if none, or id of host platform
! 	const unsigned int storesIdx; ///< idx of stores on platform
  
      float slotSize; ///< dimension of (square) slot
***************
*** 66,70 ****
      
      void AddOrUpdateItem(tcContainerSlot& slot, const std::string& itemName,
!              unsigned int quantity);
  	void HandleDrop(size_t slotIdx, tcContainerItem* item);
      void InitializeGui();
--- 68,73 ----
      
      void AddOrUpdateItem(tcContainerSlot& slot, const std::string& itemName,
!              unsigned int quantity, tcStores* stores);
! 	tcStores* GetStores();
  	void HandleDrop(size_t slotIdx, tcContainerItem* item);
      void InitializeGui();

Index: tcScenarioSelectView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcScenarioSelectView.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcScenarioSelectView.h	6 Nov 2004 15:13:40 -0000	1.3
--- tcScenarioSelectView.h	22 Jun 2005 01:21:26 -0000	1.4
***************
*** 107,110 ****
--- 107,112 ----
  	const float yHeightDir; ///< vertical spacing between directory and next item
  	const float yStart;
+ 	const float fontSizeDirectory; ///< font size for directory name
+ 	const float fontSizeScenario; ///< font size for scenario file name
  	const wxRealPoint basePosition;
  	wxPoint mousePosition;

Index: tcFlightportGui.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcFlightportGui.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcFlightportGui.h	11 Jun 2005 21:01:43 -0000	1.1
--- tcFlightportGui.h	22 Jun 2005 01:21:26 -0000	1.2
***************
*** 43,47 ****
  	void SetDescription(const std::string& s);
  	void SetDescription(const char* s);
! 	void SetEntity(tcGameObject* obj);
  
      tcEntityContainerItem();
--- 43,47 ----
  	void SetDescription(const std::string& s);
  	void SetDescription(const char* s);
! 	void SetEntity(long id, long host);
  
      tcEntityContainerItem();
***************
*** 49,53 ****
  private:
  	std::string description;
! 	tcGameObject* entity;
  };
  
--- 49,54 ----
  private:
  	std::string description;
! 	long platformId;
! 	long hostId;
  };
  
***************
*** 72,76 ****
  
  
!     tcFlightPortGui(tcFlightPort* obj, const wxPoint& pos, 
  		const wxString& configFile);
  
--- 73,77 ----
  
  
!     tcFlightPortGui(long id, const wxPoint& pos, 
  		const wxString& configFile);
  
***************
*** 80,84 ****
      
  private:
!     tcFlightPort* flightPort;
      size_t launchOffset; ///< slot index of first launch spot (normally 0)
      size_t readyOffset; ///< slot index of first ready spot
--- 81,86 ----
      
  private:
! 	const long platformId; ///< id of platform that holds flightport
! 
      size_t launchOffset; ///< slot index of first launch spot (normally 0)
      size_t readyOffset; ///< slot index of first ready spot
***************
*** 98,101 ****
--- 100,104 ----
      void AddOrUpdateItem(tcContainerSlot& slot, tcAirState* airState);
  	void CloseAllPlatformGuis();
+ 	tcFlightPort* GetFlightPort();
      void InitializeGui();
  	void OpenPlatformGui(tcContainerItem* item);

Index: tcPlatformGui.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcPlatformGui.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcPlatformGui.h	12 Jun 2005 20:46:27 -0000	1.2
--- tcPlatformGui.h	22 Jun 2005 01:21:26 -0000	1.3
***************
*** 68,78 ****
  
  
!     tcPlatformGui(tcPlatformObject* obj, const wxPoint& pos, 
  		const wxString& configFile);
  
      virtual ~tcPlatformGui();
  private:
! 	tcPlatformObject* platform;
! 	tcFlightOpsObject* flightOps;
  	
      osg::ref_ptr<osg::Geometry> magazineIcon;
--- 68,78 ----
  
  
!     tcPlatformGui(long id, long host, const wxPoint& pos, 
  		const wxString& configFile);
  
      virtual ~tcPlatformGui();
  private:
! 	const long platformId;
! 	const long hostId; ///< -1 for none, or id of parent that is holding this platform, e.g. flightport
  	
      osg::ref_ptr<osg::Geometry> magazineIcon;
***************
*** 98,102 ****
      void AddOrUpdateLauncherItem(tcContainerSlot& slot, tcDatabaseObject* child,
               tcLauncher* launcher, unsigned int launcherIdx, unsigned int quantity);
! 	void GetLauncherCompatibilityCaption(unsigned int launcherIdx, wxString& caption);
  	void HandleDrop(size_t slotIdx, tcContainerItem* item);
  	void HandleFuelDrop(tcStoresContainerItem* item);
--- 98,104 ----
      void AddOrUpdateLauncherItem(tcContainerSlot& slot, tcDatabaseObject* child,
               tcLauncher* launcher, unsigned int launcherIdx, unsigned int quantity);
! 	void GetLauncherCompatibilityCaption(unsigned int launcherIdx, wxString& caption, tcPlatformObject* platform);
! 	tcFlightOpsObject* GetFlightOps();
! 	tcPlatformObject* GetPlatform();
  	void HandleDrop(size_t slotIdx, tcContainerItem* item);
  	void HandleFuelDrop(tcStoresContainerItem* item);