Changeset 6746 in orxonox.OLD for branches/network

Timestamp:

Jan 25, 2006, 11:22:50 PM (19 years ago)

Author:

patrick

Message:

network: converter adj

Location:

branches/network/src/lib

Files:

• graphics/graphics_engine.cc (modified) (2 diffs)
• network/converter.cc (modified) (2 diffs)
• network/converter.h (modified) (2 diffs)

branches/network/src/lib/graphics/graphics_engine.cc

@@ -35 +35 @@
 #include "globals.h"
 #include "texture.h"
+
+#include "effects/graphics_effect.h"
 
 #include "shell_command.h"
@@ -655 +657 @@
 
 }
+
+
+/**
+ * loads a GraphicsEffect into the engine
+ * @param effect the GraphicsEffect to add
+ */
+void GraphicsEngine::loadGraphicsEffect(GraphicsEffect* effect)
+{}
+
+
+/**
+ * unloads a GraphicsEffect from the engine
+ * @param effect the GraphicsEffect to remove
+ */
+void GraphicsEngine::unloadGraphicsEffect(GraphicsEffect* effect)
+{}

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

@@ -197 +197 @@
     result /= 2.0f;
   return result;
-}
-
-/*!
- * Converts a float value into a byte-array
- * @param x: The float which is to convert
- * @return: A byte-array which accords the given float
- */
-byte* Converter::floatToByteArray(float x)
-{
-  byte* result = new byte[4];
-  floatToByteArray(x, result, 4);
-  return result;
-  /*
-  int mantisse = 0;
-  int exponent = 128;
-
-  int sgn;
-  if (x < 0)
-  {
-    x = -x;
-    sgn = -1;
-  }
-  else
-    sgn = 1;
-
-  if (x == 0)
-  {
-    exponent = 255;
-    mantisse = 0;
-  }
-  else
-  {
-    //if (x < getDenormConst())
-    //  printf("Denormalisiert!\n");
-    //printf("DenormConst = %e", getDenormConst());
-
-    float sub = 1;
-    while (sub < x)
-    {
-      sub *= 2;
-      exponent++;
-    }
-
-    while (x > 0)
-    {
-      if (x >= sub)
-      {
-        mantisse += 1;
-        x -= sub;
-      }
-
-      mantisse *= 2;
-      exponent--;
-      sub /= 2;
-    }
-    exponent++;
-    mantisse /= 2;
-
-    printf("Conv:        mantisse = %i exponent = %i \n", mantisse, exponent);
-
-
-    if (mantisse != 0)
-    {
-      while (mantisse < expmult)
-      {
-        mantisse *= 2;
-        exponent--;
-      }
-
-      mantisse -= expmult;
-    }
-  }
-
-  printf("Conv: mantisse = %i exponent = %i \n", mantisse, exponent);
-
-
-  int hx = mantisse + expmult * exponent;
-  byte* result = intToByteArray(hx);
-  if (sgn == -1)
-    result[3] += sgnadd;
-
-  return result;
-  */
-}
-
-
-/*!
- * Converts a byte-array into a float value
- * @param a: The byte-array which is to convert
- * @return: A float value which accords the given byte-array
- */
-float Converter::byteArrayToFloat(byte* a)
-{
-  byte* h = new byte[4];
-  float result = 0.0f;
-  byteArrayToFloat(a, &result);
-  return result;
-  /*
-  int hexp = a[2] + a[3] * 256;
-  int exponent = (hexp / 128) % 256;
-
-  int hmant = a[0] + a[1] * 256 + a[2] * 65536;
-  int mantisse = hmant % expmult;
-  if (mantisse == 0 && exponent == 255)
-    return 0;
-
-  mantisse += expmult;
-  exponent -= 128;
-
-
-  int sgn;
-  if (a[3] >= sgnadd)
-    sgn = -1;
-  else
-    sgn = 1;
-
-  printf("ReConv: mantisse = %i exponent = %i \n", mantisse, exponent);
-
-  float emult = 1;
-  if (exponent > 0)
-    for (int i = 0; i < exponent; i++)
-      emult *= 2;
-  else if (exponent < 0)
-    for (int i = 0; i > exponent; i--)
-      emult /= 2;
-
-  float result = mantisse * emult;
-  if (sgn == -1)
-    result = -result;
-
-  return result;
-  */
 }
 
@@ -651 +519 @@
   printf("To Convert: %e\n", x);
 
-  byte* res = floatToByteArray(x);
-  for (int i = 0; i < 4; i++)
-    printf("%i ", res[i]);
-  printf("\n");
-
-  float y = byteArrayToFloat(res);
-  printf("ReConvert: %e\n", y);
-
-  if (x == y)
-    printf("equal\n");
-  else
-    printf("different\n");
+//  byte* res = floatToByteArray(x);
+//   for (int i = 0; i < 4; i++)
+//     printf("%i ", res[i]);
+//   printf("\n");
+
+//  float y = byteArrayToFloat(res);
+//   printf("ReConvert: %e\n", y);
+
+//   if (x == y)
+//     printf("equal\n");
+//   else
+//     printf("different\n");
 }
 

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

@@ -31 +31 @@
     static int byteArrayToInt(const byte* a, int* x);
 
-    static int floatToByteArray(float x, byte* a, int length);
-    static int byteArrayToFloat(const byte* a, float* x);
-
     static int stringToByteArray(const char* s, byte* a, int length, int maxLength);
     static int byteArrayToString(const byte* a, char* s, int maxLength);
@@ -41 +38 @@
     static char* floatToBinString(float x);
 
-    static byte* floatToByteArray(float x);
-    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 int _floatToByteArray(float x, byte* a, int length);
     static int _byteArrayToFloat(const byte* a, float* x);
+