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