Changeset 6592 in orxonox.OLD

Timestamp:

Jan 18, 2006, 4:43:37 PM (18 years ago)

Author:

rennerc

Message:

 

Location:

branches/network/src/lib/network

Files:

• converter.cc (modified) (4 diffs)
• converter.h (modified) (1 diff)

branches/network/src/lib/network/converter.cc

@@ -333 +333 @@
  * @return: A byte-array which accords the given float
  */
-int Converter::floatToByteArray(float x, byte* a, int length)
+int Converter::_floatToByteArray(float x, byte* a, int length)
 {
   if (length < FLOATSIZE)
@@ -433 +433 @@
  * @return: A float value which accords the given byte-array
  */
-int Converter::byteArrayToFloat(const byte* a, float* x)
+int Converter::_byteArrayToFloat(const byte* a, float* x)
 {
     //handle 0
@@ -500 +500 @@
  * @return: A byte-array which accords the given float
  */
-byte* Converter::_floatToByteArray(float x)
-{
+int Converter::floatToByteArray(float x, byte* a, int length)
+{
+  if ( length<4 )
+  {
+    PRINTF(1)("Byte Array to small\n");
+    return 0;
+  }
   byte* p = (byte*)&x;
-  byte* result = new byte[4];
+
   for (int i = 0; i < 4; i++)
-    result[i] = p[i];
-  return result;
+    a[i] = p[i];
+  return 4;
 }
 
@@ -515 +520 @@
  * @return: A float value which accords the given byte-array
  */
-float Converter::_byteArrayToFloat(byte* a)
-{
-  float* p = (float*)a;
-  float result = *p;
-  return result;
+int Converter::byteArrayToFloat(const byte* a, float* x)
+{
+  *x = *((float*)a);
+
+  return 4;
 }
 

branches/network/src/lib/network/converter.h

@@ -44 +44 @@
     static float byteArrayToFloat(byte* a);
 
-    static byte* _floatToByteArray(float x);
-    static float _byteArrayToFloat(byte* a);
-    
-    
+    static int _floatToByteArray(float x, byte* a, int length);
+    static int _byteArrayToFloat(const byte* a, float* x);
+
+
     static void debug();
     static void floatTest(float x);
     static float getDenormConst();
- 
-    
+
+
   private:
     Converter();