Changeset 6737 in orxonox.OLD

Timestamp:

Jan 25, 2006, 9:29:45 PM (18 years ago)

Author:

patrick

Message:

trunk: merged network back to trunk

Location:

trunk/src

Files:

• lib/network/converter.cc (modified) (15 diffs)
• lib/network/converter.h (modified) (1 diff)
• lib/network/network_game_manager.cc (modified) (3 diffs)
• lib/network/network_game_manager.h (modified) (2 diffs)
• lib/network/network_stream.cc (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (3 diffs)
• world_entities/space_ships/space_ship.h (modified) (1 diff)
• world_entities/weapons/weapon_manager.cc (modified) (1 diff)

trunk/src/lib/network/converter.cc

@@ -88 +88 @@
  * @remarks: The int is stored in big-endian
  * @param x: The int which is to convert
- * @return: A byte-array that accords the given int value
+ * @return: The number of written bytes
  */
 int Converter::intToByteArray(int x, byte* a, int length)
@@ -124 +124 @@
  * Converts a byte-array into an int
  * @param a: The byte-array which is to convert
- * @return: An int that accords the given byte-array
+ * @param x: The place where the result is stored
+ * @return: The number of read bytes
  */
 int Converter::byteArrayToInt(const byte* a, int* x)
@@ -150 +151 @@
 /*!
  * Converts a float into a string containing its binary representation
+ * @param x: The float which is to convert
+ * @return: A string containing the float's binary representation
  */
 char* Converter::floatToBinString(float x)
@@ -331 +334 @@
  * Converts a float value into a byte-array and stores the result into a given byte-array
  * @param x: The float which is to convert
- * @return: A byte-array which accords the given float
- */
-int Converter::_floatToByteArray(float x, byte* a, int length)
+ * @param a: The byte array where the result is to store
+ * @param length: The length of the array a
+ * @return: The number of written bytes
+ */
+int Converter::floatToByteArray(float x, byte* a, int length)
 {
   if (length < FLOATSIZE)
@@ -398 +403 @@
 
 
-    if (mantisse != 0)
-    {
+    //if (mantisse != 0)
+    //{
       while (mantisse < expmult)
       {
@@ -406 +411 @@
       }
 
-      mantisse -= expmult;
-    }
+      if (exponent >= 0)
+        mantisse -= expmult;
+      else
+      {
+        //Denormalized
+        while (exponent < 0)
+        {
+          mantisse /= 2;
+          exponent++;
+        }
+        printf("Conv: Denorm");
+      }
+    //}
   }
 
@@ -414 +430 @@
 
   int hx = mantisse + expmult * exponent;
-  int result = intToByteArray(hx, a, length);
+  //int result = intToByteArray(hx, a, length);
+  intToByteArray(hx, a, length);
   if (sgn == -1)
     a[3] += sgnadd;
@@ -424 +441 @@
 //    result[3] += sgnadd;
 
-  return result;
+  //return result;
+  return FLOATSIZE;
 }
 
@@ -431 +449 @@
  * 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
- */
-int Converter::_byteArrayToFloat(const byte* a, float* x)
+ * @param x: The place where the result is to store
+ * @return: The number of read bytes
+ */
+int Converter::byteArrayToFloat(const byte* a, float* x)
 {
     //handle 0
@@ -459 +478 @@
     return FLOATSIZE;
   }
-
-  mantisse += expmult;
-  exponent -= 128;
-
+  else if (exponent == 0 && mantisse != 0)
+  {
+    exponent = -126;
+    printf("ReConv: Denorm");
+  }
+  else
+  {
+    mantisse += expmult;
+    exponent -= 128;
+  }
 
   int sgn;
@@ -498 +523 @@
  * 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
- */
-int Converter::floatToByteArray(float x, byte* a, int length)
-{
-  if ( length<4 )
+ * @param a: The array where the result is to store
+ * @param length: The length of the array a
+ * @return: The number of written bytes
+ */
+int Converter::_floatToByteArray(float x, byte* a, int length)
+{
+  if ( length< FLOATSIZE )
   {
     PRINTF(1)("Byte Array to small\n");
@@ -511 +538 @@
   for (int i = 0; i < 4; i++)
     a[i] = p[i];
-  return 4;
+  
+  return FLOATSIZE;
 }
 
@@ -518 +546 @@
  * 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
- */
-int Converter::byteArrayToFloat(const byte* a, float* x)
+ * @param x: The place where the result is to store
+ * @return: The number of read bytes
+ */
+int Converter::_byteArrayToFloat(const byte* a, float* x)
 {
   *x = *((float*)a);
 
-  return 4;
-}
+  return FLOATSIZE;
+}
+
+
+
+
+
+
+
+
+
 
 /**
@@ -627 +665 @@
 }
 
+void Converter::ArrayfloatTest(float x)
+{
+  //float x = 8.0f;
+  //float x = numeric_limits<float>::infinity();
+
+  printf("To Convert: %e\n", x);
+  byte* res = new byte[4];
+
+  int wr = floatToByteArray(x, res, 4);
+  for (int i = 0; i < 4; i++)
+    printf("%i ", res[i]);
+  printf("  written bytes: %i \n", wr);
+
+  float y;
+  int rd = byteArrayToFloat(res, &y);
+  printf("ReConvert: %e\n", y);
+  printf("Read bytes: %i   ->  ", rd);
+
+  if (x == y)
+    printf("equal\n");
+  else
+    printf("different\n");
+}
+
 void Converter::debug()
 {
   printf("We rulez\n");
 
-  //Denormalized?
-  //floatTest(-9.87624e-38f);
-  //floatTest(-9.87624e-37f);
-  //floatTest(-9.87624e-36f);
-  //floatTest(-9.87624e-35f);
-
-  /*
-  floatTest(14.7f);
-  floatTest(12.07e15f);
-  floatTest(0.0f);
-  floatTest(5.67e-15f);
-  */
+  ArrayfloatTest(0.125f);
+  ArrayfloatTest(64.0f);
+  ArrayfloatTest(0.0f);
+  ArrayfloatTest(5.00091e-29f);
 
   //floatTest(-18.0098f);
@@ -648 +702 @@
   //floatTest(-0.0f);
   //floatTest(-5.67e-29f);
-  floatTest(-45.7e-32f);
-  floatTest(45.7e-33f);
-  floatTest(-45.7e-34f);
-  floatTest(45.7e-35f);
-}
+  
+  
+  //floatTest(-45.7e-32f);
+  //floatTest(45.7e-33f);
+  //floatTest(-45.7e-34f);
+  //floatTest(45.7e-35f);
+}

trunk/src/lib/network/converter.h

@@ -50 +50 @@
     static void debug();
     static void floatTest(float x);
+    static void ArrayfloatTest(float x);
     static float getDenormConst();
 

trunk/src/lib/network/network_game_manager.cc

@@ -32 +32 @@
 #include "network_manager.h"
 
+#include "class_list.h"
 
 /* include your own header */
@@ -462 +463 @@
 
 
+
+bool NetworkGameManager::signalLeftPlayer(int userID)
+{
+  const std::list<BaseObject*>* playableList = ClassList::getList(CL_PLAYABLE);
+  std::list<BaseObject*>::const_iterator it = playableList->begin();
+
+  for(; it != playableList->end(); it++)
+  {
+    if( dynamic_cast<Synchronizeable*>(*it)->getOwner() == userID )
+    {
+      PRINTF(0)("remove playable from %i\n", userID);
+      this->removeEntity(dynamic_cast<Synchronizeable*>(*it)->getUniqueID());
+      return true;
+    }
+  }
+  return false;
+}
+
+
 /**
  * Creates a buffer for user n
@@ -527 +547 @@
         PNode *p = dynamic_cast<PNode*>(b);
         p->setAbsCoor(pos);
-        //p->updateNode(0);
+        p->updateNode(0);
         pos += Vector(1000.0, 1000.0, 1000.0);
       }

trunk/src/lib/network/network_game_manager.h

@@ -95 +95 @@
     void sendEntityList(int userID);
 
+    bool signalNewPlayer(int userId);
+    bool signalLeftPlayer(int userID);
+
 
   private:
@@ -133 +136 @@
     bool canCreateEntity(ClassID classID);
 
-    bool signalNewPlayer(int userId);
-
     void resizeBufferVector(int n);
 

trunk/src/lib/network/network_stream.cc

@@ -390 +390 @@
       handshakes[i] = NULL;
 
+
+      NetworkGameManager::getInstance()->signalLeftPlayer(i);
+
       if ( i == networkSockets.size()-1 )
       {

trunk/src/world_entities/space_ships/space_ship.cc

@@ -289 +289 @@
   this->weaponAction();
 
-  if( xMouse != 0 || yMouse != 0)
+  if( ( xMouse != 0 || yMouse != 0 ) && this->getOwner()==this->getHostID() )
    {
     if (xMouse > controlVelocityX) xMouse = controlVelocityX;
@@ -532 +532 @@
 
   byte b;
-  SYNCHELP_READ_BYTE( b );
-
-  if ( b == DATA_state /*&& (this->getHostID()!=this->getOwner() || sender==0)*/ )
-  {
-    PRINTF(0)("GOT STATE %d\n", this->getUniqueID());
-    setRequestedSync( false );
-    setIsOutOfSync( false );
-    SYNCHELP_READ_FKT( WorldEntity::writeState );
-    //SYNCHELP_READ_FLOAT( cycle );
-
-    return SYNCHELP_READ_N;
-  }
-
-
-  if ( b == DATA_flags /*&& this->getHostID()!=this->getOwner()*/ )
-  {
-    int flags = 0;
-    SYNCHELP_READ_INT( flags );
-
-    bUp = (flags & MASK_bUp) != 0;
-    bDown = (flags & MASK_bDown) != 0;
-    bLeft = (flags & MASK_bLeft) != 0;
-    bRight = (flags & MASK_bRight) != 0;
-    bAscend = (flags & MASK_bAscend) != 0;
-    bDescend = (flags & MASK_bDescend) != 0;
-    bFire = (flags & MASK_bFire) != 0;
-    bRollL = (flags & MASK_bRollL) != 0;
-    bRollR = (flags & MASK_bRollR) != 0;
-
-  }
+
+  do
+  {
+    SYNCHELP_READ_BYTE( b );
+
+    if ( b == DATA_state /*&& (this->getHostID()!=this->getOwner() || sender==0)*/ )
+    {
+     PRINTF(0)("GOT STATE %d\n", this->getUniqueID());
+     setRequestedSync( false );
+     setIsOutOfSync( false );
+     SYNCHELP_READ_FKT( WorldEntity::writeState );
+     //SYNCHELP_READ_FLOAT( cycle );
+
+      return SYNCHELP_READ_N;
+    }
+
+
+    //TODO: do not recieve data if you are the owner
+    if ( b == DATA_flags /*&& this->getHostID()!=this->getOwner()*/ )
+    {
+      int flags = 0;
+      SYNCHELP_READ_INT( flags );
+
+      //bUp = (flags & MASK_bUp) != 0;
+      //bDown = (flags & MASK_bDown) != 0;
+      //bLeft = (flags & MASK_bLeft) != 0;
+      //bRight = (flags & MASK_bRight) != 0;
+      //bAscend = (flags & MASK_bAscend) != 0;
+      //bDescend = (flags & MASK_bDescend) != 0;
+      //bFire = (flags & MASK_bFire) != 0;
+      //bRollL = (flags & MASK_bRollL) != 0;
+      //bRollR = (flags & MASK_bRollR) != 0;
+
+    }
+
+    //TODO: do not recieve data if you are the owner
+    if ( b == DATA_mouse /*&& this->getHostID()!=this->getOwner()*/ )
+    {
+      float asdf;
+      SYNCHELP_READ_FLOAT( asdf );
+      SYNCHELP_READ_FLOAT( asdf );
+      SYNCHELP_READ_FLOAT( asdf );
+      SYNCHELP_READ_FLOAT( asdf );
+      //SYNCHELP_READ_FLOAT( mouseDir.w );
+      //SYNCHELP_READ_FLOAT( mouseDir.v.x );
+      //SYNCHELP_READ_FLOAT( mouseDir.v.y );
+      //SYNCHELP_READ_FLOAT( mouseDir.v.z );
+    }
+  } while( b != 0 );
 
   /*if ( b == DATA_mouse && this->getHostID()!=this->getOwner() )
@@ -638 +657 @@
       SYNCHELP_WRITE_INT( mask );
     }
-    else
-    {
-      SYNCHELP_WRITE_BYTE( 0 );
-    }
-
-    /*if ( oldxMouse != xMouse || oldyMouse != yMouse )
-    {
-      oldxMouse = xMouse;
-      oldyMouse = yMouse;
+#define __OFFSET_ROT 0.05
+    if ( fabs( oldMouseDir.w - mouseDir.w ) > __OFFSET_ROT ||
+         fabs( oldMouseDir.v.x - mouseDir.v.x ) > __OFFSET_ROT ||
+         fabs( oldMouseDir.v.y - mouseDir.v.y ) > __OFFSET_ROT ||
+         fabs( oldMouseDir.v.z - mouseDir.v.z ) > __OFFSET_ROT )
+    {
+      oldMouseDir = mouseDir;
+
       SYNCHELP_WRITE_BYTE( DATA_mouse );
-      SYNCHELP_WRITE_FLOAT( xMouse );
-      SYNCHELP_WRITE_FLOAT( yMouse );
-      SYNCHELP_WRITE_FLOAT( mouseSensitivity );
-      SYNCHELP_WRITE_FLOAT( cycle );
-    }*/
-  }
-  else
-  {
-    SYNCHELP_WRITE_BYTE( 0 );
-  }
+      SYNCHELP_WRITE_FLOAT( mouseDir.w );
+      SYNCHELP_WRITE_FLOAT( mouseDir.v.x );
+      SYNCHELP_WRITE_FLOAT( mouseDir.v.y );
+      SYNCHELP_WRITE_FLOAT( mouseDir.v.z );
+    }
+
+  }
+
+  SYNCHELP_WRITE_BYTE( 0 );
+
 
   if ( this->getOwner() == this->getHostID() )

trunk/src/world_entities/space_ships/space_ship.h

@@ -72 +72 @@
     Vector                velocity;           //!< the velocity of the player.
     Quaternion            mouseDir;           //!< the direction where the player wants to fly
+    Quaternion            oldMouseDir;        //!< the direction where the player wanted to fly
     float                 shipInertia;        //!< the inertia of the ship(how fast the ship reacts to a mouse input)
     Quaternion            rotQuat;

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -217 +217 @@
 bool WeaponManager::addWeapon(Weapon* weapon, int configID, int slotID)
 {
-  assert(weapon != NULL);
+  //if ( weapon == NULL )
+    return false;
 
   if (unlikely(configID >= WM_MAX_CONFIGS || slotID >= (int)this->slotCount))