[Gcblue-commits] gcb_wx/src/sim tcGameObject.cpp,1.12,1.13 tcGuidanceState.cpp,1.1,1.2 tcLauncherState.cpp,1.7,1.8 tcPlatformObject.cpp,1.18,1.19 tcSimState.cpp,1.38,1.39

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

Update of /cvsroot/gcblue/gcb_wx/src/sim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27636/src/sim

Modified Files:
	tcGameObject.cpp tcGuidanceState.cpp tcLauncherState.cpp 
	tcPlatformObject.cpp tcSimState.cpp 
Log Message:
Multiplayer related updates

Index: tcSimState.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcSimState.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** tcSimState.cpp	9 Apr 2004 03:08:09 -0000	1.38
--- tcSimState.cpp	13 Apr 2004 00:24:39 -0000	1.39
***************
*** 39,43 ****
  #include "tc3DModel.h"
  #include "tcGameObjIterator.h"
! 
  
  using namespace Database;
--- 39,43 ----
  #include "tc3DModel.h"
  #include "tcGameObjIterator.h"
! #include "common/tcStream.h"
  
  using namespace Database;
***************
*** 1517,1523 ****
          file.WriteString(buff);
  
!         std::stringstream test;
!         pplat->SaveToStream(test);
!         pplat->LoadFromStream(test);
  
          idx++;
--- 1517,1539 ----
          file.WriteString(buff);
  
!         /*
!         tcStream test2;
!         size_t s1 = test2.size();
! 
!         *pplat >> test2;
!         
!         size_t s2 = test2.size();
! 
!         pplat->Clear();
!         *pplat << test2;
! 
!         size_t s3 = test2.size();
! 
!         int x = 7;
!         test2 >> x;
!         
!         bool isEOF = false;
!         isEOF = test2.eof();
!         */
  
          idx++;

Index: tcPlatformObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcPlatformObject.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** tcPlatformObject.cpp	15 Feb 2004 19:47:23 -0000	1.18
--- tcPlatformObject.cpp	13 Apr 2004 00:24:39 -0000	1.19
***************
*** 31,34 ****
--- 31,35 ----
  #include "tcESMSensor.h"
  #include "tc3DModel.h"
+ #include "common/tcStream.h"
  
  using namespace AI;
***************
*** 465,468 ****
--- 466,493 ----
  }
  
+ /**
+ * Loads state from stream
+ */
+ tcStream& tcPlatformObject::operator<<(tcStream& stream)
+ {
+     tcGameObject::operator<<(stream);
+ 
+     mcGS << stream;
+ 
+     return stream;
+ }
+ 
+ /**
+ * Saves state to stream
+ */
+ tcStream& tcPlatformObject::operator>>(tcStream& stream)
+ {
+     tcGameObject::operator>>(stream);
+ 
+     mcGS >> stream;
+ 
+     return stream;
+ }
+ 
  /******************************************************************************/
  tcPlatformObject::tcPlatformObject() 

Index: tcLauncherState.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcLauncherState.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcLauncherState.cpp	12 Feb 2004 01:54:49 -0000	1.7
--- tcLauncherState.cpp	13 Apr 2004 00:24:39 -0000	1.8
***************
*** 26,29 ****
--- 26,86 ----
  #include "tcSimState.h"
  #include <iostream>
+ #include "common/tcStream.h"
+ 
+ /**
+ * Load state from stream
+ */
+ tcStream& tsLData::operator <<(tcStream& buffer)
+ {
+     buffer >> mbActive;
+     buffer >> mnDBKey; 
+     buffer >> mnChildDBKey;
+ 
+     buffer >> mfTimeToReady;
+     buffer >> mnCurrent;
+     buffer >> mnPending;
+ 
+     msDatum << buffer;
+ 
+     buffer >> mnTargetID; 
+     
+     int temp;
+     buffer >> temp;
+     meLaunchMode = (Database::teWeaponLaunchMode)temp;
+ 
+     buffer >> mnTargetFlags; 
+     buffer >> pointingAngle;
+     buffer >> fireControlSensorIdx; 
+ 
+     return buffer;
+ }
+ 
+ /**
+ * Save state to stream
+ */
+ tcStream& tsLData::operator >>(tcStream& buffer)
+ {
+     buffer << mbActive;
+     buffer << mnDBKey; 
+     buffer << mnChildDBKey;
+ 
+     buffer << mfTimeToReady;
+     buffer << mnCurrent;
+     buffer << mnPending;
+ 
+     msDatum >> buffer;
+ 
+     buffer << mnTargetID; 
+ 
+     int temp = (int)meLaunchMode;
+     buffer << temp;
+ 
+     buffer << mnTargetFlags; 
+     buffer << pointingAngle;
+     buffer << fireControlSensorIdx; 
+ 
+     return buffer;
+ }
+ 
  
  tcDatabase* tcLauncherState::mpDatabase = NULL;
***************
*** 332,335 ****
--- 389,425 ----
  }
  
+ /**
+ * Load state from stream
+ */
+ tcStream& tcLauncherState::operator<<(tcStream& buffer)
+ {
+     launchers.clear();
+ 
+     buffer >> mnCount;
+     for(int n = 0; n < mnCount; n++)
+     {
+         tsLData ldata;
+         ldata << buffer;
+         launchers.push_back(ldata);
+     }
+ 
+     return buffer;
+ }
+ 
+ /**
+ * Save state to stream
+ */
+ tcStream& tcLauncherState::operator>>(tcStream& buffer)
+ {
+     buffer << mnCount;
+     for(int n = 0; n < mnCount; n++)
+     {
+         tsLData& ldata = launchers[n];
+         ldata >> buffer;
+     }
+ 
+     return buffer;
+ }
+ 
  
  /**

Index: tcGuidanceState.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcGuidanceState.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcGuidanceState.cpp	4 Dec 2003 05:15:22 -0000	1.1
--- tcGuidanceState.cpp	13 Apr 2004 00:24:39 -0000	1.2
***************
*** 19,22 ****
--- 19,23 ----
  
  #include "tcGuidanceState.h"
+ #include "common/tcStream.h"
  
  /**
***************
*** 51,53 ****
--- 52,82 ----
      rsKinGoal.mfSpeed_kts = mfGoalSpeed_kts;
      rsKinGoal.mfAlt_m = mfGoalAltitude_m;
+ }
+ 
+ /**
+ * Loads state from stream
+ */
+ tcStream& tcGuidanceState::operator<<(tcStream& stream)
+ {
+     stream >> mfGoalHeading_deg;
+     stream >> mfGoalSpeed_kts;
+     stream >> mfGoalAltitude_m;
+     mcKinIntercept << stream;  
+     stream >> mbIntercept;
+ 
+     return stream;
+ }
+ 
+ /**
+ * Saves state to stream
+ */
+ tcStream& tcGuidanceState::operator>>(tcStream& stream)
+ {
+     stream << mfGoalHeading_deg;
+     stream << mfGoalSpeed_kts;
+     stream << mfGoalAltitude_m;
+     mcKinIntercept >> stream;  
+     stream << mbIntercept;
+     
+     return stream;
  }
\ No newline at end of file

Index: tcGameObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcGameObject.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tcGameObject.cpp	9 Apr 2004 03:08:09 -0000	1.12
--- tcGameObject.cpp	13 Apr 2004 00:24:39 -0000	1.13
***************
*** 29,54 ****
  #include "tc3DModel.h"
  #include "tcSimState.h"
  
  
! void tsRelativePosition::LoadFromStream(std::stringstream& buffer)
  {   
!     buffer.read((char*)&dx, sizeof(dx));
!     buffer.read((char*)&dy, sizeof(dy));
!     buffer.read((char*)&dz, sizeof(dz));
!     buffer.read((char*)&yaw, sizeof(yaw));
!     buffer.read((char*)&pitch, sizeof(pitch));
!     buffer.read((char*)&roll, sizeof(roll));
!     buffer.read((char*)&isVisible, sizeof(isVisible));
  }
  
! void tsRelativePosition::SaveToStream(std::stringstream& buffer)
  {    
!     buffer.write((char*)&dx, sizeof(dx));
!     buffer.write((char*)&dy, sizeof(dy));
!     buffer.write((char*)&dz, sizeof(dz));
!     buffer.write((char*)&yaw, sizeof(yaw));
!     buffer.write((char*)&pitch, sizeof(pitch));
!     buffer.write((char*)&roll, sizeof(roll));
!     buffer.write((char*)&isVisible, sizeof(isVisible));
  }
  
--- 29,65 ----
  #include "tc3DModel.h"
  #include "tcSimState.h"
+ #include "common/tcStream.h"
  
  
! /**
! * Loads state from stream
! */
! tcStream& tsRelativePosition::operator<<(tcStream& stream)
  {   
!     stream >> dx;
!     stream >> dy;
!     stream >> dz;
!     stream >> yaw;
!     stream >> pitch;
!     stream >> roll;
!     stream >> isVisible;
! 
!     return stream;
  }
  
! /**
! * Saves state to stream
! */
! tcStream& tsRelativePosition::operator>>(tcStream& stream)
  {    
!     stream << dx;
!     stream << dy;
!     stream << dz;
!     stream << yaw;
!     stream << pitch;
!     stream << roll;
!     stream << isVisible;
! 
!     return stream;
  }
  
***************
*** 256,306 ****
  
  /**
! * Loads object state from stream
  */
! void tcGameObject::LoadFromStream(std::stringstream& buffer)
  {
!     rel_pos.LoadFromStream(buffer);
  
!     buffer.read((char*)&mnModelType, sizeof(mnModelType));
!     buffer.read((char*)&mnID, sizeof(mnID));
  
!     mzClass << buffer;
  
!     buffer.read((char*)&mnDBKey, sizeof(mnID));
  
!     mzUnit << buffer;
  
!     buffer.read((char*)&mnAlliance, sizeof(mnAlliance));          
!     buffer.read((char*)&mfStatusTime, sizeof(mfStatusTime));
  
!     mcKin.LoadFromStream(buffer);       
  
!     buffer.read((char*)&mfDamageLevel, sizeof(mfDamageLevel));
  }
  
  /**
! * Saves object state to stream
  */
! void tcGameObject::SaveToStream(std::stringstream& buffer)
  {
!     rel_pos.SaveToStream(buffer);
  
!     buffer.write((char*)&mnModelType, sizeof(mnModelType));
!     buffer.write((char*)&mnID, sizeof(mnID));
  
!     mzClass >> buffer;
  
!     buffer.write((char*)&mnDBKey, sizeof(mnID));
!   
!     mzUnit >> buffer;
  
!     buffer.write((char*)&mnAlliance, sizeof(mnAlliance));          
!     buffer.write((char*)&mfStatusTime, sizeof(mfStatusTime));
  
!     mcKin.SaveToStream(buffer);       
  
!     buffer.write((char*)&mfDamageLevel, sizeof(mfDamageLevel));
  }
  
  /**
   *
--- 267,322 ----
  
  /**
! * Loads state from stream
  */
! tcStream& tcGameObject::operator<<(tcStream& stream)
  {
!     rel_pos << stream;
  
!     stream >> mnModelType;
!     stream >> mnID;
  
!     mzClass << stream;
  
!     stream >> mnDBKey;
  
!     mzUnit << stream;
  
!     stream >> mnAlliance;
!     stream >> mfStatusTime;
  
!     mcKin << stream;       
  
!     stream >> mfDamageLevel;
! 
!     return stream;
  }
  
  /**
! * Saves state to stream
  */
! tcStream& tcGameObject::operator>>(tcStream& stream)
  {
!     rel_pos >> stream;
  
!     stream << mnModelType;
!     stream << mnID;
  
!     mzClass >> stream;
  
!     stream << mnDBKey;
  
!     mzUnit >> stream;
  
!     stream << mnAlliance;
!     stream << mfStatusTime;
  
!     mcKin >> stream;
! 
!     stream << mfDamageLevel;
! 
!     return stream;
  }
  
+ 
  /**
   *