[Csp-commits] svn:csp r972 - in trunk/CSP/CSPSim/Source: . Networking

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

Author: wolverine
Date: 2004-05-29 09:00:10 -0700 (Sat, 29 May 2004)
New Revision: 972

Modified:
   trunk/CSP/CSPSim/Source/ClientNode.cpp
   trunk/CSP/CSPSim/Source/Networking/NetworkMessage.cpp
   trunk/CSP/CSPSim/Source/ServerNode.cpp
Log:
fix an incorrect headerLen constant

Modified: trunk/CSP/CSPSim/Source/ClientNode.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ClientNode.cpp	2004-05-29 15:28:46 UTC (rev 971)
+++ trunk/CSP/CSPSim/Source/ClientNode.cpp	2004-05-29 16:00:10 UTC (rev 972)
@@ -10,6 +10,7 @@
 #include <SimData/Date.h>
 #include <SimData/DataManager.h>
 
+#include <KineticsChannels.h>
 
 #include <SimData/Types.h>
 #include <SimData/ExceptionBase.h>
@@ -18,6 +19,9 @@
 #include <SimData/FileUtility.h>
 #include <SimData/GeoPos.h>
 
+using bus::Kinetics;
+
+
 ClientNode::ClientNode()
 {
 
@@ -70,6 +74,11 @@
   DataChannel<simdata::Vector3>::Ref b_LinearVelocity;
   DataChannel<simdata::Quat>::Ref b_Attitude;
 
+  b_GlobalPosition = DataChannel<simdata::Vector3>::newLocal(Kinetics::Position, simdata::Vector3::ZERO);
+  b_AngularVelocity = DataChannel<simdata::Vector3>::newLocal(Kinetics::AngularVelocity, simdata::Vector3::ZERO);
+  b_LinearVelocity = DataChannel<simdata::Vector3>::newLocal(Kinetics::Velocity, simdata::Vector3::ZERO);
+  b_Attitude = DataChannel<simdata::Quat>::newLocal(Kinetics::Attitude, simdata::Quat::IDENTITY);
+
   b_GlobalPosition->value() = simdata::Vector3(1.0, 1.0, 1.0);
   b_AngularVelocity->value() = simdata::Vector3(1.0, 1.0, 1.0);
   b_LinearVelocity->value() = simdata::Vector3(1.0, 1.0, 1.0);

Modified: trunk/CSP/CSPSim/Source/Networking/NetworkMessage.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/Networking/NetworkMessage.cpp	2004-05-29 15:28:46 UTC (rev 971)
+++ trunk/CSP/CSPSim/Source/Networking/NetworkMessage.cpp	2004-05-29 16:00:10 UTC (rev 972)
@@ -27,8 +27,8 @@
 
 #include "Networking.h"
 
-unsigned short NetworkMessage::m_magicNumber = 0xFCCF;
-unsigned short NetworkMessage::m_HeaderLen = 14;
+unsigned short NetworkMessage::m_magicNumber = 0xACDC;
+unsigned short NetworkMessage::m_HeaderLen = 16;
 
 /**
  * NetworkMessage()

Modified: trunk/CSP/CSPSim/Source/ServerNode.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ServerNode.cpp	2004-05-29 15:28:46 UTC (rev 971)
+++ trunk/CSP/CSPSim/Source/ServerNode.cpp	2004-05-29 16:00:10 UTC (rev 972)
@@ -40,10 +40,10 @@
 	  printf("Client addr: %s\n", node->getHostname());
 	  printf("Client port: %d\n", node->getPort());
 
-	  printf("MagicNumber: %u\n", header->m_magicNumber);
+	  printf("MagicNumber: 0x%x\n", header->m_magicNumber);
 	  printf("PayloadLen: %u\n", header->m_payloadLen);
 	  printf("MessageType: %u\n", header->m_messageType);
-	  printf("IPAddr: %u\n", header->m_ipaddr);
+	  printf("IPAddr: 0x%x\n", header->m_ipaddr);
 	  printf("Port: %u\n", header->m_port);
 	  printf("ID: %u\n", header->m_id);