Changeset 6526 in orxonox.OLD

Timestamp:

Jan 18, 2006, 1:01:27 PM (18 years ago)

Author:

rennerc

Message:

pnode can sync now

Location:

branches/network/src

Files:

• lib/coord/p_node.cc (modified) (5 diffs)
• lib/coord/p_node.h (modified) (1 diff)
• lib/network/network_game_manager.cc (modified) (7 diffs)
• lib/network/network_stream.cc (modified) (1 diff)
• story_entities/multi_player_world_data.cc (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (8 diffs)

branches/network/src/lib/coord/p_node.cc

@@ -501 +501 @@
 {
   PNode* childNode = dynamic_cast<PNode*>(ClassList::getObject(childName, CL_PARENT_NODE));
+//  PRINTF(0)("Adding the Child: %s to: %s\n", childName, this->getName());
+//  assert( childNode != NULL );
   if (childNode != NULL)
+  {
     this->addChild(childNode);
+  }
 }
 
@@ -1063 +1067 @@
   SYNCHELP_READ_FLOAT( f3 );
   this->setRelCoor( f1, f2, f3 );
-  //this->setRelCoor( 5, 0, 0 );
-
-  /*SYNCHELP_READ_FLOAT( f1 );
-  SYNCHELP_READ_FLOAT( f2 );
-  SYNCHELP_READ_FLOAT( f3 );*/
-  //this->setAbsCoor( f1, f2, f3 );
+
 
   SYNCHELP_READ_FLOAT( f1 );
@@ -1076 +1075 @@
   this->setRelDir( Quaternion( Vector(f2, f3, f4), f1 ) );
 
-  /*SYNCHELP_READ_FLOAT( f1 );
-  SYNCHELP_READ_FLOAT( f2 );
-  SYNCHELP_READ_FLOAT( f3 );
-  SYNCHELP_READ_FLOAT( f4 );*/
-  //this->setAbsDir( Quaternion( Vector(f2, f3, f4), f1 ) );
-
   int n;
   char * childName;
@@ -1126 +1119 @@
   SYNCHELP_WRITE_FLOAT( this->relCoordinate.z );
 
-  //PRINTF(0)("%s, %f, %f, %f\n", getClassName(), relCoordinate.x, relCoordinate.y, relCoordinate.z);
-
-  /*SYNCHELP_WRITE_FLOAT( this->absCoordinate.x );
-  SYNCHELP_WRITE_FLOAT( this->absCoordinate.y );
-  SYNCHELP_WRITE_FLOAT( this->absCoordinate.z );*/
-
-  //PRINTF(0)("%s, %f, %f, %f\n", getClassName(), absCoordinate.x, absCoordinate.y, absCoordinate.z);
-
   SYNCHELP_WRITE_FLOAT( this->relDirection.w );
   SYNCHELP_WRITE_FLOAT( this->relDirection.v.x );
@@ -1139 +1124 @@
   SYNCHELP_WRITE_FLOAT( this->relDirection.v.z );
 
-  /*SYNCHELP_WRITE_FLOAT( this->absDirection.w );
-  SYNCHELP_WRITE_FLOAT( this->absDirection.v.x );
-  SYNCHELP_WRITE_FLOAT( this->absDirection.v.y );
-  SYNCHELP_WRITE_FLOAT( this->absDirection.v.z );*/
-
   int n = children.size();
+
+  //check if camera is in children
+  for (std::list<PNode*>::const_iterator it = children.begin(); it!=children.end(); it++)
+  {
+    if ( (*it)->isA(CL_CAMERA) )
+      n--;
+  }
   SYNCHELP_WRITE_INT( n );
 
   for (std::list<PNode*>::const_iterator it = children.begin(); it!=children.end(); it++)
   {
-    SYNCHELP_WRITE_STRING( (*it)->getName() );
+    //dont add camera because there is only one camera attached to local player
+    if ( !(*it)->isA(CL_CAMERA) )
+      SYNCHELP_WRITE_STRING( (*it)->getName() );
   }
 
   return SYNCHELP_WRITE_N;
 }
+
+#define __FLAG_COOR 1
+#define __FLAG_ROT  2
+
+#define __OFFSET 1.0
+
+/**
+ * Writes data from network containing information about the state which has changed
+ * @param data pointer to data
+ * @param length length of data
+ * @param sender hostID of sender
+ */
+int PNode::writeSync( const byte * data, int length, int sender )
+{
+  SYNCHELP_READ_BEGIN();
+
+  if ( this->getHostID()==this->getOwner() )
+  {
+    return SYNCHELP_READ_N;
+  }
+
+  byte flags = 0;
+  SYNCHELP_READ_BYTE( flags );
+  //PRINTF(0)("%s::FLAGS = %d\n", this->getName(), flags);
+
+  float f1, f2, f3, f4;
+
+  if ( flags & __FLAG_COOR )
+  {
+    SYNCHELP_READ_FLOAT( f1 );
+    SYNCHELP_READ_FLOAT( f2 );
+    SYNCHELP_READ_FLOAT( f3 );
+    this->setRelCoor( f1, f2, f3 );
+  }
+
+  if ( flags & __FLAG_ROT )
+  {
+    SYNCHELP_READ_FLOAT( f1 );
+    SYNCHELP_READ_FLOAT( f2 );
+    SYNCHELP_READ_FLOAT( f3 );
+    SYNCHELP_READ_FLOAT( f4 );
+    this->setRelDir( Quaternion( Vector(f2, f3, f4), f1 ) );
+  }
+
+  return SYNCHELP_READ_N;
+}
+
+/**
+ * data copied in data will bee sent to another host
+ * @param data pointer to data
+ * @param maxLength max length of data
+ * @return the number of bytes writen
+ */
+int PNode::readSync( byte * data, int maxLength )
+{
+  SYNCHELP_WRITE_BEGIN();
+
+  if ( this->getHostID()!=this->getOwner() )
+  {
+    return SYNCHELP_WRITE_N;
+  }
+
+  static float coorx = relCoordinate.x + 1;
+  static float coory = relCoordinate.y + 1;
+  static float coorz = relCoordinate.z + 1;
+
+  static float rotw = relDirection.w + 1;
+  static float rotx = relDirection.v.x + 1;
+  static float roty = relDirection.v.y + 1;
+  static float rotz = relDirection.v.z + 1;
+
+  byte flags = 0;
+  if ( fabs( coorx - relCoordinate.x ) > __OFFSET ||
+       fabs( coory - relCoordinate.y ) > __OFFSET ||
+       fabs( coorz - relCoordinate.z ) > __OFFSET )
+    flags |= __FLAG_COOR;
+
+  if ( fabs( rotw - relDirection.w ) > __OFFSET ||
+       fabs( rotx - relDirection.v.x ) > __OFFSET ||
+       fabs( roty - relDirection.v.y ) > __OFFSET ||
+       fabs( rotz - relDirection.v.z ) > __OFFSET )
+    flags |= __FLAG_ROT;
+
+  SYNCHELP_WRITE_BYTE( flags );
+  //PRINTF(0)("FLAGS = %d\n", flags);
+
+  coorx = relCoordinate.x;
+  coory = relCoordinate.y;
+  coorz = relCoordinate.z;
+
+
+  rotw = relDirection.w;
+  rotx = relDirection.v.x;
+  roty = relDirection.v.y;
+  rotz = relDirection.v.z;
+
+
+  if ( flags & __FLAG_COOR )
+  {
+
+    PRINTF(0)("%f %f %f\n", coorx, coory, coorz);
+
+    SYNCHELP_WRITE_FLOAT( this->relCoordinate.x );
+    SYNCHELP_WRITE_FLOAT( this->relCoordinate.y );
+    SYNCHELP_WRITE_FLOAT( this->relCoordinate.z );
+  }
+
+  if ( flags & __FLAG_ROT )
+  {
+
+    PRINTF(0)("%f %f %f %f\n", rotw, rotx, roty, rotz);
+
+    SYNCHELP_WRITE_FLOAT( this->relDirection.w );
+    SYNCHELP_WRITE_FLOAT( this->relDirection.v.x );
+    SYNCHELP_WRITE_FLOAT( this->relDirection.v.y );
+    SYNCHELP_WRITE_FLOAT( this->relDirection.v.z );
+  }
+
+  return SYNCHELP_WRITE_N;
+}

branches/network/src/lib/coord/p_node.h

@@ -185 +185 @@
   int       writeState(const byte* data, int length, int sender);
   int       readState(byte* data, int maxLength );
+  int       writeSync(const byte* data, int length, int sender);
+  int       readSync(byte* data, int maxLength );
 
  private:

branches/network/src/lib/network/network_game_manager.cc

@@ -130 +130 @@
     }
 
+    if ( b == REQUEST_ENTITY_LIST )
+    {
+      sendEntityList( sender );
+      continue;
+    }
+
     if ( b == REQUEST_SYNC )
     {
       if ( !handleRequestSync( i, data, length, sender ) )
         return i;
-      continue;
-    }
-
-    if ( b == REQUEST_ENTITY_LIST )
-    {
-      sendEntityList( sender );
       continue;
     }
@@ -486 +486 @@
 
     //HACK: hack to prevent collision
-    if ( b->isA(CL_WORLD_ENTITY) )
+    if ( b->isA(CL_WORLD_ENTITY) /*&& !b->isA(CL_PLAYABLE)*/ )
     {
       if ( NetworkManager::getInstance()->getHostID()!=0 )
@@ -492 +492 @@
         static Vector pos = Vector(1000.0, 1000.0, 1000.0);
         PNode *p = dynamic_cast<PNode*>(b);
-        p->setRelCoor(pos);
-        p->updateNode(0);
+        p->setAbsCoor(pos);
+        //p->updateNode(0);
         pos += Vector(1000.0, 1000.0, 1000.0);
       }
@@ -599 +599 @@
 
   Playable *p = NULL;
+  Synchronizeable *s = NULL;
 
   for ( ; it !=networkStream->getSyncEnd(); it++ )
@@ -604 +605 @@
     if ( (*it)->getUniqueID()==uniqueID )
     {
+      if ( (*it)->isA( CL_SYNCHRONIZEABLE ) )
+      {
+        s = dynamic_cast<Synchronizeable*>(*it);
+      }
       if ( (*it)->isA( CL_PLAYABLE ) )
       {
@@ -617 +622 @@
   Player* player = State::getPlayer();
   assert(p != NULL);
+  assert(s != NULL);
   assert(player != NULL);
+
+  s->setIsOutOfSync( true );
+
+  PRINTF(0)("uniqueID = %d\n", s->getUniqueID());
 
   player->setControllable(p);
@@ -874 +884 @@
 void NetworkGameManager::sync( int uniqueID, int owner )
 {
-  if ( owner==this->getHostID() )
-    return;
+  /*if ( owner==this->getHostID() )
+  return;*/
 
   if ( !isServer() )

branches/network/src/lib/network/network_stream.cc

@@ -311 +311 @@
             if ( (*it)->writeBytes(upBuffer+sizeof(header), dataLength, i) != header.length )
             {
-              PRINTF(1)("%s did not read all the data!\n", (*it)->getClassName());
+              PRINTF(1)("%s did not read all the data id = %d!\n", (*it)->getClassName(), (*it)->getUniqueID());
               break;
             }

branches/network/src/story_entities/multi_player_world_data.cc

@@ -263 +263 @@
 
 
+  Playable* pl = this->localPlayer->getControllable();
+  PRINTF(0)("The current regisered playable is hid: %i\n", pl->getUniqueID());
+
 
   PNode* cam = State::getCameraTarget();

branches/network/src/world_entities/space_ships/space_ship.cc

@@ -292 +292 @@
 
   //hoover effect
-  cycle += time;
-  this->shiftCoor(Vector(0,1,0)*cos(this->cycle*2.0)*0.02);
+  //cycle += time;
+  //this->shiftCoor(Vector(0,1,0)*cos(this->cycle*2.0)*0.02);
 
   //readjust
@@ -531 +531 @@
   SYNCHELP_READ_BYTE( b );
 
-  if ( b == DATA_state && this->getHostID()!=this->getOwner() )
-  {
+  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() )
+    //SYNCHELP_READ_FLOAT( cycle );
+
+    return SYNCHELP_READ_N;
+  }
+
+
+  if ( b == DATA_flags /*&& this->getHostID()!=this->getOwner()*/ )
   {
     int flags;
-    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;
-  }
-
-  if ( b == DATA_mouse && this->getHostID()!=this->getOwner() )
+    //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;
+
+  }
+
+  /*if ( b == DATA_mouse && this->getHostID()!=this->getOwner() )
   {
     SYNCHELP_READ_FLOAT( xMouse );
@@ -563 +566 @@
     SYNCHELP_READ_FLOAT( mouseSensitivity );
     SYNCHELP_READ_FLOAT( cycle );
-  }
+}*/
+
+  SYNCHELP_READ_FKT( PNode::writeSync );
 
   return SYNCHELP_READ_N;
@@ -574 +579 @@
   SYNCHELP_WRITE_BEGIN();
 
-  if ( isOutOfSync() && !requestedSync() && this->getHostID()!=this->getOwner() )
+  if ( isOutOfSync() && !requestedSync() /*&& this->getHostID()!=this->getOwner()*/ )
   {
     (NetworkGameManager::getInstance())->sync( this->getUniqueID(), this->getOwner() );
     setRequestedSync( true );
+    PRINTF(0)("REQUESTED STATE %d\n", this->getUniqueID());
   }
 
@@ -585 +591 @@
     *reciever = rec;
 
+    PRINTF(0)("SEND STATE %d %d\n", this->getUniqueID(), rec);
+
     SYNCHELP_WRITE_BYTE( (byte)DATA_state );
 
     SYNCHELP_WRITE_FKT( WorldEntity::readState );
-    SYNCHELP_WRITE_FLOAT( cycle );
+    //SYNCHELP_WRITE_FLOAT( cycle );
 
     return SYNCHELP_WRITE_N;
   }
-
-  return 0;
 
   *reciever = 0;
@@ -619 +625 @@
 
     static int oldMask = mask+1; //so it is different the first time!
-    static float oldxMouse = xMouse + 1.0;
-    static float oldyMouse = yMouse + 1.0;
+    //static float oldxMouse = xMouse + 1.0;
+    //static float oldyMouse = yMouse + 1.0;
 
     if ( mask != oldMask )
@@ -626 +632 @@
       oldMask = mask;
       SYNCHELP_WRITE_BYTE( DATA_flags );
-      SYNCHELP_WRITE_INT( mask );
-    }
-
-    if ( oldxMouse != xMouse || oldyMouse != yMouse )
+      //SYNCHELP_WRITE_INT( mask );
+    }
+    else
+    {
+      SYNCHELP_WRITE_BYTE( 0 );
+    }
+
+    /*if ( oldxMouse != xMouse || oldyMouse != yMouse )
     {
       oldxMouse = xMouse;
@@ -638 +648 @@
       SYNCHELP_WRITE_FLOAT( mouseSensitivity );
       SYNCHELP_WRITE_FLOAT( cycle );
-    }
-  }
+    }*/
+  }
+  else
+  {
+    SYNCHELP_WRITE_BYTE( 0 );
+  }
+
+  SYNCHELP_WRITE_FKT( PNode::readSync );
 
   return SYNCHELP_WRITE_N;