[Gcblue-commits] gcb_wx/include/graphics tc3DModel.h,1.12,1.13 tcNumberWidget.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-serv20285/include/graphics

Modified Files:
	tc3DModel.h tcNumberWidget.h 
Log Message:
Moved launcher position to 3D model animation xml file
Added tcGroundObject for ground SAM site

Index: tc3DModel.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tc3DModel.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tc3DModel.h	27 Jan 2005 01:01:44 -0000	1.12
--- tc3DModel.h	31 Jan 2005 01:32:36 -0000	1.13
***************
*** 72,75 ****
--- 72,77 ----
  };
  
+ 
+ 
  class TiXmlDocument;
  
***************
*** 97,100 ****
--- 99,103 ----
  
      tcGameObject* GetGameObj() {return gameObj;}
+     void GetLauncherInfo(unsigned int idx, osg::Vec3& pos, float& az);
      osg::ref_ptr<osg::Node> GetNode(); 
      unsigned int GetNumParents();
***************
*** 122,129 ****
--- 125,138 ----
  
  private:
+     struct LauncherMountInfo
+     {
+         osg::Vec3 position; ///< start pos for launched item in body coords, default (0,0,0)
+         float pointingAzimuth; ///< start rel az of launched item rel to nose, default 0
+     };
      tcSmoker smokeTrails;
  
      ///< position of smoke emitters in model coordinates for afterburner and propeller
      std::vector<osg::Vec3> engineSmokeSources; 
+     std::vector<LauncherMountInfo> launcherInfo;
  
      int smokeMode;
***************
*** 156,159 ****
--- 165,169 ----
      void Load(std::string model_name);
      void LoadXmlAnimationInfo(TiXmlDocument* doc);
+     void LoadXmlMountInfo(TiXmlDocument* doc);
      void LoadXmlSmokeInfo(TiXmlDocument* doc);
      void ProcessAnimations();

Index: tcNumberWidget.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcNumberWidget.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcNumberWidget.h	28 Dec 2004 00:42:35 -0000	1.1
--- tcNumberWidget.h	31 Jan 2005 01:32:36 -0000	1.2
***************
*** 53,57 ****
      void SetFontSize(float size);
      void SetSendRedraw(bool state);
!     void SetSoundEffect(int effect) {soundEffect = effect;}
  
      tcNumberWidget(float& param, tc3DWindow *parent, const wxPoint& pos, const wxSize& size,
--- 53,57 ----
      void SetFontSize(float size);
      void SetSendRedraw(bool state);
!     void SetSoundEffect(const std::string& effect) {soundEffect = effect;}
  
      tcNumberWidget(float& param, tc3DWindow *parent, const wxPoint& pos, const wxSize& size,
***************
*** 66,70 ****
     
      bool isMouseOver;
!     int soundEffect;
      float fontSize;
  
--- 66,70 ----
     
      bool isMouseOver;
!     std::string soundEffect;
      float fontSize;