Changeset 6868 in orxonox.OLD

Timestamp:

Jan 30, 2006, 4:41:19 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the Network back to the trunk.
merged with command
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6817:HEAD
no conflicts

Location:

trunk/src

Files:

• defs/debug.h (modified) (1 diff)
• lib/network/network_game_manager.cc (modified) (1 diff)
• lib/network/network_stream.cc (modified) (1 diff)
• lib/network/synchronizeable.h (modified) (4 diffs)
• world_entities/playable.cc (modified) (2 diffs)
• world_entities/playable.h (modified) (2 diffs)
• world_entities/space_ships/space_ship.cc (modified) (14 diffs)
• world_entities/space_ships/space_ship.h (modified) (2 diffs)

trunk/src/defs/debug.h

@@ -32 +32 @@
 
 #include <stdio.h>
+#include <cassert>
 
 // DEFINE ERROR MODES

trunk/src/lib/network/network_game_manager.cc

@@ -575 +575 @@
     if ( (*it)->getUniqueID() == uniqueID )
     {
-      delete *it;
+      assert((*it)->isA(CL_WORLD_ENTITY));
+      dynamic_cast<WorldEntity*>(*it)->toList(OM_DEAD);
       break;
     }

trunk/src/lib/network/network_stream.cc

@@ -263 +263 @@
         if ( reciever!=0 )
         {
-          if ( networkSockets[reciever] != NULL )
-          {
-            PRINTF(5)("write %d bytes to socket %d\n", dataLength, reciever);
-            networkSockets[reciever]->writePacket(downBuffer, dataLength);
+          if ( reciever < 0)
+          {
+            for ( int i = 0; i<networkSockets.size(); i++)
+            {
+              if ( i!=-reciever && networkSockets[i] != NULL )
+              {
+                PRINTF(5)("write %d bytes to socket %d\n", dataLength, i);
+                networkSockets[i]->writePacket(downBuffer, dataLength);
+              }
+            }
           }
           else
           {
-            PRINTF(1)("networkSockets[reciever] == NULL\n");
+            if ( networkSockets[reciever] != NULL )
+            {
+              PRINTF(5)("write %d bytes to socket %d\n", dataLength, reciever);
+              networkSockets[reciever]->writePacket(downBuffer, dataLength);
+            }
+            else
+            {
+              PRINTF(1)("networkSockets[reciever] == NULL\n");
+            }
           }
         }

trunk/src/lib/network/synchronizeable.h

@@ -33 +33 @@
   NWT_SS_VELY,
   NWT_SS_VELZ,
+  NWT_SS_PL_SYNC,
   
   NWT_HS_HOST_ID,
   NWT_HS_NGM_ID,
+  
+  NWT_PL_FLAGS,
   
   NWT_PN_BO_WRITESTATE,
@@ -101 +104 @@
  * with the same argument names!
  *
+ * id is one int out of that enum on top of this comment it is used to identify
+ * read/write. when you read a value you have to use exactly the same as you used
+ * to write or you will see an assertion failing.
+ *
  * SYNCHELP_WRITE_BEGIN()
- * SYNCHELP_WRITE_INT(i)
- * SYNCHELP_WRITE_FLOAT(f)
- * SYNCHELP_WRITE_BYTE(b)
- * SYNCHELP_WRITE_STRING(s)
+ * SYNCHELP_WRITE_INT(i,id)
+ * SYNCHELP_WRITE_FLOAT(f,id)
+ * SYNCHELP_WRITE_BYTE(b,id)
+ * SYNCHELP_WRITE_STRING(s,id)
  * SYNCHELP_WRITE_N
  *
  * SYNCHELP_READ_BEGIN()
- * SYNCHELP_READ_INT(i)
- * SYNCHELP_READ_FLOAT(f)
- * SYNCHELP_READ_STRING(s,l) l = size of buffer s
- * SYNCHELP_READ_STRINGM(s)  allocates memory for string! you have to free this after
- * SYNCHELP_READ_BYTE(b)
+ * SYNCHELP_READ_INT(i,id)
+ * SYNCHELP_READ_FLOAT(f,id)
+ * SYNCHELP_READ_STRING(s,l,id) l = size of buffer s
+ * SYNCHELP_READ_STRINGM(s,id)  allocates memory for string! you have to delete this later
+ * SYNCHELP_READ_BYTE(b,id)
+ * SYNCHELP_READ_REMAINING() returns the remaining buffer size
+ * SYNCHELP_READ_NEXTBYTE()  reads the next byte but it is not removed from the buffer
  * SYNCHELP_READ_N
  *
@@ -122 +131 @@
  *  SYNCHELP_READ_FLOAT(size);
  *  SYNCHELP_READ_STRING( textureName, 1024 ); //1024 is the length of textureName
+ *  delete[] textureName;
+ *  textureName = NULL;
+ *  SYNCHELP_READ_STRINGM( texturename );      //this will call new char[strlen()+1] 
  *
  * Example 2:
@@ -130 +142 @@
  *
  */
+ 
 #define SYNCHELP_WRITE_DEBUG(n) {\
   __synchelp_write_n = Converter::intToByteArray( n, data+__synchelp_write_i, maxLength-__synchelp_write_i ); \

trunk/src/world_entities/playable.cc

@@ -40 +40 @@
 
   this->bFire = false;
+  this->oldFlags = 0;
 
   this->setSynchronized(true);
@@ -246 +247 @@
 {
 }
+
+#define FLAGS_bFire   1
+
+int Playable::writeSync( const byte * data, int length, int sender )
+{
+  SYNCHELP_READ_BEGIN();
+  
+  byte flags;
+  
+  SYNCHELP_READ_BYTE( flags, NWT_PL_FLAGS );
+  
+  bFire = (flags & FLAGS_bFire) != 0;
+  
+  return SYNCHELP_READ_N;
+}
+
+int Playable::readSync( byte * data, int maxLength )
+{
+  SYNCHELP_WRITE_BEGIN();
+  byte flags = 0;
+  
+  if ( bFire )
+    flags |= FLAGS_bFire;
+  
+
+  SYNCHELP_WRITE_BYTE( flags, NWT_PL_FLAGS );
+  oldFlags = flags;
+
+  
+  return SYNCHELP_WRITE_N;
+}
+
+bool Playable::needsReadSync( )
+{
+  byte flags = 0;
+  
+  if ( bFire )
+    flags |= FLAGS_bFire;
+  
+  return flags!=oldFlags;
+}

trunk/src/world_entities/playable.h

@@ -54 +54 @@
     /** @return a List of Events in PEV_* sytle */
     inline const std::list<int>& getEventList() { return this->events; };
+    
+    int       writeSync(const byte* data, int length, int sender);
+    int       readSync(byte* data, int maxLength );
+    bool      needsReadSync();
 
   protected:
@@ -68 +72 @@
 
     bool                  bFire;              //!< If the Ship is firing.
+    int                   oldFlags;           //!< Used for synchronisation
 
 };

trunk/src/world_entities/space_ships/space_ship.cc

@@ -95 +95 @@
   else
   {
-    this->loadModel("models/ships/reap_#.obj");
+    //this->loadModel("models/ships/reap_#.obj");
+    this->loadModel( "models/ships/fighter.obj" );
   }
 
@@ -127 +128 @@
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;
-  bFire = false;
+
   xMouse = yMouse = 0;
   yInvert = 1;
@@ -516 +517 @@
 #define MASK_bAscend    16
 #define MASK_bDescend   32
-#define MASK_bFire      64
-#define MASK_bRollL    128
-#define MASK_bRollR    256
+#define MASK_bRollL     64
+#define MASK_bRollR    128
 
 #define DATA_state       1
@@ -525 +525 @@
 #define DATA_sync        4
 #define DATA_velocity    5
+#define DATA_playables   6
 
 int SpaceShip::writeBytes( const byte * data, int length, int sender )
@@ -547 +548 @@
     if ( b == DATA_flags )
     {
-      int flags = 0;
-      SYNCHELP_READ_INT( flags, NWT_SS_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;
+      if ( this->getOwner() != this->getHostID() )
+      {
+        byte flags = 0;
+        SYNCHELP_READ_BYTE( flags, NWT_SS_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;
+        bRollL = (flags & MASK_bRollL) != 0;
+        bRollR = (flags & MASK_bRollR) != 0;
+        
+      }
+      else
+        assert(false);
 
       continue;
@@ -565 +571 @@
     if ( b == DATA_mouse )
     {
-      SYNCHELP_READ_FLOAT( mouseDir.w, NWT_SS_MOUSEDIRW );
-      SYNCHELP_READ_FLOAT( mouseDir.v.x, NWT_SS_MOUSEDIRX );
-      SYNCHELP_READ_FLOAT( mouseDir.v.y, NWT_SS_MOUSEDIRY );
-      SYNCHELP_READ_FLOAT( mouseDir.v.z, NWT_SS_MOUSEDIRZ );
+      if ( this->getOwner() != this->getHostID() )
+      {
+        SYNCHELP_READ_FLOAT( mouseDir.w, NWT_SS_MOUSEDIRW );
+        SYNCHELP_READ_FLOAT( mouseDir.v.x, NWT_SS_MOUSEDIRX );
+        SYNCHELP_READ_FLOAT( mouseDir.v.y, NWT_SS_MOUSEDIRY );
+        SYNCHELP_READ_FLOAT( mouseDir.v.z, NWT_SS_MOUSEDIRZ );
+      }
+      else
+        assert(false);
 
       continue;
@@ -576 +587 @@
     {
       if ( this->getOwner() != this->getHostID() )
+      {
         SYNCHELP_READ_FKT( PNode::writeSync, NWT_SS_PN_SYNC );
+      }
+      else
+        assert(false);
 
       continue;
@@ -583 +598 @@
     if ( b == DATA_velocity )
     {
-      SYNCHELP_READ_FLOAT( velocity.x, NWT_SS_VELX );
-      SYNCHELP_READ_FLOAT( velocity.y, NWT_SS_VELY );
-      SYNCHELP_READ_FLOAT( velocity.z, NWT_SS_VELZ );
+      if ( this->getOwner() != this->getHostID() )
+      {
+        SYNCHELP_READ_FLOAT( velocity.x, NWT_SS_VELX );
+        SYNCHELP_READ_FLOAT( velocity.y, NWT_SS_VELY );
+        SYNCHELP_READ_FLOAT( velocity.z, NWT_SS_VELZ );
+      }      
+      else
+        assert(false);
+      
+      continue;
+    }
+    
+    if ( b == DATA_playables )
+    {
+      if ( this->getOwner() != this->getHostID() )
+      {
+        SYNCHELP_READ_FKT( Playable::writeSync, NWT_SS_PL_SYNC );
+      }
+      else
+        assert(false);
     }
   }
@@ -615 +647 @@
 
     SYNCHELP_WRITE_FKT( WorldEntity::readState, NWT_SS_WE_STATE );
-    //SYNCHELP_WRITE_FLOAT( cycle );
 
     return SYNCHELP_WRITE_N;
   }
 
-  *reciever = 0;
-
-  if ( this->getOwner() == this->getHostID() && PNode::needsReadSync() )
+  *reciever = -this->getOwner();
+  bool sentSomething = false;
+
+  if ( ( this->getHostID()==0 || this->getOwner() == this->getHostID() ) && PNode::needsReadSync() )
   {
     SYNCHELP_WRITE_BYTE( DATA_sync, NWT_SS_B );
@@ -628 +660 @@
   }
 
-  if ( this->getHostID()==this->getOwner() )
-  {
-    int mask = 0;
+  if ( this->getHostID()==0 || this->getHostID()==this->getOwner() )
+  {
+    byte mask = 0;
 
     if ( bUp )
@@ -642 +674 @@
     if ( bAscend )
       mask |= MASK_bAscend;
-    if ( bFire )
-      mask |= MASK_bFire;
     if ( bRollL )
       mask |= MASK_bRollL;
@@ -650 +680 @@
 
 
-    //static float oldxMouse = xMouse + 1.0;
-    //static float oldyMouse = yMouse + 1.0;
-
     if ( mask != oldMask )
     {
       oldMask = mask;
+      sentSomething = true;
       SYNCHELP_WRITE_BYTE( DATA_flags, NWT_SS_B );
-      SYNCHELP_WRITE_INT( mask, NWT_SS_FLAGS );
+      SYNCHELP_WRITE_BYTE( mask, NWT_SS_FLAGS );
     }
 #define __OFFSET_MDIR_W 0.01
@@ -670 +698 @@
       SYNCHELP_WRITE_BYTE( DATA_mouse, NWT_SS_B );
       PRINTF(0)("SENDING mousedir\n");
+      sentSomething = true;
       SYNCHELP_WRITE_FLOAT( mouseDir.w, NWT_SS_MOUSEDIRW );
       SYNCHELP_WRITE_FLOAT( mouseDir.v.x, NWT_SS_MOUSEDIRX );
@@ -681 +710 @@
     {
       oldVelocity = velocity;
-      PRINTF(0)("SENDING velocity\n");
-      SYNCHELP_WRITE_BYTE( DATA_velocity, NWT_SS_B );
-      SYNCHELP_WRITE_FLOAT( velocity.x, NWT_SS_VELX );
-      SYNCHELP_WRITE_FLOAT( velocity.y, NWT_SS_VELY );
-      SYNCHELP_WRITE_FLOAT( velocity.z, NWT_SS_VELZ );
-    }
-
-  }
+      //PRINTF(0)("SENDING velocity\n");
+      //SYNCHELP_WRITE_BYTE( DATA_velocity, NWT_SS_B );
+      //SYNCHELP_WRITE_FLOAT( velocity.x, NWT_SS_VELX );
+      //SYNCHELP_WRITE_FLOAT( velocity.y, NWT_SS_VELY );
+      //SYNCHELP_WRITE_FLOAT( velocity.z, NWT_SS_VELZ );
+    }
+    
+    if ( Playable::needsReadSync() )
+    {
+      sentSomething = true;
+      SYNCHELP_WRITE_BYTE( DATA_playables, NWT_SS_B );
+      SYNCHELP_WRITE_FKT( Playable::readSync, NWT_SS_PL_SYNC );
+    }
+
+  }
+  
+  if ( !sentSomething )
+    reciever = 0;
 
   return SYNCHELP_WRITE_N;

trunk/src/world_entities/space_ships/space_ship.h

@@ -56 +56 @@
     bool                  bAscend;            //!< ascend button pressed.
     bool                  bDescend;           //!< descend button presses.
-    bool                  bFire;              //!< fire button pressed.
+//    bool                  bFire;              //!< fire button pressed.(moved to playable)
     bool                  bRollL;             //!< rolling button pressed (left)
     bool                  bRollR;             //!< rolling button pressed (right)
@@ -80 +80 @@
     float                 airViscosity;
 
-    int oldMask;
+    byte                  oldMask;            //!< used for synchronisation
 
     ParticleEmitter*      burstEmitter;