csp-commits — Mailing list for CVS commit messages.

[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);
 			  

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

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

Author: wolverine
Date: 2004-05-29 08:28:46 -0700 (Sat, 29 May 2004)
New Revision: 971

Modified:
   trunk/CSP/CSPSim/Source/ServerNode.cpp
Log:
Added to the ServerNode to print out more fields from the message

Modified: trunk/CSP/CSPSim/Source/ServerNode.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ServerNode.cpp	2004-05-29 15:27:53 UTC (rev 970)
+++ trunk/CSP/CSPSim/Source/ServerNode.cpp	2004-05-29 15:28:46 UTC (rev 971)
@@ -35,10 +35,21 @@
 	if (count % 100 == 0)
 	{
 	  NetworkNode * node = message->getOriginatorNode();
+	  MessageHeader * header = (MessageHeader*)message;
           printf("Received Data From Client:\n");
 	  printf("Client addr: %s\n", node->getHostname());
 	  printf("Client port: %d\n", node->getPort());
+
+	  printf("MagicNumber: %u\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("Port: %u\n", header->m_port);
+	  printf("ID: %u\n", header->m_id);
+			  
           ObjectUpdateMessagePayload * ptrPayload = (ObjectUpdateMessagePayload*)message->getPayloadPtr();
+          printf("ID: %u\n", ptrPayload->id);
+	  printf("TimeStamp: %u\n", ptrPayload->timeStamp);
 	  printf("PositionX: %f, PositionY: %f, PositionZ: %f\n", 
 			ptrPayload->globalPosition.x,
 			ptrPayload->globalPosition.y,

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

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

Author: wolverine
Date: 2004-05-29 08:27:53 -0700 (Sat, 29 May 2004)
New Revision: 970

Modified:
   trunk/CSP/CSPSim/Source/ClientNode.cpp
Log:
Changed client node to send an ObjectUpdate message

Modified: trunk/CSP/CSPSim/Source/ClientNode.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ClientNode.cpp	2004-05-29 15:26:52 UTC (rev 969)
+++ trunk/CSP/CSPSim/Source/ClientNode.cpp	2004-05-29 15:27:53 UTC (rev 970)
@@ -4,6 +4,13 @@
 #include <stdlib.h>
 #include "Config.h"      
 
+#include "Bus.h"
+
+#include <SimData/Ref.h>
+#include <SimData/Date.h>
+#include <SimData/DataManager.h>
+
+
 #include <SimData/Types.h>
 #include <SimData/ExceptionBase.h>
 #include <SimData/DataArchive.h>
@@ -45,11 +52,37 @@
   NetworkNode * localNode =  new NetworkNode(1, localHost.c_str(), localPort);
   NetworkMessenger * networkMessenger = new NetworkMessenger(localNode);
 
-  NetworkMessage * message = networkMessenger->getMessageFromPool(1, 100);
-  char * payloadPtr = (char*)message->getPayloadPtr();
-  memset(payloadPtr, 0 , 100);
-  strcpy(payloadPtr, "Hello From CSP Network Test Client!");
-  Port port = message->getOriginatorPort();
+  unsigned short messageType = 2;
+  unsigned short payloadLen  = sizeof(int) + sizeof(double) + 3*sizeof(simdata::Vector3) +
+	                       sizeof(simdata::Quat) /* + sizeof(simdata::Matrix3) + sizeof(double) */;
+
+  NetworkMessage * message = networkMessenger->getMessageFromPool(messageType, payloadLen);
+  ObjectUpdateMessagePayload * ptrPayload = (ObjectUpdateMessagePayload*)message->getPayloadPtr();
+
+	   
+//  NetworkMessage * message = networkMessenger->getMessageFromPool(1, 100);
+//  memset(payloadPtr, 0 , 100);
+//  strcpy(payloadPtr, "Hello From CSP Network Test Client!");
+//  Port port = message->getOriginatorPort();
+
+  DataChannel<simdata::Vector3>::Ref b_GlobalPosition;
+  DataChannel<simdata::Vector3>::Ref b_AngularVelocity;
+  DataChannel<simdata::Vector3>::Ref b_LinearVelocity;
+  DataChannel<simdata::Quat>::Ref b_Attitude;
+
+  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);
+  b_Attitude->value() = simdata::Quat(1.0, 1.0, 1.0, 0.0);
+
+  ptrPayload->id = 1;
+  ptrPayload->timeStamp = 1.0;
+  b_GlobalPosition->value().writeBinary((unsigned char *)&(ptrPayload->globalPosition),24);
+  b_LinearVelocity->value().writeBinary((unsigned char *)&(ptrPayload->linearVelocity),24);
+  b_AngularVelocity->value().writeBinary((unsigned char *)&(ptrPayload->angularVelocity),24);
+  b_Attitude->value().writeBinary((unsigned char *)&(ptrPayload->attitude),32);
+
+
   networkMessenger->queueMessage(remoteNode, message);
   networkMessenger->sendMessages();
   

[Csp-commits] svn:csp r969 - trunk/CSP/CSPSim/Include

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

Author: wolverine
Date: 2004-05-29 08:26:52 -0700 (Sat, 29 May 2004)
New Revision: 969

Modified:
   trunk/CSP/CSPSim/Include/Networking.h
Log:
Fixed a typo

Modified: trunk/CSP/CSPSim/Include/Networking.h
===================================================================
--- trunk/CSP/CSPSim/Include/Networking.h	2004-05-29 14:11:27 UTC (rev 968)
+++ trunk/CSP/CSPSim/Include/Networking.h	2004-05-29 15:26:52 UTC (rev 969)
@@ -152,7 +152,7 @@
       unsigned int id;
       simdata::SimTime timeStamp;
       _Vector3Struct globalPosition;
-      Vector3Struct linearVelocity;
+      _Vector3Struct linearVelocity;
       _Vector3Struct angularVelocity;
       _QuatStruct attitude;
     

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

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

Author: wolverine
Date: 2004-05-29 07:11:27 -0700 (Sat, 29 May 2004)
New Revision: 968

Modified:
   trunk/CSP/CSPSim/Source/ClientNode.cpp
Log:
added dump method to analyize Messages

Modified: trunk/CSP/CSPSim/Source/ClientNode.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ClientNode.cpp	2004-05-29 14:11:05 UTC (rev 967)
+++ trunk/CSP/CSPSim/Source/ClientNode.cpp	2004-05-29 14:11:27 UTC (rev 968)
@@ -26,7 +26,12 @@
   printf("sizeof(simdata::SimTime) = %d\n", sizeof(simdata::SimTime));
   printf("sizeof(_Vector3Struct) = %d\n", sizeof(_Vector3Struct));
   printf("sizeof(_QuatStruct) = %d\n", sizeof(_QuatStruct));
+  printf("sizeof(MessageHeader) = %d\n", sizeof(MessageHeader));
+  printf("sizeof(NetworkMessage) = %d\n", sizeof(NetworkMessage));
+  printf("sizeof(ObjectUpdateMessagePayload) = %d\n", sizeof(ObjectUpdateMessagePayload)); 
   
+  MessageHeader header;
+  header.dumpOffsets();
 	
   printf("Network test client starting up...\n");
   Port localPort = g_Config.getInt("Networking", "LocalMessagePort", 10000, true);

[Csp-commits] svn:csp r967 - trunk/CSP/CSPSim/Include

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

Author: wolverine
Date: 2004-05-29 07:11:05 -0700 (Sat, 29 May 2004)
New Revision: 967

Modified:
   trunk/CSP/CSPSim/Include/Networking.h
Log:
added dump method to analyize Messages

Modified: trunk/CSP/CSPSim/Include/Networking.h
===================================================================
--- trunk/CSP/CSPSim/Include/Networking.h	2004-05-29 05:19:36 UTC (rev 966)
+++ trunk/CSP/CSPSim/Include/Networking.h	2004-05-29 14:11:05 UTC (rev 967)
@@ -39,6 +39,7 @@
 #include <SimData/Uniform.h>
 #include <SimData/Quat.h>
 #include <SimData/Date.h>
+#include <stdio.h>
 
 typedef int SockFd;
 typedef simdata::uint16 Port;
@@ -54,6 +55,35 @@
   simdata::uint32  m_ipaddr;
   simdata::uint16  m_port;
   simdata::uint16  m_id;
+
+  void dump()
+  {
+	  printf("MessageHeader - MagicNumber: %u\n", m_magicNumber);
+	  printf("MessageHeader - PayloadLen: %u\n", m_payloadLen);
+	  printf("MessageHeader - MessageType: %u\n", m_messageType);
+	  printf("MessageHeader - ipaddr: %u\n", m_ipaddr);
+	  printf("MessageHeader - port: %u\n", m_port);
+	  printf("MessageHeader - id: %u\n", m_id);
+  }	 
+
+  void dumpOffsets()
+  {
+	simdata::uint32 thisAddr = (simdata::uint32)this;
+	simdata::uint32 magicNumberAddr = (simdata::uint32)&m_magicNumber;
+	simdata::uint32 PayloadLenAddr = (simdata::uint32)&m_payloadLen;
+	simdata::uint32 MessageTypeAddr = (simdata::uint32)&m_messageType;
+	simdata::uint32 ipaddrAddr = (simdata::uint32)&m_ipaddr;
+	simdata::uint32 portAddr = (simdata::uint32)&m_port;
+	simdata::uint32 idAddr = (simdata::uint32)&m_id;
+
+	printf("MessageHeader - MagicNumberOffset: %d\n", magicNumberAddr - thisAddr );
+	printf("MessageHeader - PayloadLenOffset: %d\n", PayloadLenAddr - thisAddr );
+	printf("MessageHeader - MessageTypeOffset: %d\n", MessageTypeAddr - thisAddr );
+	printf("MessageHeader - ipOffset: %d\n", ipaddrAddr - thisAddr );
+	printf("MessageHeader - portOffset: %d\n", portAddr - thisAddr );
+	printf("MessageHeader - idOffset: %d\n", idAddr - thisAddr );
+  }
+		  
 };
 
 class NetworkMessage
@@ -122,7 +152,7 @@
       unsigned int id;
       simdata::SimTime timeStamp;
       _Vector3Struct globalPosition;
-      _Vector3Struct linearVelocity;
+      Vector3Struct linearVelocity;
       _Vector3Struct angularVelocity;
       _QuatStruct attitude;
     

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

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

Author: wolverine
Date: 2004-05-28 22:19:36 -0700 (Fri, 28 May 2004)
New Revision: 966

Modified:
   trunk/CSP/CSPSim/Source/DynamicObject.cpp
Log:
Changed the buffer size for the calls getting a Quat to 32 from 24

Modified: trunk/CSP/CSPSim/Source/DynamicObject.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/DynamicObject.cpp	2004-05-29 05:17:41 UTC (rev 965)
+++ trunk/CSP/CSPSim/Source/DynamicObject.cpp	2004-05-29 05:19:36 UTC (rev 966)
@@ -407,7 +407,7 @@
   b_GlobalPosition->value().writeBinary((unsigned char *)&(ptrPayload->globalPosition),24);
   b_LinearVelocity->value().writeBinary((unsigned char *)&(ptrPayload->linearVelocity),24);
   b_AngularVelocity->value().writeBinary((unsigned char *)&(ptrPayload->angularVelocity),24);
-  b_Attitude->value().writeBinary((unsigned char *)&(ptrPayload->attitude),24);
+  b_Attitude->value().writeBinary((unsigned char *)&(ptrPayload->attitude),32);
   
   CSP_LOG(APP, DEBUG, "DynamicObject::getUpdateMessage() - returning message");
 
@@ -439,7 +439,7 @@
   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),24);
+  b_Attitude->value().readBinary((unsigned char *)&(ptrPayload->attitude),32);
   
 }
 

[Csp-commits] svn:csp r965 - trunk/CSP/SimData/Source

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

Author: wolverine
Date: 2004-05-28 22:17:41 -0700 (Fri, 28 May 2004)
New Revision: 965

Modified:
   trunk/CSP/SimData/Source/Quat.cpp
Log:
Changed Quat to check the buffer size to be 24 instead of sizeof(Quat)

Modified: trunk/CSP/SimData/Source/Quat.cpp
===================================================================
--- trunk/CSP/SimData/Source/Quat.cpp	2004-05-29 04:27:55 UTC (rev 964)
+++ trunk/CSP/SimData/Source/Quat.cpp	2004-05-29 05:17:41 UTC (rev 965)
@@ -354,7 +354,7 @@
 
 int Quat::readBinary(const unsigned char * ptrBuf, int size)
 {
-  if (size != sizeof(Quat))
+  if (size != 4*sizeof(double))
     {
       printf("Trying to read a binary Quat with the wrong size\n");
       return 0;
@@ -368,7 +368,7 @@
 
 int Quat::writeBinary(unsigned char * ptrBuf, int size)
 {
-  if (size != sizeof(Quat))
+  if (size != 4*sizeof(double))
     {
       printf("Trying to write a binary Quat with the wrong size\n");
       return 0;

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

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

Author: wolverine
Date: 2004-05-28 21:27:55 -0700 (Fri, 28 May 2004)
New Revision: 964

Modified:
   trunk/CSP/CSPSim/Source/ServerNode.cpp
Log:
minor output changes

Modified: trunk/CSP/CSPSim/Source/ServerNode.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ServerNode.cpp	2004-05-29 02:42:57 UTC (rev 963)
+++ trunk/CSP/CSPSim/Source/ServerNode.cpp	2004-05-29 04:27:55 UTC (rev 964)
@@ -14,6 +14,7 @@
 
 int ServerNode::run()
 {
+  int count = 0;
   printf("Network test server starting up...\n");
   Port remotePort = g_Config.getInt("Networking", "LocalMessagePort", 10000, true);
   std::string remoteHost = g_Config.getString("Networking", "LocalMessageHost", "127.0.0.1", true);
@@ -31,15 +32,19 @@
     int numreceived = socketDuplex->recvfrom(&message);
     if (numreceived > 0)
     {
-	NetworkNode * node = message->getOriginatorNode();
-        printf("Received Data From Client:\n");
-	printf("Client addr: %s\n", node->getHostname());
-	printf("Client port: %d\n", node->getPort());
-        ObjectUpdateMessagePayload * ptrPayload = (ObjectUpdateMessagePayload*)message->getPayloadPtr();
-	printf("PositionX: %f, PositionY: %f, PositionZ: %f\n", 
+	if (count % 100 == 0)
+	{
+	  NetworkNode * node = message->getOriginatorNode();
+          printf("Received Data From Client:\n");
+	  printf("Client addr: %s\n", node->getHostname());
+	  printf("Client port: %d\n", node->getPort());
+          ObjectUpdateMessagePayload * ptrPayload = (ObjectUpdateMessagePayload*)message->getPayloadPtr();
+	  printf("PositionX: %f, PositionY: %f, PositionZ: %f\n", 
 			ptrPayload->globalPosition.x,
 			ptrPayload->globalPosition.y,
 			ptrPayload->globalPosition.z);
+	}
+	count++;
     }
     else
     {

[Csp-commits] svn:csp r963 - in trunk/CSP/SimData: . Source

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

Author: wolverine
Date: 2004-05-28 19:42:57 -0700 (Fri, 28 May 2004)
New Revision: 963

Modified:
   trunk/CSP/SimData/CHANGES.current
   trunk/CSP/SimData/Source/Quat.cpp
   trunk/CSP/SimData/Source/Vector3.cpp
Log:
new changes

Modified: trunk/CSP/SimData/CHANGES.current
===================================================================
--- trunk/CSP/SimData/CHANGES.current	2004-05-29 02:38:33 UTC (rev 962)
+++ trunk/CSP/SimData/CHANGES.current	2004-05-29 02:42:57 UTC (rev 963)
@@ -1,5 +1,17 @@
 Version 0.4.0 (in progress)
 ===========================
+
+2004-05-28: wolverine
+  * It was determined that Vector3 and Quad have extra bytes
+    to handle there virtual function tables. The networking
+    code now has matching transfer functions that mimic the 
+    corresponding SimData ones minus the virtual functions. A
+    slight change was made to Vector3 and Quad so that the 
+    check during WriteBinary and ReadBinary looks for a size
+    that only includes the functamental members. So that a
+    to read and write a Vector3 a 24 bytes binary buffer would
+    be passed in to the proper Vector3 functions.
+
 2004-04-25: delta
   * Removed obsolete SimDataMSVC folder.
   

Modified: trunk/CSP/SimData/Source/Quat.cpp
===================================================================
--- trunk/CSP/SimData/Source/Quat.cpp	2004-05-29 02:38:33 UTC (rev 962)
+++ trunk/CSP/SimData/Source/Quat.cpp	2004-05-29 02:42:57 UTC (rev 963)
@@ -376,7 +376,7 @@
   memcpy((void*)ptrBuf, (void*)&_x, sizeof(double)); ptrBuf += sizeof(double);
   memcpy((void*)ptrBuf, (void*)&_y, sizeof(double)); ptrBuf += sizeof(double);
   memcpy((void*)ptrBuf, (void*)&_z, sizeof(double)); ptrBuf += sizeof(double);
-  memcpy((void*)ptrBuf, (void*)&_w, sizeof(double)); ptrBuf += sizeof(double); 
+  memcpy((void*)ptrBuf, (void*)&_w, sizeof(double)); ptrBuf += sizeof(double);
   return 4*sizeof(double);
 }
 

Modified: trunk/CSP/SimData/Source/Vector3.cpp
===================================================================
--- trunk/CSP/SimData/Source/Vector3.cpp	2004-05-29 02:38:33 UTC (rev 962)
+++ trunk/CSP/SimData/Source/Vector3.cpp	2004-05-29 02:42:57 UTC (rev 963)
@@ -88,24 +88,15 @@
  */
 int Vector3::readBinary(const unsigned char * data, int size) {
 	
-	if (size != sizeof(Vector3))
+	if (size != 3*sizeof(double))
 	{
 		fprintf(stderr, "Illegal mem copy operation attempted\n");
 		return 0;
 	}
         
-	double dvalue;
-	printf("Vector3::readBinary() - loading double values binary into Vector3\n");
-	memcpy((void*)&dvalue, (void*)data, sizeof(double)); data += sizeof(double);	
-	printf("Vector3::readBinary() dvalue: %f\n", dvalue);
-	_x = dvalue;
-	memcpy((void*)&dvalue, (void*)data, sizeof(double)); data += sizeof(double);
-	printf("Vector3::readBinary() dvalue: %f\n", dvalue);
-	_y = dvalue;
-	memcpy((void*)&dvalue, (void*)data, sizeof(double));
-	printf("Vector3::readBinary() dvalue: %f\n", dvalue);
-	_z = dvalue;
-	printf("Vector3::readBinary() - finished loading double values for Vector3\n");
+	memcpy((void*)&_x, (void*)data, sizeof(double)); data += sizeof(double);	
+	memcpy((void*)&_y, (void*)data, sizeof(double)); data += sizeof(double);
+	memcpy((void*)&_z, (void*)data, sizeof(double));
 
 	return 3*sizeof(double);
 }
@@ -115,20 +106,15 @@
  */
 int Vector3::writeBinary(unsigned char * data, int size) {
 
-	if (size != sizeof(Vector3))
+	if (size != 3*sizeof(double))
 	{
 		fprintf(stderr, "Illegal mem copy operation attempted\n");
 		return 0;
 	}
 	
-	printf("Vector3::writeBinary() - loading Vector3 into binary buffer.\n");
 	memcpy( (void*)data, (void*)&_x, sizeof(double)); data += sizeof(double);	
-	printf("Vector3::writeBinary() - _x: %f\n", _x);
 	memcpy( (void*)data, (void*)&_y, sizeof(double)); data += sizeof(double);
-	printf("Vector3::writeBinary() - _y: %f\n", _y);
 	memcpy( (void*)data, (void*)&_z, sizeof(double));
-	printf("Vector3::writeBinary() - _z: %f\n", _z);
-	printf("Vector3::writeBinary() - finished loading Vector3 values into binary buffer.\n");
 
 	return 3*sizeof(double);
 

[Csp-commits] svn:csp r962 - in trunk/CSP/CSPSim: . Data Include Source

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

Author: wolverine
Date: 2004-05-28 19:38:33 -0700 (Fri, 28 May 2004)
New Revision: 962

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Data/CSPSim.ini
   trunk/CSP/CSPSim/Include/Networking.h
   trunk/CSP/CSPSim/Source/ClientNode.cpp
   trunk/CSP/CSPSim/Source/DynamicObject.cpp
   trunk/CSP/CSPSim/Source/ServerNode.cpp
Log:
new changes file

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2004-05-26 01:11:12 UTC (rev 961)
+++ trunk/CSP/CSPSim/CHANGES.current	2004-05-29 02:38:33 UTC (rev 962)
@@ -1,6 +1,15 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2004-05-28: wolverine
+  * Created special data transfer structures that contain no virtual
+    functions and have the same fundamental binary structure as SimData types
+    minus the virutal function tables. These structures really just 
+    create memory place holders in the object network messages that
+    the regular SimData types can be mem copied over, the elements of the
+    transfer structures do not need to be directly accessed except
+    for debugging purposes.
+
 2004-05-23: wolverine
   * Changes to the format of the object update message. Now There
     is a special class for the object update payload section that

Modified: trunk/CSP/CSPSim/Data/CSPSim.ini
===================================================================
--- trunk/CSP/CSPSim/Data/CSPSim.ini	2004-05-26 01:11:12 UTC (rev 961)
+++ trunk/CSP/CSPSim/Data/CSPSim.ini	2004-05-29 02:38:33 UTC (rev 962)
@@ -40,7 +40,7 @@
 LocalMessagePort = 3150
 LocalMessageHost = 127.0.0.1
 RemoteMessagePort = 3160
-RemoteMessageHost = 127.0.0.1
+RemoteMessageHost = 127.0.0.1 
 
 ; balkan theater (demeter)
 Theater = sim:theater.balkan

Modified: trunk/CSP/CSPSim/Include/Networking.h
===================================================================
--- trunk/CSP/CSPSim/Include/Networking.h	2004-05-26 01:11:12 UTC (rev 961)
+++ trunk/CSP/CSPSim/Include/Networking.h	2004-05-29 02:38:33 UTC (rev 962)
@@ -93,7 +93,25 @@
 
 
 };
-                                            
+                       
+// Define some structs that will only used for data transfers.
+// These differ from SimData structs in that they have no virtual
+// functions and hence have more predictable binary sizes.
+struct _Vector3Struct
+{
+  double x;
+  double y;
+  double z;
+};
+
+struct _QuatStruct
+{
+  double x;
+  double y;
+  double z;
+  double w;
+};
+
 class ObjectUpdateMessagePayload 
 {
 
@@ -103,10 +121,10 @@
     public:
       unsigned int id;
       simdata::SimTime timeStamp;
-      simdata::Vector3 globalPosition;
-      simdata::Vector3 linearVelocity;
-      simdata::Vector3 angularVelocity;
-      simdata::Quat  attitude;
+      _Vector3Struct globalPosition;
+      _Vector3Struct linearVelocity;
+      _Vector3Struct angularVelocity;
+      _QuatStruct attitude;
     
     
 };

Modified: trunk/CSP/CSPSim/Source/ClientNode.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ClientNode.cpp	2004-05-26 01:11:12 UTC (rev 961)
+++ trunk/CSP/CSPSim/Source/ClientNode.cpp	2004-05-29 02:38:33 UTC (rev 962)
@@ -24,6 +24,8 @@
   printf("sizeof(simdata::Vector3) = %d\n", sizeof(simdata::Vector3));
   printf("sizeof(simdata::Quat) = %d\n", sizeof(simdata::Quat));
   printf("sizeof(simdata::SimTime) = %d\n", sizeof(simdata::SimTime));
+  printf("sizeof(_Vector3Struct) = %d\n", sizeof(_Vector3Struct));
+  printf("sizeof(_QuatStruct) = %d\n", sizeof(_QuatStruct));
   
 	
   printf("Network test client starting up...\n");

Modified: trunk/CSP/CSPSim/Source/DynamicObject.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/DynamicObject.cpp	2004-05-26 01:11:12 UTC (rev 961)
+++ trunk/CSP/CSPSim/Source/DynamicObject.cpp	2004-05-29 02:38:33 UTC (rev 962)
@@ -404,10 +404,10 @@
   ObjectUpdateMessagePayload * ptrPayload = (ObjectUpdateMessagePayload*)message->getPayloadPtr();
   ptrPayload->id = m_ID;
   ptrPayload->timeStamp = CSPSim::theSim->getElapsedTime();
-  ptrPayload->globalPosition = b_GlobalPosition->value();
-  ptrPayload->linearVelocity = b_LinearVelocity->value();
-  ptrPayload->angularVelocity = b_AngularVelocity->value();
-  ptrPayload->attitude = b_Attitude->value();
+  b_GlobalPosition->value().writeBinary((unsigned char *)&(ptrPayload->globalPosition),24);
+  b_LinearVelocity->value().writeBinary((unsigned char *)&(ptrPayload->linearVelocity),24);
+  b_AngularVelocity->value().writeBinary((unsigned char *)&(ptrPayload->angularVelocity),24);
+  b_Attitude->value().writeBinary((unsigned char *)&(ptrPayload->attitude),24);
   
   CSP_LOG(APP, DEBUG, "DynamicObject::getUpdateMessage() - returning message");
 
@@ -436,10 +436,10 @@
   //ptrPayload->timeStamp = CSPSim::theSim->getElapsedTime();
   //
   //load the other values.
-  b_GlobalPosition->value() = ptrPayload->globalPosition;
-  b_LinearVelocity->value() = ptrPayload->linearVelocity;
-  b_AngularVelocity->value() = ptrPayload->angularVelocity; 
-  b_Attitude->value() = ptrPayload->attitude;
+  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),24);
   
 }
 

Modified: trunk/CSP/CSPSim/Source/ServerNode.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ServerNode.cpp	2004-05-26 01:11:12 UTC (rev 961)
+++ trunk/CSP/CSPSim/Source/ServerNode.cpp	2004-05-29 02:38:33 UTC (rev 962)
@@ -37,9 +37,9 @@
 	printf("Client port: %d\n", node->getPort());
         ObjectUpdateMessagePayload * ptrPayload = (ObjectUpdateMessagePayload*)message->getPayloadPtr();
 	printf("PositionX: %f, PositionY: %f, PositionZ: %f\n", 
-			ptrPayload->globalPosition.x(),
-			ptrPayload->globalPosition.y(),
-			ptrPayload->globalPosition.z());
+			ptrPayload->globalPosition.x,
+			ptrPayload->globalPosition.y,
+			ptrPayload->globalPosition.z);
     }
     else
     {

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

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

Author: wolverine
Date: 2004-05-25 18:11:12 -0700 (Tue, 25 May 2004)
New Revision: 961

Modified:
   trunk/CSP/CSPSim/Source/ClientNode.cpp
Log:
Added some diag. code to test size of classes

Modified: trunk/CSP/CSPSim/Source/ClientNode.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ClientNode.cpp	2004-05-26 00:18:35 UTC (rev 960)
+++ trunk/CSP/CSPSim/Source/ClientNode.cpp	2004-05-26 01:11:12 UTC (rev 961)
@@ -4,6 +4,13 @@
 #include <stdlib.h>
 #include "Config.h"      
 
+#include <SimData/Types.h>
+#include <SimData/ExceptionBase.h>
+#include <SimData/DataArchive.h>
+#include <SimData/DataManager.h>
+#include <SimData/FileUtility.h>
+#include <SimData/GeoPos.h>
+
 ClientNode::ClientNode()
 {
 
@@ -11,6 +18,14 @@
 
 int ClientNode::run()
 {
+
+  printf("sizeof(int) = %d\n", sizeof(int));
+  printf("sizeof(double) = %d\n", sizeof(double));
+  printf("sizeof(simdata::Vector3) = %d\n", sizeof(simdata::Vector3));
+  printf("sizeof(simdata::Quat) = %d\n", sizeof(simdata::Quat));
+  printf("sizeof(simdata::SimTime) = %d\n", sizeof(simdata::SimTime));
+  
+	
   printf("Network test client starting up...\n");
   Port localPort = g_Config.getInt("Networking", "LocalMessagePort", 10000, true);
   std::string localHost = g_Config.getString("Networking", "LocalMessageHost", "127.0.0.1", true);

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

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

Author: wolverine
Date: 2004-05-25 17:18:35 -0700 (Tue, 25 May 2004)
New Revision: 960

Modified:
   trunk/CSP/CSPSim/Source/Networking/NetworkMessenger.cpp
Log:
setting new packets to all zeros before returning from the pool

Modified: trunk/CSP/CSPSim/Source/Networking/NetworkMessenger.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/Networking/NetworkMessenger.cpp	2004-05-24 01:00:14 UTC (rev 959)
+++ trunk/CSP/CSPSim/Source/Networking/NetworkMessenger.cpp	2004-05-26 00:18:35 UTC (rev 960)
@@ -100,6 +100,7 @@
   }
   NetworkMessage * message = m_messagePool.front();
   m_messagePool.pop_front();
+  memset(message, 0x00, 512);
   message->initialize( messageType, payloadLen, m_orginatorNode);
   return message;
 }

[Csp-commits] svn:csp r959 - trunk/CSP/CSPSim/Include

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

Author: wolverine
Date: 2004-05-23 18:00:14 -0700 (Sun, 23 May 2004)
New Revision: 959

Modified:
   trunk/CSP/CSPSim/Include/Networking.h
Log:
made copy constructor private

Modified: trunk/CSP/CSPSim/Include/Networking.h
===================================================================
--- trunk/CSP/CSPSim/Include/Networking.h	2004-05-24 00:59:51 UTC (rev 958)
+++ trunk/CSP/CSPSim/Include/Networking.h	2004-05-24 01:00:14 UTC (rev 959)
@@ -69,6 +69,7 @@
     private:
 
     NetworkMessage();
+	NetworkMessage(NetworkMessage &);
 
     public:
     

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

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

Author: wolverine
Date: 2004-05-23 17:59:51 -0700 (Sun, 23 May 2004)
New Revision: 958

Modified:
   trunk/CSP/CSPSim/Source/CSPSim.cpp
   trunk/CSP/CSPSim/Source/ScreenInfo.cpp
Log:
formatting changes to position output

Modified: trunk/CSP/CSPSim/Source/CSPSim.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/CSPSim.cpp	2004-05-23 20:36:54 UTC (rev 957)
+++ trunk/CSP/CSPSim/Source/CSPSim.cpp	2004-05-24 00:59:51 UTC (rev 958)
@@ -417,12 +417,13 @@
 		// create the networking layer
 		b_networkingFlag = g_Config.getBool("Networking", "UseNetworking", false, true);
 		int localMessagePort = g_Config.getInt("Networking", "LocalMessagePort", 10000, true);
+		std::string localAddr = g_Config.getString("Networking", "LocalMessageHost", "127.0.0.1", true);
 		CSP_LOG(APP, DEBUG, "init() - Creating Message listener on port: " << localMessagePort);
                 std::string remoteAddr = g_Config.getString("Networking", "RemoteMessageHost", "127.0.0.1", true);
 		   
 		Port remotePort = (Port)g_Config.getInt("Networking", "RemoteMessagePort", 0, true);
 		m_RemoteServerNode = new NetworkNode(1, remoteAddr.c_str(), remotePort );
-		m_localNode =  new NetworkNode(1, "localhost", localMessagePort);
+		m_localNode =  new NetworkNode(1, localAddr.c_str(), localMessagePort);
 		m_NetworkMessenger = new NetworkMessenger(m_localNode);
 
 #if 0

Modified: trunk/CSP/CSPSim/Source/ScreenInfo.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ScreenInfo.cpp	2004-05-23 20:36:54 UTC (rev 957)
+++ trunk/CSP/CSPSim/Source/ScreenInfo.cpp	2004-05-24 00:59:51 UTC (rev 958)
@@ -251,14 +251,14 @@
 		m_Altitude->setText(osstr.str());
 
 		osstr.str("");
-		osstr << "(" << setprecision(precision) << fixed 
-		      << setw(7 + precision) << setfill('0')  << pos.x() << ",";
-		osstr << setw(7 + precision) << setfill('0') << pos.y() << "," << pos.z() << ")";
+		osstr << "( " << setprecision(precision) << fixed 
+		      << setw(7 + precision) /* << setfill('0') */  << pos.x() << ", ";
+		osstr << setw(7 + precision) /* << setfill('0') */  << pos.y() << ", " << pos.z() << " )";
 		m_GlobalPosition->setText(osstr.str());
 	
 		simdata::Vector3 vel = activeObject->getVelocity();
 		osstr.str("");
-		osstr << setprecision(2) << fixed << "(" << vel.x() << "," << vel.y() << "," << vel.z() << ")";
+		osstr << setprecision(2) << fixed << "( " << vel.x() << ", " << vel.y() << ", " << vel.z() << " )";
 		m_Velocity->setText(osstr.str());
 
 		osstr.str("");

[Csp-commits] svn:csp r957 - in trunk/CSP/CSPSim: . Data Include Source

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

Author: wolverine
Date: 2004-05-23 13:36:54 -0700 (Sun, 23 May 2004)
New Revision: 957

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Data/CSPSim.ini
   trunk/CSP/CSPSim/Include/Networking.h
   trunk/CSP/CSPSim/Source/DynamicObject.cpp
   trunk/CSP/CSPSim/Source/ServerNode.cpp
Log:
changes to format of object update message

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2004-05-17 18:07:54 UTC (rev 956)
+++ trunk/CSP/CSPSim/CHANGES.current	2004-05-23 20:36:54 UTC (rev 957)
@@ -1,6 +1,15 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2004-05-23: wolverine
+  * Changes to the format of the object update message. Now There
+    is a special class for the object update payload section that
+    contains fields for the payload data members. This should be
+    uptained by casting the payload ptr to a ObjectUpdateMessagePayload
+    pointer for both send and receive. Loading and Unloading can be
+    performed with object assignments instead of memcpys to make
+    the code a little clearer.
+
 2004-05-16: wolverine
   * changes to networking include configuration from CSPSim.ini
     which includes ports, server node, option to disable/enable

Modified: trunk/CSP/CSPSim/Data/CSPSim.ini
===================================================================
--- trunk/CSP/CSPSim/Data/CSPSim.ini	2004-05-17 18:07:54 UTC (rev 956)
+++ trunk/CSP/CSPSim/Data/CSPSim.ini	2004-05-23 20:36:54 UTC (rev 957)
@@ -38,7 +38,7 @@
 [Networking]
 UseNetworking = true 
 LocalMessagePort = 3150
-LocalMessageHost = 127.0.0.1 
+LocalMessageHost = 127.0.0.1
 RemoteMessagePort = 3160
 RemoteMessageHost = 127.0.0.1
 

Modified: trunk/CSP/CSPSim/Include/Networking.h
===================================================================
--- trunk/CSP/CSPSim/Include/Networking.h	2004-05-17 18:07:54 UTC (rev 956)
+++ trunk/CSP/CSPSim/Include/Networking.h	2004-05-23 20:36:54 UTC (rev 957)
@@ -37,6 +37,8 @@
 #include <SimData/Vector3.h>
 #include <SimData/String.h>
 #include <SimData/Uniform.h>
+#include <SimData/Quat.h>
+#include <SimData/Date.h>
 
 typedef int SockFd;
 typedef simdata::uint16 Port;
@@ -91,16 +93,24 @@
 
 };
                                             
-//class ObjectUpdateMessage : public NetworkMessage
-//{
-//
-//    public:
-//    ObjectUpdateMessage(simdata::uint16 id, simdata::Vector3 position, simdata::Vector3 velocity);
-//    
-//    
-//};
+class ObjectUpdateMessagePayload 
+{
 
+    private:
+      ObjectUpdateMessagePayload();
 
+    public:
+      unsigned int id;
+      simdata::SimTime timeStamp;
+      simdata::Vector3 globalPosition;
+      simdata::Vector3 linearVelocity;
+      simdata::Vector3 angularVelocity;
+      simdata::Quat  attitude;
+    
+    
+};
+
+
 class NetworkNode
 {
   private:

Modified: trunk/CSP/CSPSim/Source/DynamicObject.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/DynamicObject.cpp	2004-05-17 18:07:54 UTC (rev 956)
+++ trunk/CSP/CSPSim/Source/DynamicObject.cpp	2004-05-23 20:36:54 UTC (rev 957)
@@ -372,7 +372,7 @@
 	if (InputInterface::onMapEvent(event)) {
 		return true;
 	}
-	if (m_SystemsModel.valid() && m_SystemsModel->onMapEvent(event)) {
+if (m_SystemsModel.valid() && m_SystemsModel->onMapEvent(event)) {
 		return true;
 	}
 	return false;
@@ -401,33 +401,14 @@
 
   NetworkMessage * message = CSPSim::theSim->getNetworkMessenger()->getMessageFromPool(messageType, payloadLen);
 
-  unsigned char * ptrBuf = (unsigned char*)message->getPayloadPtr();
-
-//  printf("Generating network update message for object id: %d\n", m_ID);
-  memcpy((void*)ptrBuf, (void*)&m_ID, sizeof(unsigned int)); ptrBuf += sizeof(unsigned int);
-
-  simdata::SimTime timeStamp = CSPSim::theSim->getElapsedTime();
-  memcpy((void*)ptrBuf, (void*)&timeStamp, sizeof(simdata::SimTime)); ptrBuf += sizeof(simdata::SimTime);
-
-  int bytescopied;
-  bytescopied = b_GlobalPosition->value().writeBinary(ptrBuf, sizeof(simdata::Vector3));
-  ptrBuf += bytescopied;
-
-  bytescopied = b_LinearVelocity->value().writeBinary(ptrBuf, sizeof(simdata::Vector3));
-  ptrBuf += bytescopied;
-
-  bytescopied = b_AngularVelocity->value().writeBinary(ptrBuf, sizeof(simdata::Vector3));
-  ptrBuf += bytescopied;
-
-  bytescopied = b_Attitude->value().writeBinary(ptrBuf, sizeof(simdata::Quat));
-  ptrBuf += bytescopied;
-
-//  bytescopied = b_Inertia->value().writeBinary(ptrBuf, sizeof(simdata::Quat));
-//  ptrBuf += bytescopied;
+  ObjectUpdateMessagePayload * ptrPayload = (ObjectUpdateMessagePayload*)message->getPayloadPtr();
+  ptrPayload->id = m_ID;
+  ptrPayload->timeStamp = CSPSim::theSim->getElapsedTime();
+  ptrPayload->globalPosition = b_GlobalPosition->value();
+  ptrPayload->linearVelocity = b_LinearVelocity->value();
+  ptrPayload->angularVelocity = b_AngularVelocity->value();
+  ptrPayload->attitude = b_Attitude->value();
   
-//  memcpy((void*)ptrBuf, (void*)&b_Mass->value(), sizeof(double));
-//  ptrBuf += bytescopied;
-
   CSP_LOG(APP, DEBUG, "DynamicObject::getUpdateMessage() - returning message");
 
 
@@ -438,15 +419,9 @@
 {
   // read message
 
-  unsigned char * ptrBuf = (unsigned char*)message->getPayloadPtr();
-
-  // skip object id
-  unsigned int idValue;
-  memcpy((void*)&idValue, (void*)ptrBuf, sizeof(unsigned int));
-  ptrBuf += sizeof(unsigned int);
-
+  ObjectUpdateMessagePayload * ptrPayload = (ObjectUpdateMessagePayload*)message->getPayloadPtr();
   // verify we have the correct id in the packet for this object.
-  if (m_ID == idValue)
+  if (m_ID == ptrPayload->id)
   {
 //	printf("Loading update message of object %d\n", m_ID);
   }
@@ -455,32 +430,17 @@
 //	printf("Error loading update message, object id (%d) does not match\n", idValue);
   }
 
-  // get timestamp
-  simdata::SimTime timeStamp; 
-  memcpy((void*)&timeStamp, (void*)ptrBuf, sizeof(simdata::SimTime)); ptrBuf += sizeof(simdata::SimTime);
-
-  int bytescopied;
-  bytescopied = b_GlobalPosition->value().readBinary(ptrBuf, sizeof(simdata::Vector3));
-  ptrBuf += bytescopied;
-  bytescopied = b_LinearVelocity->value().readBinary(ptrBuf, sizeof(simdata::Vector3));
-  ptrBuf += bytescopied;
-  bytescopied = b_AngularVelocity->value().readBinary(ptrBuf, sizeof(simdata::Vector3));
-  ptrBuf += bytescopied;
-  bytescopied = b_Attitude->value().readBinary(ptrBuf, sizeof(simdata::Quat));
-  ptrBuf += bytescopied;
-//  bytescopied = b_Inertia->value().readBinary(ptrBuf, sizeof(simdata::Matrix3));
-//  ptrBuf += bytescopied;
+  // we can disregard this message if the timestamp is older then the most
+  // recent update.
   
-//  double *pValue = &b_Mass->value();
-//  memcpy((void*)&pValue, (void*)ptrBuf, sizeof(double));
+  //ptrPayload->timeStamp = CSPSim::theSim->getElapsedTime();
+  //
+  //load the other values.
+  b_GlobalPosition->value() = ptrPayload->globalPosition;
+  b_LinearVelocity->value() = ptrPayload->linearVelocity;
+  b_AngularVelocity->value() = ptrPayload->angularVelocity; 
+  b_Attitude->value() = ptrPayload->attitude;
   
-  //ptrBuf += sizeof(double);
-
-  // return message to shared pool.
-  //  NetworkMessagePool.putMessageObject(message);
-//  delete message;
-//
-//  CSPSim::theSim->getNetworkMessenger()->returnMessageToPool(message);
 }
 
 

Modified: trunk/CSP/CSPSim/Source/ServerNode.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ServerNode.cpp	2004-05-17 18:07:54 UTC (rev 956)
+++ trunk/CSP/CSPSim/Source/ServerNode.cpp	2004-05-23 20:36:54 UTC (rev 957)
@@ -35,6 +35,11 @@
         printf("Received Data From Client:\n");
 	printf("Client addr: %s\n", node->getHostname());
 	printf("Client port: %d\n", node->getPort());
+        ObjectUpdateMessagePayload * ptrPayload = (ObjectUpdateMessagePayload*)message->getPayloadPtr();
+	printf("PositionX: %f, PositionY: %f, PositionZ: %f\n", 
+			ptrPayload->globalPosition.x(),
+			ptrPayload->globalPosition.y(),
+			ptrPayload->globalPosition.z());
     }
     else
     {

[Csp-commits] r718 - reviews

[<mk...@so...>]

Author: mkrose
Date: 2004-05-23 12:58:16 -0700 (Sun, 23 May 2004)
New Revision: 718

Added:
   reviews/change
Removed:
   reviews/change
Log:
Code review of changeset foo (created Wed May 19 01:05:32 2004)

Debian is a free operating system (OS) for your computer. An operating
system is the set of basic programs and utilities that make your computer
run. Debian uses the Linux kernel (the core of an operating system), but
most of the basic OS tools come from the GNU project; hence the name
GNU/Linux.

(MOD) //trunk/CSP/CSPSim/Source/Makefile.in
(MOD) //trunk/CSP/CSPSim/Makefile.in

Deleted: reviews/change
===================================================================
--- reviews/change	2004-05-23 19:48:36 UTC (rev 717)
+++ reviews/change	2004-05-23 19:58:16 UTC (rev 718)
@@ -1,201 +0,0 @@
-(dp0
-S'date'
-p1
-S'Wed May 19 01:05:32 2004'
-p2
-sS'delta'
-p3
-(lp4
-(S'trunk/CSP/CSPSim/Source/Makefile.in'
-p5
-S'MOD'
-p6
-(lp7
-S'Index: /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Source/Makefile.in\n'
-p8
-aS'===================================================================\n'
-p9
-aS'--- /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Source/Makefile.in\t(revision 708)\n'
-p10
-aS'+++ /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Source/Makefile.in\t(working copy)\n'
-p11
-aS'@@ -2,11 +2,11 @@\n'
-p12
-aS' \n'
-p13
-aS' BIN = $(TOPDIR)/Bin\n'
-p14
-aS' \n'
-p15
-aS'-SUBDIRS = Theater \n'
-p16
-aS'+SUBDIRS = Theater\n'
-p17
-aS' \n'
-p18
-aS' DEMETER_PREFIX = $(TOPDIR)/$(ROOT)/Demeter\n'
-p19
-aS' DEMETER_INCLUDE = -I$(DEMETER_PREFIX)\n'
-p20
-aS'-DEMETER_LIBRARY = -L$(DEMETER_PREFIX) -ldemeter_csp \n'
-p21
-aS'+DEMETER_LIBRARY = -L$(DEMETER_PREFIX) -ldemeter_csp\n'
-p22
-aS' \n'
-p23
-aS' CHUNKLOD_PREFIX = $(TOPDIR)/$(ROOT)/CSPChunkLod\n'
-p24
-aS' CHUNKLOD_LIBRARY = -L$(CHUNKLOD_PREFIX)/lib -losgChunkLod_csp\n'
-p25
-aS'@@ -14,13 +14,13 @@\n'
-p26
-aS' \n'
-p27
-aS' LIBS = $(DEMETER_LIBRARY) $(CHUNKLOD_LIBRARY)\n'
-p28
-aS' \n'
-p29
-aS'-INCLUDE = -I$(TOPDIR)/Include $(DEMETER_INCLUDE) $(CHUNKLOD_INCLUDE) -I@PYTHON_INCLUDE@ \n'
-p30
-aS'+INCLUDE = -I$(TOPDIR)/Include $(DEMETER_INCLUDE) $(CHUNKLOD_INCLUDE) -I@PYTHON_INCLUDE@\n'
-p31
-aS' \n'
-p32
-aS' BASEFL = $(GDEBUGF) $(GCFLAGS) $(INCLUDE) @SDL_FLAGS@ @SIGC_FLAGS@ #@CCGNU2_FLAGS@\n'
-p33
-aS' CFLAGS = $(filter-out -I/usr/local/include, $(BASEFL))\n'
-p34
-aS' SWCXXF = $(GCFLAGS) $(INCLUDE) @SIGC_FLAGS@\n'
-p35
-aS' LDOPTS = -Wl,-z,lazyload $(GLDOPTS) @LIBS@\n'
-p36
-aS'-SWOPTS = $(GSWOPTS) $(INCLUDE) \n'
-p37
-aS'+SWOPTS = $(GSWOPTS) $(INCLUDE)\n'
-p38
-aS' \n'
-p39
-aS' SOURCES = \\\n'
-p40
-aS' \tSystems/AircraftFlightSensors.cpp \\\n'
-p41
-aS'@@ -91,13 +91,13 @@\n'
-p42
-aS' \tVirtualBattlefield.cpp \\\n'
-p43
-aS' \tVirtualScene.cpp\n'
-p44
-aS' \n'
-p45
-aS'-OBJECTS = $(SOURCES:%.cpp=%.o) \n'
-p46
-aS'+OBJECTS = $(SOURCES:%.cpp=%.o)\n'
-p47
-aS' \n'
-p48
-aS' DEPDIR = .deps\n'
-p49
-aS' MKDEP = $(CXX) -M $(CFLAGS)\n'
-p50
-aS' SWDEP = $(SWIG) -M $(SWOPTS)\n'
-p51
-aS' DEPFILES = $(addprefix $(DEPDIR)/,$(addsuffix .d, $(SOURCES))) $(DEPDIR)/cCSP.i.swigdep\n'
-p52
-aS'-DEPFILTER = \n'
-p53
-aS'+DEPFILTER =\n'
-p54
-aS' DEPS_MAGIC := $(shell mkdir $(DEPDIR) $(DEPDIR)/Theater $(DEPDIR)/Systems > /dev/null 2>&1 || :)\n'
-p55
-aS' \n'
-p56
-aS' .PHONY: clean-deps clean all default\n'
-p57
-aS'@@ -149,16 +149,16 @@\n'
-p58
-aS' #\t$(CXX) -lswigpy -lpython2.2 -o$@ $^ $(LIBS)\n'
-p59
-aS' \n'
-p60
-aS' cCSP_wrap.cpp: cCSP.i\n'
-p61
-aS'-\t$(SWIG) $(SWOPTS) -o $@ $< \n'
-p62
-aS'+\t$(SWIG) $(SWOPTS) -o $@ $<\n'
-p63
-aS' \tmv cCSP.py $(BIN)\n'
-p64
-aS' \n'
-p65
-aS' cCSP_wrap.o: cCSP_wrap.cpp\n'
-p66
-aS' \t$(CXX) -c $(SWCXXF) $(@:.o=.cpp)\n'
-p67
-aS' \n'
-p68
-aS'-%.o: %.cpp \n'
-p69
-aS'+%.o: %.cpp\n'
-p70
-aS' \t$(CXX) -c $(CFLAGS) -o $@ $(@:.o=.cpp)\n'
-p71
-aS' \n'
-p72
-aS'-AeroDynamics.o: AeroDynamics.cpp \n'
-p73
-aS'+AeroDynamics.o: AeroDynamics.cpp\n'
-p74
-aS' \t$(CXX) -c $(CFLAGS) -O3 $(@:.o=.cpp)\n'
-p75
-aS' \t\n'
-p76
-aS' Makefile: Makefile.in\n'
-p77
-atp78
-a(S'trunk/CSP/CSPSim/Makefile.in'
-p79
-g6
-(lp80
-S'Index: /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Makefile.in\n'
-p81
-aS'===================================================================\n'
-p82
-aS'--- /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Makefile.in\t(revision 708)\n'
-p83
-aS'+++ /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Makefile.in\t(working copy)\n'
-p84
-aS'@@ -26,7 +26,6 @@\n'
-p85
-aS' \n'
-p86
-aS' InputMaps: aircraft.hid gamescreen.hid\n'
-p87
-aS' \n'
-p88
-aS'-\n'
-p89
-aS' %.hid:\n'
-p90
-aS' \t@test -e Data/Input/$@ || \\\n'
-p91
-aS' \t  ( cd Tools/HID && \\\n'
-p92
-atp93
-asS'name'
-p94
-S'foo'
-p95
-sS'description'
-p96
-(lp97
-S'Debian is a free operating system (OS) for your computer. An operating'
-p98
-aS'system is the set of basic programs and utilities that make your computer'
-p99
-aS'run. Debian uses the Linux kernel (the core of an operating system), but'
-p100
-aS'most of the basic OS tools come from the GNU project; hence the name'
-p101
-aS'GNU/Linux.'
-p102
-as.
\ No newline at end of file

Added: reviews/change
===================================================================
--- reviews/change	2004-05-23 19:48:36 UTC (rev 717)
+++ reviews/change	2004-05-23 19:58:16 UTC (rev 718)
@@ -0,0 +1,201 @@
+(dp0
+S'date'
+p1
+S'Wed May 19 01:05:32 2004'
+p2
+sS'delta'
+p3
+(lp4
+(S'trunk/CSP/CSPSim/Source/Makefile.in'
+p5
+S'MOD'
+p6
+(lp7
+S'Index: /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Source/Makefile.in\n'
+p8
+aS'===================================================================\n'
+p9
+aS'--- /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Source/Makefile.in\t(revision 708)\n'
+p10
+aS'+++ /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Source/Makefile.in\t(working copy)\n'
+p11
+aS'@@ -2,11 +2,11 @@\n'
+p12
+aS' \n'
+p13
+aS' BIN = $(TOPDIR)/Bin\n'
+p14
+aS' \n'
+p15
+aS'-SUBDIRS = Theater \n'
+p16
+aS'+SUBDIRS = Theater\n'
+p17
+aS' \n'
+p18
+aS' DEMETER_PREFIX = $(TOPDIR)/$(ROOT)/Demeter\n'
+p19
+aS' DEMETER_INCLUDE = -I$(DEMETER_PREFIX)\n'
+p20
+aS'-DEMETER_LIBRARY = -L$(DEMETER_PREFIX) -ldemeter_csp \n'
+p21
+aS'+DEMETER_LIBRARY = -L$(DEMETER_PREFIX) -ldemeter_csp\n'
+p22
+aS' \n'
+p23
+aS' CHUNKLOD_PREFIX = $(TOPDIR)/$(ROOT)/CSPChunkLod\n'
+p24
+aS' CHUNKLOD_LIBRARY = -L$(CHUNKLOD_PREFIX)/lib -losgChunkLod_csp\n'
+p25
+aS'@@ -14,13 +14,13 @@\n'
+p26
+aS' \n'
+p27
+aS' LIBS = $(DEMETER_LIBRARY) $(CHUNKLOD_LIBRARY)\n'
+p28
+aS' \n'
+p29
+aS'-INCLUDE = -I$(TOPDIR)/Include $(DEMETER_INCLUDE) $(CHUNKLOD_INCLUDE) -I@PYTHON_INCLUDE@ \n'
+p30
+aS'+INCLUDE = -I$(TOPDIR)/Include $(DEMETER_INCLUDE) $(CHUNKLOD_INCLUDE) -I@PYTHON_INCLUDE@\n'
+p31
+aS' \n'
+p32
+aS' BASEFL = $(GDEBUGF) $(GCFLAGS) $(INCLUDE) @SDL_FLAGS@ @SIGC_FLAGS@ #@CCGNU2_FLAGS@\n'
+p33
+aS' CFLAGS = $(filter-out -I/usr/local/include, $(BASEFL))\n'
+p34
+aS' SWCXXF = $(GCFLAGS) $(INCLUDE) @SIGC_FLAGS@\n'
+p35
+aS' LDOPTS = -Wl,-z,lazyload $(GLDOPTS) @LIBS@\n'
+p36
+aS'-SWOPTS = $(GSWOPTS) $(INCLUDE) \n'
+p37
+aS'+SWOPTS = $(GSWOPTS) $(INCLUDE)\n'
+p38
+aS' \n'
+p39
+aS' SOURCES = \\\n'
+p40
+aS' \tSystems/AircraftFlightSensors.cpp \\\n'
+p41
+aS'@@ -91,13 +91,13 @@\n'
+p42
+aS' \tVirtualBattlefield.cpp \\\n'
+p43
+aS' \tVirtualScene.cpp\n'
+p44
+aS' \n'
+p45
+aS'-OBJECTS = $(SOURCES:%.cpp=%.o) \n'
+p46
+aS'+OBJECTS = $(SOURCES:%.cpp=%.o)\n'
+p47
+aS' \n'
+p48
+aS' DEPDIR = .deps\n'
+p49
+aS' MKDEP = $(CXX) -M $(CFLAGS)\n'
+p50
+aS' SWDEP = $(SWIG) -M $(SWOPTS)\n'
+p51
+aS' DEPFILES = $(addprefix $(DEPDIR)/,$(addsuffix .d, $(SOURCES))) $(DEPDIR)/cCSP.i.swigdep\n'
+p52
+aS'-DEPFILTER = \n'
+p53
+aS'+DEPFILTER =\n'
+p54
+aS' DEPS_MAGIC := $(shell mkdir $(DEPDIR) $(DEPDIR)/Theater $(DEPDIR)/Systems > /dev/null 2>&1 || :)\n'
+p55
+aS' \n'
+p56
+aS' .PHONY: clean-deps clean all default\n'
+p57
+aS'@@ -149,16 +149,16 @@\n'
+p58
+aS' #\t$(CXX) -lswigpy -lpython2.2 -o$@ $^ $(LIBS)\n'
+p59
+aS' \n'
+p60
+aS' cCSP_wrap.cpp: cCSP.i\n'
+p61
+aS'-\t$(SWIG) $(SWOPTS) -o $@ $< \n'
+p62
+aS'+\t$(SWIG) $(SWOPTS) -o $@ $<\n'
+p63
+aS' \tmv cCSP.py $(BIN)\n'
+p64
+aS' \n'
+p65
+aS' cCSP_wrap.o: cCSP_wrap.cpp\n'
+p66
+aS' \t$(CXX) -c $(SWCXXF) $(@:.o=.cpp)\n'
+p67
+aS' \n'
+p68
+aS'-%.o: %.cpp \n'
+p69
+aS'+%.o: %.cpp\n'
+p70
+aS' \t$(CXX) -c $(CFLAGS) -o $@ $(@:.o=.cpp)\n'
+p71
+aS' \n'
+p72
+aS'-AeroDynamics.o: AeroDynamics.cpp \n'
+p73
+aS'+AeroDynamics.o: AeroDynamics.cpp\n'
+p74
+aS' \t$(CXX) -c $(CFLAGS) -O3 $(@:.o=.cpp)\n'
+p75
+aS' \t\n'
+p76
+aS' Makefile: Makefile.in\n'
+p77
+atp78
+a(S'trunk/CSP/CSPSim/Makefile.in'
+p79
+g6
+(lp80
+S'Index: /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Makefile.in\n'
+p81
+aS'===================================================================\n'
+p82
+aS'--- /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Makefile.in\t(revision 708)\n'
+p83
+aS'+++ /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Makefile.in\t(working copy)\n'
+p84
+aS'@@ -26,7 +26,6 @@\n'
+p85
+aS' \n'
+p86
+aS' InputMaps: aircraft.hid gamescreen.hid\n'
+p87
+aS' \n'
+p88
+aS'-\n'
+p89
+aS' %.hid:\n'
+p90
+aS' \t@test -e Data/Input/$@ || \\\n'
+p91
+aS' \t  ( cd Tools/HID && \\\n'
+p92
+atp93
+asS'name'
+p94
+S'foo'
+p95
+sS'description'
+p96
+(lp97
+S'Debian is a free operating system (OS) for your computer. An operating'
+p98
+aS'system is the set of basic programs and utilities that make your computer'
+p99
+aS'run. Debian uses the Linux kernel (the core of an operating system), but'
+p100
+aS'most of the basic OS tools come from the GNU project; hence the name'
+p101
+aS'GNU/Linux.'
+p102
+as.
\ No newline at end of file

[Csp-commits] r717 - reviews

[<mk...@so...>]

Author: mkrose
Date: 2004-05-23 12:48:36 -0700 (Sun, 23 May 2004)
New Revision: 717

Added:
   reviews/change
Removed:
   reviews/change
Log:


Deleted: reviews/change
===================================================================
--- reviews/change	2004-05-23 19:39:26 UTC (rev 716)
+++ reviews/change	2004-05-23 19:48:36 UTC (rev 717)
@@ -1 +0,0 @@
-test

Added: reviews/change
===================================================================
--- reviews/change	2004-05-23 19:39:26 UTC (rev 716)
+++ reviews/change	2004-05-23 19:48:36 UTC (rev 717)
@@ -0,0 +1,201 @@
+(dp0
+S'date'
+p1
+S'Wed May 19 01:05:32 2004'
+p2
+sS'delta'
+p3
+(lp4
+(S'trunk/CSP/CSPSim/Source/Makefile.in'
+p5
+S'MOD'
+p6
+(lp7
+S'Index: /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Source/Makefile.in\n'
+p8
+aS'===================================================================\n'
+p9
+aS'--- /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Source/Makefile.in\t(revision 708)\n'
+p10
+aS'+++ /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Source/Makefile.in\t(working copy)\n'
+p11
+aS'@@ -2,11 +2,11 @@\n'
+p12
+aS' \n'
+p13
+aS' BIN = $(TOPDIR)/Bin\n'
+p14
+aS' \n'
+p15
+aS'-SUBDIRS = Theater \n'
+p16
+aS'+SUBDIRS = Theater\n'
+p17
+aS' \n'
+p18
+aS' DEMETER_PREFIX = $(TOPDIR)/$(ROOT)/Demeter\n'
+p19
+aS' DEMETER_INCLUDE = -I$(DEMETER_PREFIX)\n'
+p20
+aS'-DEMETER_LIBRARY = -L$(DEMETER_PREFIX) -ldemeter_csp \n'
+p21
+aS'+DEMETER_LIBRARY = -L$(DEMETER_PREFIX) -ldemeter_csp\n'
+p22
+aS' \n'
+p23
+aS' CHUNKLOD_PREFIX = $(TOPDIR)/$(ROOT)/CSPChunkLod\n'
+p24
+aS' CHUNKLOD_LIBRARY = -L$(CHUNKLOD_PREFIX)/lib -losgChunkLod_csp\n'
+p25
+aS'@@ -14,13 +14,13 @@\n'
+p26
+aS' \n'
+p27
+aS' LIBS = $(DEMETER_LIBRARY) $(CHUNKLOD_LIBRARY)\n'
+p28
+aS' \n'
+p29
+aS'-INCLUDE = -I$(TOPDIR)/Include $(DEMETER_INCLUDE) $(CHUNKLOD_INCLUDE) -I@PYTHON_INCLUDE@ \n'
+p30
+aS'+INCLUDE = -I$(TOPDIR)/Include $(DEMETER_INCLUDE) $(CHUNKLOD_INCLUDE) -I@PYTHON_INCLUDE@\n'
+p31
+aS' \n'
+p32
+aS' BASEFL = $(GDEBUGF) $(GCFLAGS) $(INCLUDE) @SDL_FLAGS@ @SIGC_FLAGS@ #@CCGNU2_FLAGS@\n'
+p33
+aS' CFLAGS = $(filter-out -I/usr/local/include, $(BASEFL))\n'
+p34
+aS' SWCXXF = $(GCFLAGS) $(INCLUDE) @SIGC_FLAGS@\n'
+p35
+aS' LDOPTS = -Wl,-z,lazyload $(GLDOPTS) @LIBS@\n'
+p36
+aS'-SWOPTS = $(GSWOPTS) $(INCLUDE) \n'
+p37
+aS'+SWOPTS = $(GSWOPTS) $(INCLUDE)\n'
+p38
+aS' \n'
+p39
+aS' SOURCES = \\\n'
+p40
+aS' \tSystems/AircraftFlightSensors.cpp \\\n'
+p41
+aS'@@ -91,13 +91,13 @@\n'
+p42
+aS' \tVirtualBattlefield.cpp \\\n'
+p43
+aS' \tVirtualScene.cpp\n'
+p44
+aS' \n'
+p45
+aS'-OBJECTS = $(SOURCES:%.cpp=%.o) \n'
+p46
+aS'+OBJECTS = $(SOURCES:%.cpp=%.o)\n'
+p47
+aS' \n'
+p48
+aS' DEPDIR = .deps\n'
+p49
+aS' MKDEP = $(CXX) -M $(CFLAGS)\n'
+p50
+aS' SWDEP = $(SWIG) -M $(SWOPTS)\n'
+p51
+aS' DEPFILES = $(addprefix $(DEPDIR)/,$(addsuffix .d, $(SOURCES))) $(DEPDIR)/cCSP.i.swigdep\n'
+p52
+aS'-DEPFILTER = \n'
+p53
+aS'+DEPFILTER =\n'
+p54
+aS' DEPS_MAGIC := $(shell mkdir $(DEPDIR) $(DEPDIR)/Theater $(DEPDIR)/Systems > /dev/null 2>&1 || :)\n'
+p55
+aS' \n'
+p56
+aS' .PHONY: clean-deps clean all default\n'
+p57
+aS'@@ -149,16 +149,16 @@\n'
+p58
+aS' #\t$(CXX) -lswigpy -lpython2.2 -o$@ $^ $(LIBS)\n'
+p59
+aS' \n'
+p60
+aS' cCSP_wrap.cpp: cCSP.i\n'
+p61
+aS'-\t$(SWIG) $(SWOPTS) -o $@ $< \n'
+p62
+aS'+\t$(SWIG) $(SWOPTS) -o $@ $<\n'
+p63
+aS' \tmv cCSP.py $(BIN)\n'
+p64
+aS' \n'
+p65
+aS' cCSP_wrap.o: cCSP_wrap.cpp\n'
+p66
+aS' \t$(CXX) -c $(SWCXXF) $(@:.o=.cpp)\n'
+p67
+aS' \n'
+p68
+aS'-%.o: %.cpp \n'
+p69
+aS'+%.o: %.cpp\n'
+p70
+aS' \t$(CXX) -c $(CFLAGS) -o $@ $(@:.o=.cpp)\n'
+p71
+aS' \n'
+p72
+aS'-AeroDynamics.o: AeroDynamics.cpp \n'
+p73
+aS'+AeroDynamics.o: AeroDynamics.cpp\n'
+p74
+aS' \t$(CXX) -c $(CFLAGS) -O3 $(@:.o=.cpp)\n'
+p75
+aS' \t\n'
+p76
+aS' Makefile: Makefile.in\n'
+p77
+atp78
+a(S'trunk/CSP/CSPSim/Makefile.in'
+p79
+g6
+(lp80
+S'Index: /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Makefile.in\n'
+p81
+aS'===================================================================\n'
+p82
+aS'--- /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Makefile.in\t(revision 708)\n'
+p83
+aS'+++ /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Makefile.in\t(working copy)\n'
+p84
+aS'@@ -26,7 +26,6 @@\n'
+p85
+aS' \n'
+p86
+aS' InputMaps: aircraft.hid gamescreen.hid\n'
+p87
+aS' \n'
+p88
+aS'-\n'
+p89
+aS' %.hid:\n'
+p90
+aS' \t@test -e Data/Input/$@ || \\\n'
+p91
+aS' \t  ( cd Tools/HID && \\\n'
+p92
+atp93
+asS'name'
+p94
+S'foo'
+p95
+sS'description'
+p96
+(lp97
+S'Debian is a free operating system (OS) for your computer. An operating'
+p98
+aS'system is the set of basic programs and utilities that make your computer'
+p99
+aS'run. Debian uses the Linux kernel (the core of an operating system), but'
+p100
+aS'most of the basic OS tools come from the GNU project; hence the name'
+p101
+aS'GNU/Linux.'
+p102
+as.
\ No newline at end of file

[Csp-commits] r716 - reviews

[<mk...@so...>]

Author: mkrose
Date: 2004-05-23 12:39:26 -0700 (Sun, 23 May 2004)
New Revision: 716

Added:
   reviews/change
Removed:
   reviews/change
Log:


Deleted: reviews/change
===================================================================
--- reviews/change	2004-05-23 19:32:02 UTC (rev 715)
+++ reviews/change	2004-05-23 19:39:26 UTC (rev 716)
@@ -1,201 +0,0 @@
-(dp0
-S'date'
-p1
-S'Wed May 19 01:05:32 2004'
-p2
-sS'delta'
-p3
-(lp4
-(S'trunk/CSP/CSPSim/Source/Makefile.in'
-p5
-S'MOD'
-p6
-(lp7
-S'Index: /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Source/Makefile.in\n'
-p8
-aS'===================================================================\n'
-p9
-aS'--- /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Source/Makefile.in\t(revision 708)\n'
-p10
-aS'+++ /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Source/Makefile.in\t(working copy)\n'
-p11
-aS'@@ -2,11 +2,11 @@\n'
-p12
-aS' \n'
-p13
-aS' BIN = $(TOPDIR)/Bin\n'
-p14
-aS' \n'
-p15
-aS'-SUBDIRS = Theater \n'
-p16
-aS'+SUBDIRS = Theater\n'
-p17
-aS' \n'
-p18
-aS' DEMETER_PREFIX = $(TOPDIR)/$(ROOT)/Demeter\n'
-p19
-aS' DEMETER_INCLUDE = -I$(DEMETER_PREFIX)\n'
-p20
-aS'-DEMETER_LIBRARY = -L$(DEMETER_PREFIX) -ldemeter_csp \n'
-p21
-aS'+DEMETER_LIBRARY = -L$(DEMETER_PREFIX) -ldemeter_csp\n'
-p22
-aS' \n'
-p23
-aS' CHUNKLOD_PREFIX = $(TOPDIR)/$(ROOT)/CSPChunkLod\n'
-p24
-aS' CHUNKLOD_LIBRARY = -L$(CHUNKLOD_PREFIX)/lib -losgChunkLod_csp\n'
-p25
-aS'@@ -14,13 +14,13 @@\n'
-p26
-aS' \n'
-p27
-aS' LIBS = $(DEMETER_LIBRARY) $(CHUNKLOD_LIBRARY)\n'
-p28
-aS' \n'
-p29
-aS'-INCLUDE = -I$(TOPDIR)/Include $(DEMETER_INCLUDE) $(CHUNKLOD_INCLUDE) -I@PYTHON_INCLUDE@ \n'
-p30
-aS'+INCLUDE = -I$(TOPDIR)/Include $(DEMETER_INCLUDE) $(CHUNKLOD_INCLUDE) -I@PYTHON_INCLUDE@\n'
-p31
-aS' \n'
-p32
-aS' BASEFL = $(GDEBUGF) $(GCFLAGS) $(INCLUDE) @SDL_FLAGS@ @SIGC_FLAGS@ #@CCGNU2_FLAGS@\n'
-p33
-aS' CFLAGS = $(filter-out -I/usr/local/include, $(BASEFL))\n'
-p34
-aS' SWCXXF = $(GCFLAGS) $(INCLUDE) @SIGC_FLAGS@\n'
-p35
-aS' LDOPTS = -Wl,-z,lazyload $(GLDOPTS) @LIBS@\n'
-p36
-aS'-SWOPTS = $(GSWOPTS) $(INCLUDE) \n'
-p37
-aS'+SWOPTS = $(GSWOPTS) $(INCLUDE)\n'
-p38
-aS' \n'
-p39
-aS' SOURCES = \\\n'
-p40
-aS' \tSystems/AircraftFlightSensors.cpp \\\n'
-p41
-aS'@@ -91,13 +91,13 @@\n'
-p42
-aS' \tVirtualBattlefield.cpp \\\n'
-p43
-aS' \tVirtualScene.cpp\n'
-p44
-aS' \n'
-p45
-aS'-OBJECTS = $(SOURCES:%.cpp=%.o) \n'
-p46
-aS'+OBJECTS = $(SOURCES:%.cpp=%.o)\n'
-p47
-aS' \n'
-p48
-aS' DEPDIR = .deps\n'
-p49
-aS' MKDEP = $(CXX) -M $(CFLAGS)\n'
-p50
-aS' SWDEP = $(SWIG) -M $(SWOPTS)\n'
-p51
-aS' DEPFILES = $(addprefix $(DEPDIR)/,$(addsuffix .d, $(SOURCES))) $(DEPDIR)/cCSP.i.swigdep\n'
-p52
-aS'-DEPFILTER = \n'
-p53
-aS'+DEPFILTER =\n'
-p54
-aS' DEPS_MAGIC := $(shell mkdir $(DEPDIR) $(DEPDIR)/Theater $(DEPDIR)/Systems > /dev/null 2>&1 || :)\n'
-p55
-aS' \n'
-p56
-aS' .PHONY: clean-deps clean all default\n'
-p57
-aS'@@ -149,16 +149,16 @@\n'
-p58
-aS' #\t$(CXX) -lswigpy -lpython2.2 -o$@ $^ $(LIBS)\n'
-p59
-aS' \n'
-p60
-aS' cCSP_wrap.cpp: cCSP.i\n'
-p61
-aS'-\t$(SWIG) $(SWOPTS) -o $@ $< \n'
-p62
-aS'+\t$(SWIG) $(SWOPTS) -o $@ $<\n'
-p63
-aS' \tmv cCSP.py $(BIN)\n'
-p64
-aS' \n'
-p65
-aS' cCSP_wrap.o: cCSP_wrap.cpp\n'
-p66
-aS' \t$(CXX) -c $(SWCXXF) $(@:.o=.cpp)\n'
-p67
-aS' \n'
-p68
-aS'-%.o: %.cpp \n'
-p69
-aS'+%.o: %.cpp\n'
-p70
-aS' \t$(CXX) -c $(CFLAGS) -o $@ $(@:.o=.cpp)\n'
-p71
-aS' \n'
-p72
-aS'-AeroDynamics.o: AeroDynamics.cpp \n'
-p73
-aS'+AeroDynamics.o: AeroDynamics.cpp\n'
-p74
-aS' \t$(CXX) -c $(CFLAGS) -O3 $(@:.o=.cpp)\n'
-p75
-aS' \t\n'
-p76
-aS' Makefile: Makefile.in\n'
-p77
-atp78
-a(S'trunk/CSP/CSPSim/Makefile.in'
-p79
-g6
-(lp80
-S'Index: /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Makefile.in\n'
-p81
-aS'===================================================================\n'
-p82
-aS'--- /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Makefile.in\t(revision 708)\n'
-p83
-aS'+++ /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Makefile.in\t(working copy)\n'
-p84
-aS'@@ -26,7 +26,6 @@\n'
-p85
-aS' \n'
-p86
-aS' InputMaps: aircraft.hid gamescreen.hid\n'
-p87
-aS' \n'
-p88
-aS'-\n'
-p89
-aS' %.hid:\n'
-p90
-aS' \t@test -e Data/Input/$@ || \\\n'
-p91
-aS' \t  ( cd Tools/HID && \\\n'
-p92
-atp93
-asS'name'
-p94
-S'foo'
-p95
-sS'description'
-p96
-(lp97
-S'Debian is a free operating system (OS) for your computer. An operating'
-p98
-aS'system is the set of basic programs and utilities that make your computer'
-p99
-aS'run. Debian uses the Linux kernel (the core of an operating system), but'
-p100
-aS'most of the basic OS tools come from the GNU project; hence the name'
-p101
-aS'GNU/Linux.'
-p102
-as.
\ No newline at end of file

Added: reviews/change
===================================================================
--- reviews/change	2004-05-23 19:32:02 UTC (rev 715)
+++ reviews/change	2004-05-23 19:39:26 UTC (rev 716)
@@ -0,0 +1 @@
+test

[Csp-commits] r715 - reviews

[<mk...@so...>]

Author: mkrose
Date: 2004-05-23 12:32:02 -0700 (Sun, 23 May 2004)
New Revision: 715

Modified:
   reviews/change
Log:


Modified: reviews/change
===================================================================
--- reviews/change	2004-05-23 18:01:45 UTC (rev 714)
+++ reviews/change	2004-05-23 19:32:02 UTC (rev 715)
@@ -1 +1,201 @@
-Sun May 23 11:03:05 2004
+(dp0
+S'date'
+p1
+S'Wed May 19 01:05:32 2004'
+p2
+sS'delta'
+p3
+(lp4
+(S'trunk/CSP/CSPSim/Source/Makefile.in'
+p5
+S'MOD'
+p6
+(lp7
+S'Index: /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Source/Makefile.in\n'
+p8
+aS'===================================================================\n'
+p9
+aS'--- /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Source/Makefile.in\t(revision 708)\n'
+p10
+aS'+++ /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Source/Makefile.in\t(working copy)\n'
+p11
+aS'@@ -2,11 +2,11 @@\n'
+p12
+aS' \n'
+p13
+aS' BIN = $(TOPDIR)/Bin\n'
+p14
+aS' \n'
+p15
+aS'-SUBDIRS = Theater \n'
+p16
+aS'+SUBDIRS = Theater\n'
+p17
+aS' \n'
+p18
+aS' DEMETER_PREFIX = $(TOPDIR)/$(ROOT)/Demeter\n'
+p19
+aS' DEMETER_INCLUDE = -I$(DEMETER_PREFIX)\n'
+p20
+aS'-DEMETER_LIBRARY = -L$(DEMETER_PREFIX) -ldemeter_csp \n'
+p21
+aS'+DEMETER_LIBRARY = -L$(DEMETER_PREFIX) -ldemeter_csp\n'
+p22
+aS' \n'
+p23
+aS' CHUNKLOD_PREFIX = $(TOPDIR)/$(ROOT)/CSPChunkLod\n'
+p24
+aS' CHUNKLOD_LIBRARY = -L$(CHUNKLOD_PREFIX)/lib -losgChunkLod_csp\n'
+p25
+aS'@@ -14,13 +14,13 @@\n'
+p26
+aS' \n'
+p27
+aS' LIBS = $(DEMETER_LIBRARY) $(CHUNKLOD_LIBRARY)\n'
+p28
+aS' \n'
+p29
+aS'-INCLUDE = -I$(TOPDIR)/Include $(DEMETER_INCLUDE) $(CHUNKLOD_INCLUDE) -I@PYTHON_INCLUDE@ \n'
+p30
+aS'+INCLUDE = -I$(TOPDIR)/Include $(DEMETER_INCLUDE) $(CHUNKLOD_INCLUDE) -I@PYTHON_INCLUDE@\n'
+p31
+aS' \n'
+p32
+aS' BASEFL = $(GDEBUGF) $(GCFLAGS) $(INCLUDE) @SDL_FLAGS@ @SIGC_FLAGS@ #@CCGNU2_FLAGS@\n'
+p33
+aS' CFLAGS = $(filter-out -I/usr/local/include, $(BASEFL))\n'
+p34
+aS' SWCXXF = $(GCFLAGS) $(INCLUDE) @SIGC_FLAGS@\n'
+p35
+aS' LDOPTS = -Wl,-z,lazyload $(GLDOPTS) @LIBS@\n'
+p36
+aS'-SWOPTS = $(GSWOPTS) $(INCLUDE) \n'
+p37
+aS'+SWOPTS = $(GSWOPTS) $(INCLUDE)\n'
+p38
+aS' \n'
+p39
+aS' SOURCES = \\\n'
+p40
+aS' \tSystems/AircraftFlightSensors.cpp \\\n'
+p41
+aS'@@ -91,13 +91,13 @@\n'
+p42
+aS' \tVirtualBattlefield.cpp \\\n'
+p43
+aS' \tVirtualScene.cpp\n'
+p44
+aS' \n'
+p45
+aS'-OBJECTS = $(SOURCES:%.cpp=%.o) \n'
+p46
+aS'+OBJECTS = $(SOURCES:%.cpp=%.o)\n'
+p47
+aS' \n'
+p48
+aS' DEPDIR = .deps\n'
+p49
+aS' MKDEP = $(CXX) -M $(CFLAGS)\n'
+p50
+aS' SWDEP = $(SWIG) -M $(SWOPTS)\n'
+p51
+aS' DEPFILES = $(addprefix $(DEPDIR)/,$(addsuffix .d, $(SOURCES))) $(DEPDIR)/cCSP.i.swigdep\n'
+p52
+aS'-DEPFILTER = \n'
+p53
+aS'+DEPFILTER =\n'
+p54
+aS' DEPS_MAGIC := $(shell mkdir $(DEPDIR) $(DEPDIR)/Theater $(DEPDIR)/Systems > /dev/null 2>&1 || :)\n'
+p55
+aS' \n'
+p56
+aS' .PHONY: clean-deps clean all default\n'
+p57
+aS'@@ -149,16 +149,16 @@\n'
+p58
+aS' #\t$(CXX) -lswigpy -lpython2.2 -o$@ $^ $(LIBS)\n'
+p59
+aS' \n'
+p60
+aS' cCSP_wrap.cpp: cCSP.i\n'
+p61
+aS'-\t$(SWIG) $(SWOPTS) -o $@ $< \n'
+p62
+aS'+\t$(SWIG) $(SWOPTS) -o $@ $<\n'
+p63
+aS' \tmv cCSP.py $(BIN)\n'
+p64
+aS' \n'
+p65
+aS' cCSP_wrap.o: cCSP_wrap.cpp\n'
+p66
+aS' \t$(CXX) -c $(SWCXXF) $(@:.o=.cpp)\n'
+p67
+aS' \n'
+p68
+aS'-%.o: %.cpp \n'
+p69
+aS'+%.o: %.cpp\n'
+p70
+aS' \t$(CXX) -c $(CFLAGS) -o $@ $(@:.o=.cpp)\n'
+p71
+aS' \n'
+p72
+aS'-AeroDynamics.o: AeroDynamics.cpp \n'
+p73
+aS'+AeroDynamics.o: AeroDynamics.cpp\n'
+p74
+aS' \t$(CXX) -c $(CFLAGS) -O3 $(@:.o=.cpp)\n'
+p75
+aS' \t\n'
+p76
+aS' Makefile: Makefile.in\n'
+p77
+atp78
+a(S'trunk/CSP/CSPSim/Makefile.in'
+p79
+g6
+(lp80
+S'Index: /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Makefile.in\n'
+p81
+aS'===================================================================\n'
+p82
+aS'--- /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Makefile.in\t(revision 708)\n'
+p83
+aS'+++ /b/mrose/tmp/cspsf/trunk/CSP/CSPSim/Makefile.in\t(working copy)\n'
+p84
+aS'@@ -26,7 +26,6 @@\n'
+p85
+aS' \n'
+p86
+aS' InputMaps: aircraft.hid gamescreen.hid\n'
+p87
+aS' \n'
+p88
+aS'-\n'
+p89
+aS' %.hid:\n'
+p90
+aS' \t@test -e Data/Input/$@ || \\\n'
+p91
+aS' \t  ( cd Tools/HID && \\\n'
+p92
+atp93
+asS'name'
+p94
+S'foo'
+p95
+sS'description'
+p96
+(lp97
+S'Debian is a free operating system (OS) for your computer. An operating'
+p98
+aS'system is the set of basic programs and utilities that make your computer'
+p99
+aS'run. Debian uses the Linux kernel (the core of an operating system), but'
+p100
+aS'most of the basic OS tools come from the GNU project; hence the name'
+p101
+aS'GNU/Linux.'
+p102
+as.
\ No newline at end of file

[Csp-commits] r714 - reviews

[<mk...@so...>]

Author: mkrose
Date: 2004-05-23 11:01:45 -0700 (Sun, 23 May 2004)
New Revision: 714

Modified:
   reviews/change
Log:


Modified: reviews/change
===================================================================
--- reviews/change	2004-05-23 17:47:16 UTC (rev 713)
+++ reviews/change	2004-05-23 18:01:45 UTC (rev 714)
@@ -1 +1 @@
-Sun May 23 10:48:36 2004
+Sun May 23 11:03:05 2004

[Csp-commits] r713 - reviews

[<mk...@so...>]

Author: mkrose
Date: 2004-05-23 10:47:16 -0700 (Sun, 23 May 2004)
New Revision: 713

Modified:
   reviews/change
Log:


Modified: reviews/change
===================================================================
--- reviews/change	2004-05-23 17:47:06 UTC (rev 712)
+++ reviews/change	2004-05-23 17:47:16 UTC (rev 713)
@@ -1 +1 @@
-Sun May 23 10:48:26 2004
+Sun May 23 10:48:36 2004

[Csp-commits] r712 - reviews

[<mk...@so...>]

Author: mkrose
Date: 2004-05-23 10:47:06 -0700 (Sun, 23 May 2004)
New Revision: 712

Modified:
   reviews/change
Log:


Modified: reviews/change
===================================================================
--- reviews/change	2004-05-23 17:46:53 UTC (rev 711)
+++ reviews/change	2004-05-23 17:47:06 UTC (rev 712)
@@ -1 +1 @@
-Sun May 23 10:48:13 2004
+Sun May 23 10:48:26 2004

[Csp-commits] r711 - reviews

[<mk...@so...>]

Author: mkrose
Date: 2004-05-23 10:46:53 -0700 (Sun, 23 May 2004)
New Revision: 711

Modified:
   reviews/change
Log:


Modified: reviews/change
===================================================================
--- reviews/change	2004-05-23 17:39:07 UTC (rev 710)
+++ reviews/change	2004-05-23 17:46:53 UTC (rev 711)
@@ -1 +1 @@
-Sun May 23 10:40:27 2004
+Sun May 23 10:48:13 2004

[Csp-commits] r710 - reviews

[<mk...@so...>]

Author: mkrose
Date: 2004-05-23 10:39:07 -0700 (Sun, 23 May 2004)
New Revision: 710

Modified:
   reviews/change
Log:


Modified: reviews/change
===================================================================
--- reviews/change	2004-05-23 17:33:48 UTC (rev 709)
+++ reviews/change	2004-05-23 17:39:07 UTC (rev 710)
@@ -1 +1 @@
-Sun May 23 10:35:07 2004
+Sun May 23 10:40:27 2004