[Csp-commits] svn:csp r1021 - trunk/CSP/CSPSim/Source

[<sv...@ww...>]

Author: wolverine
Date: 2004-06-12 11:29:08 -0700 (Sat, 12 Jun 2004)
New Revision: 1021

Modified:
   trunk/CSP/CSPSim/Source/ClientNode.cpp
   trunk/CSP/CSPSim/Source/DynamicObject.cpp
Log:
Changed network code to use MemoryReader in SimData

Modified: trunk/CSP/CSPSim/Source/ClientNode.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ClientNode.cpp	2004-06-12 18:28:52 UTC (rev 1020)
+++ trunk/CSP/CSPSim/Source/ClientNode.cpp	2004-06-12 18:29:08 UTC (rev 1021)
@@ -99,8 +99,8 @@
  // ptrPayload->timeStamp = 1.0;
 
   simdata::MemoryWriter writer((simdata::uint8 *)ptrPayload);
-  writer << (int)id;
-  writer << (int)type;
+  writer << id;
+  writer << type;
   writer << timestamp;
   
 //  b_GlobalPosition->value().writeBinary((unsigned char *)&(ptrPayload->globalPosition),24);

Modified: trunk/CSP/CSPSim/Source/DynamicObject.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/DynamicObject.cpp	2004-06-12 18:28:52 UTC (rev 1020)
+++ trunk/CSP/CSPSim/Source/DynamicObject.cpp	2004-06-12 18:29:08 UTC (rev 1021)
@@ -405,9 +405,9 @@
 //  b_Attitude->value().writeBinary((unsigned char *)&(ptrPayload->attitude),32);
  
   simdata::MemoryWriter writer((simdata::uint8*)ptrPayload);
-  writer << (int)m_ID;
+  writer << m_ID;
   simdata::uint32 objType = 1;
-  writer << (int)objType;
+  writer << objType;
   writer << CSPSim::theSim->getElapsedTime();
   b_GlobalPosition->value().serialize(writer);
   b_LinearVelocity->value().serialize(writer);
@@ -441,11 +441,23 @@
   //ptrPayload->timeStamp = CSPSim::theSim->getElapsedTime();
   //
   //load the other values.
-  b_GlobalPosition->value().readBinary((unsigned char*)&(ptrPayload->globalPosition),24);
-  b_LinearVelocity->value().readBinary((unsigned char *)&(ptrPayload->linearVelocity),24);
-  b_AngularVelocity->value().readBinary((unsigned char *)&(ptrPayload->angularVelocity),24);
-  b_Attitude->value().readBinary((unsigned char *)&(ptrPayload->attitude),32);
+  //b_GlobalPosition->value().readBinary((unsigned char*)&(ptrPayload->globalPosition),24);
+  //b_LinearVelocity->value().readBinary((unsigned char *)&(ptrPayload->linearVelocity),24);
+  //b_AngularVelocity->value().readBinary((unsigned char *)&(ptrPayload->angularVelocity),24);
+  //b_Attitude->value().readBinary((unsigned char *)&(ptrPayload->attitude),32);
   
+  unsigned int _id;
+  unsigned  _type;
+  float _timestamp;
+  
+  simdata::MemoryReader reader((simdata::uint8*)ptrPayload);
+  reader >> _id;
+  reader >> _type;
+  reader >> _timestamp;
+  b_GlobalPosition->value().serialize(reader);
+  b_LinearVelocity->value().serialize(reader);
+  b_AngularVelocity->value().serialize(reader);
+  b_Attitude->value().serialize(reader);
 }