Changeset 6784 in orxonox.OLD for branches/network/src/world_entities

Timestamp:

Jan 26, 2006, 8:03:40 PM (19 years ago)

Author:

rennerc

Message:

sync: added debug feature

Location:

branches/network/src/world_entities

Files:

• environments/water.cc (modified) (7 diffs)
• npcs/ground_turret.cc (modified) (2 diffs)
• power_ups/laser_power_up.cc (modified) (2 diffs)
• power_ups/param_power_up.cc (modified) (2 diffs)
• power_ups/power_up.cc (modified) (2 diffs)
• power_ups/turret_power_up.cc (modified) (2 diffs)
• power_ups/weapon_power_up.cc (modified) (2 diffs)
• skybox.cc (modified) (3 diffs)
• space_ships/space_ship.cc (modified) (8 diffs)
• space_ships/space_ship.h (modified) (1 diff)
• terrain.cc (modified) (2 diffs)
• world_entity.cc (modified) (3 diffs)

branches/network/src/world_entities/environments/water.cc

@@ -298 +298 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( Water::writeState );
+  SYNCHELP_READ_FKT( Water::writeState, NWT_WAT_STATE );
 
   return SYNCHELP_READ_N;
@@ -324 +324 @@
   {
     *reciever = rec;
-    SYNCHELP_WRITE_FKT( Water::readState );
+    SYNCHELP_WRITE_FKT( Water::readState, NWT_WAT_STATE );
   }
 
@@ -343 +343 @@
   SYNCHELP_WRITE_BEGIN();
 
-  SYNCHELP_WRITE_FKT( WorldEntity::readState );
+  SYNCHELP_WRITE_FKT( WorldEntity::readState, NWT_WAT_WE_STATE );
 
   // sync the size
-  SYNCHELP_WRITE_FLOAT( this->sizeX );
-  SYNCHELP_WRITE_FLOAT( this->sizeY );
+  SYNCHELP_WRITE_FLOAT( this->sizeX, NWT_WAT_SIZEX );
+  SYNCHELP_WRITE_FLOAT( this->sizeY, NWT_WAT_SIZEY );
 
   //sync resolution
-  SYNCHELP_WRITE_INT( this->resX );
-  SYNCHELP_WRITE_INT( this->resY );
+  SYNCHELP_WRITE_INT( this->resX, NWT_WAT_RESX );
+  SYNCHELP_WRITE_INT( this->resY, NWT_WAT_RESY );
 
   //sync the height
-  SYNCHELP_WRITE_FLOAT( this->height );
+  SYNCHELP_WRITE_FLOAT( this->height, NWT_WAT_HEIGHT );
 
   return SYNCHELP_WRITE_N;
@@ -370 +370 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( WorldEntity::writeState );
+  SYNCHELP_READ_FKT( WorldEntity::writeState, NWT_WAT_WE_STATE );
 
   float f1, f2;
@@ -376 +376 @@
 
   //read the size
-  SYNCHELP_READ_FLOAT( f1 );
-  SYNCHELP_READ_FLOAT( f2 );
+  SYNCHELP_READ_FLOAT( f1, NWT_WAT_SIZEX );
+  SYNCHELP_READ_FLOAT( f2, NWT_WAT_SIZEY );
   this->sizeX = f1;
   this->sizeY = f2;
@@ -383 +383 @@
 
   //read the resolution
-  SYNCHELP_READ_INT( i1 );
-  SYNCHELP_READ_INT( i2 );
+  SYNCHELP_READ_INT( i1, NWT_WAT_RESX );
+  SYNCHELP_READ_INT( i2, NWT_WAT_RESY );
   this->resX = i1;
   this->resY = i2;
@@ -390 +390 @@
 
   //read the height
-  SYNCHELP_READ_FLOAT( f1 );
+  SYNCHELP_READ_FLOAT( f1, NWT_WAT_HEIGHT );
   this->height = f1;
 

branches/network/src/world_entities/npcs/ground_turret.cc

@@ -181 +181 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( WorldEntity::writeState );
+  SYNCHELP_READ_FKT( WorldEntity::writeState, NWT_GT_WE_STATE );
 
   return SYNCHELP_READ_N;
@@ -207 +207 @@
     *reciever = rec;
 
-    SYNCHELP_WRITE_FKT( WorldEntity::readState );
+    SYNCHELP_WRITE_FKT( WorldEntity::readState, NWT_GT_WE_STATE );
 
   }

branches/network/src/world_entities/power_ups/laser_power_up.cc

@@ -126 +126 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( PowerUp::writeState );
+  SYNCHELP_READ_FKT( PowerUp::writeState, NWT_LPU_WE_STATE );
 
   return SYNCHELP_READ_N;
@@ -148 +148 @@
     SYNCHELP_WRITE_BEGIN();
 
-    SYNCHELP_WRITE_FKT( PowerUp::readState );
+    SYNCHELP_WRITE_FKT( PowerUp::readState, NWT_LPU_WE_STATE );
 
     return SYNCHELP_WRITE_N;

branches/network/src/world_entities/power_ups/param_power_up.cc

@@ -131 +131 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( PowerUp::writeState );
+  SYNCHELP_READ_FKT( PowerUp::writeState, NWT_PPU_WE_STATE );
 
   int i;
-  SYNCHELP_READ_INT( i );
+  SYNCHELP_READ_INT( i, NWT_PPU_TYPE );
   this->type = (EnumParamPowerUpType)i;
-  SYNCHELP_READ_FLOAT( this->value );
+  SYNCHELP_READ_FLOAT( this->value, NWT_PPU_VALUE );
 
   if ( this->value != 0 )
   {
-    SYNCHELP_READ_FLOAT( this->min_value );
-    SYNCHELP_READ_FLOAT( this->max_value );
+    SYNCHELP_READ_FLOAT( this->min_value, NWT_PPU_MINVALUE );
+    SYNCHELP_READ_FLOAT( this->max_value, NWT_PPU_MAXVALUE );
     respawn();
   }
@@ -165 +165 @@
     SYNCHELP_WRITE_BEGIN();
 
-    SYNCHELP_WRITE_FKT( PowerUp::readState );
+    SYNCHELP_WRITE_FKT( PowerUp::readState, NWT_PPU_WE_STATE );
 
     int i = (int)this->type;
-    SYNCHELP_WRITE_INT( i );
-    SYNCHELP_WRITE_FLOAT( this->value );
+    SYNCHELP_WRITE_INT( i, NWT_PPU_TYPE );
+    SYNCHELP_WRITE_FLOAT( this->value, NWT_PPU_VALUE );
 
     if ( this->value != 0 )
     {
-      SYNCHELP_WRITE_FLOAT( this->min_value );
-      SYNCHELP_WRITE_FLOAT( this->max_value );
+      SYNCHELP_WRITE_FLOAT( this->min_value, NWT_PPU_MINVALUE );
+      SYNCHELP_WRITE_FLOAT( this->max_value, NWT_PPU_MAXVALUE );
     }
 

branches/network/src/world_entities/power_ups/power_up.cc

@@ -124 +124 @@
 {
   SYNCHELP_WRITE_BEGIN();
-  SYNCHELP_WRITE_FKT( WorldEntity::readState );
+  SYNCHELP_WRITE_FKT( WorldEntity::readState, NWT_PU_WE_STATE );
   return SYNCHELP_WRITE_N;
 }
@@ -138 +138 @@
 {
   SYNCHELP_READ_BEGIN();
-  SYNCHELP_READ_FKT( WorldEntity::writeState );
+  SYNCHELP_READ_FKT( WorldEntity::writeState, NWT_PU_WE_STATE );
   return SYNCHELP_READ_N;
 }

branches/network/src/world_entities/power_ups/turret_power_up.cc

@@ -135 +135 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( PowerUp::writeState );
+  SYNCHELP_READ_FKT( PowerUp::writeState, NWT_TPU_WE_STATE );
 
   return SYNCHELP_READ_N;
@@ -156 +156 @@
     SYNCHELP_WRITE_BEGIN();
 
-    SYNCHELP_WRITE_FKT( PowerUp::readState );
+    SYNCHELP_WRITE_FKT( PowerUp::readState, NWT_TPU_WE_STATE );
 
     return SYNCHELP_WRITE_N;

branches/network/src/world_entities/power_ups/weapon_power_up.cc

@@ -100 +100 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( PowerUp::writeState );
+  SYNCHELP_READ_FKT( PowerUp::writeState, NWT_WPU_WE_STATE );
 
   //TODO: sync weapon class ( see loadParams )
@@ -124 +124 @@
     SYNCHELP_WRITE_BEGIN();
 
-    SYNCHELP_WRITE_FKT( PowerUp::readState );
+    SYNCHELP_WRITE_FKT( PowerUp::readState, NWT_WPU_WE_STATE );
 
     //TODO: sync weapon class ( see loadParams )

branches/network/src/world_entities/skybox.cc

@@ -297 +297 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( WorldEntity::writeState );
-
-  SYNCHELP_READ_FLOAT( size );
+  SYNCHELP_READ_FKT( WorldEntity::writeState, NWT_SB_WE_STATE );
+
+  SYNCHELP_READ_FLOAT( size, NWT_SB_SIZE );
   if ( textureName )
   {
@@ -305 +305 @@
     textureName = NULL;
   }
-  SYNCHELP_READ_STRINGM( textureName );
+  SYNCHELP_READ_STRINGM( textureName, NWT_SB_TEXTURENAME );
 
   this->setSize( size );
@@ -331 +331 @@
     SYNCHELP_WRITE_BEGIN();
 
-    SYNCHELP_WRITE_FKT( WorldEntity::readState );
-
-    SYNCHELP_WRITE_FLOAT(this->size);
-    SYNCHELP_WRITE_STRING(this->textureName);
+    SYNCHELP_WRITE_FKT( WorldEntity::readState, NWT_SB_WE_STATE );
+
+    SYNCHELP_WRITE_FLOAT(this->size, NWT_SB_SIZE);
+    SYNCHELP_WRITE_STRING(this->textureName, NWT_SB_TEXTURENAME);
 
     return SYNCHELP_WRITE_N;

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

@@ -557 +557 @@
 
   byte b;
-
-  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 );
+  
+  if ( SYNCHELP_READ_REMAINING()>0 && SYNCHELP_READ_NEXTBYTE() == 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, NWT_SS_WE_STATE );
      //SYNCHELP_READ_FLOAT( cycle );
 
-      return SYNCHELP_READ_N;
-    }
-
+    return SYNCHELP_READ_N;
+  }
+  
+  if ( this->getOwner() != this->getHostID() )
+    SYNCHELP_READ_FKT( PNode::writeSync, NWT_SS_PN_SYNC );
+
+  while ( SYNCHELP_READ_REMAINING()>0 )
+  {
+    SYNCHELP_READ_BYTE( b, NWT_SS_B );
 
     //TODO: do not recieve data if you are the owner
@@ -578 +580 @@
     {
       int flags = 0;
-      SYNCHELP_READ_INT( flags );
+      SYNCHELP_READ_INT( flags, NWT_SS_FLAGS );
 
       bUp = (flags & MASK_bUp) != 0;
@@ -595 +597 @@
     if ( b == DATA_mouse /*&& this->getHostID()!=this->getOwner()*/ )
     {
-      SYNCHELP_READ_FLOAT( mouseDir.w );
-      SYNCHELP_READ_FLOAT( mouseDir.v.x );
-      SYNCHELP_READ_FLOAT( mouseDir.v.y );
-      SYNCHELP_READ_FLOAT( mouseDir.v.z );
+      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 );
     }
-  } while( b != 0 );
+  };
 
   /*if ( b == DATA_mouse && this->getHostID()!=this->getOwner() )
@@ -610 +612 @@
 }*/
 
-  if ( this->getOwner() != this->getHostID() )
-    SYNCHELP_READ_FKT( PNode::writeSync );
-
   return SYNCHELP_READ_N;
 }
@@ -636 +635 @@
     PRINTF(0)("SEND STATE %d %d\n", this->getUniqueID(), rec);
 
-    SYNCHELP_WRITE_BYTE( (byte)DATA_state );
-
-    SYNCHELP_WRITE_FKT( WorldEntity::readState );
+    SYNCHELP_WRITE_BYTE( (byte)DATA_state, NWT_SS_B );
+
+    SYNCHELP_WRITE_FKT( WorldEntity::readState, NWT_SS_WE_STATE );
     //SYNCHELP_WRITE_FLOAT( cycle );
 
@@ -645 +644 @@
 
   *reciever = 0;
+  
+  if ( this->getOwner() == this->getHostID() )
+    SYNCHELP_WRITE_FKT( PNode::readSync, NWT_SS_PN_SYNC );
 
   if ( this->getHostID()==this->getOwner() )
@@ -674 +676 @@
     {
       oldMask = mask;
-      SYNCHELP_WRITE_BYTE( DATA_flags );
-      SYNCHELP_WRITE_INT( mask );
+      SYNCHELP_WRITE_BYTE( DATA_flags, NWT_SS_B );
+      SYNCHELP_WRITE_INT( mask, NWT_SS_FLAGS );
     }
 #define __OFFSET_ROT 0.05
@@ -685 +687 @@
       oldMouseDir = mouseDir;
 
-      SYNCHELP_WRITE_BYTE( DATA_mouse );
-      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( DATA_mouse, NWT_SS_B );
+      SYNCHELP_WRITE_FLOAT( mouseDir.w, NWT_SS_MOUSEDIRW );
+      SYNCHELP_WRITE_FLOAT( mouseDir.v.x, NWT_SS_MOUSEDIRX );
+      SYNCHELP_WRITE_FLOAT( mouseDir.v.y, NWT_SS_MOUSEDIRY );
+      SYNCHELP_WRITE_FLOAT( mouseDir.v.z, NWT_SS_MOUSEDIRZ );
     }
 
   }
 
-  SYNCHELP_WRITE_BYTE( 0 );
-
-
-  if ( this->getOwner() == this->getHostID() )
-    SYNCHELP_WRITE_FKT( PNode::readSync );
-
   return SYNCHELP_WRITE_N;
 }
+
+int SpaceShip::writeState(const byte* data, int length, int sender)
+{
+  SYNCHELP_READ_BEGIN();
+  
+  return SYNCHELP_READ_N;
+}
+
+int SpaceShip::readState(byte* data, int maxLength )
+{
+  SYNCHELP_WRITE_BEGIN();
+  
+  return SYNCHELP_WRITE_N;
+}
+
+int SpaceShip::writeSync(const byte* data, int length, int sender)
+{
+  SYNCHELP_READ_BEGIN();
+  
+  return SYNCHELP_READ_N;
+}
+
+int SpaceShip::readSync(byte* data, int maxLength )
+{
+  SYNCHELP_WRITE_BEGIN();
+  
+  return SYNCHELP_WRITE_N;
+}

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

@@ -44 +44 @@
     virtual int       writeBytes(const byte* data, int length, int sender);
     virtual int       readBytes(byte* data, int maxLength, int * reciever);
+    
+    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 );
 
 

branches/network/src/world_entities/terrain.cc

@@ -326 +326 @@
 
   SYNCHELP_READ_BEGIN();
-  SYNCHELP_READ_FKT( WorldEntity::writeState );
+  SYNCHELP_READ_FKT( WorldEntity::writeState, NWT_TER_WE_STATE );
 
   return SYNCHELP_READ_N;
@@ -344 +344 @@
     *reciever = rec;
 
-    return WorldEntity::readState( data, maxLength );
+    SYNCHELP_WRITE_BEGIN();
+    SYNCHELP_WRITE_FKT( WorldEntity::readState, NWT_TER_WE_STATE );
+    return SYNCHELP_WRITE_N;
 
   }

branches/network/src/world_entities/world_entity.cc

@@ -518 +518 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( PNode::writeState );
-
-  SYNCHELP_READ_STRINGM( modelFileName );
-  SYNCHELP_READ_FLOAT( scaling );
+  SYNCHELP_READ_FKT( PNode::writeState, NWT_WE_PN_WRITESTATE );
+
+  SYNCHELP_READ_STRINGM( modelFileName, NWT_WE_PN_MODELFILENAME );
+  SYNCHELP_READ_FLOAT( scaling, NWT_WE_PN_SCALING );
   //check if modelFileName is relative to datadir or absolute
 
@@ -562 +562 @@
   SYNCHELP_WRITE_BEGIN();
 
-  SYNCHELP_WRITE_FKT( PNode::readState );
+  SYNCHELP_WRITE_FKT( PNode::readState, NWT_WE_PN_WRITESTATE );
 
   if ( getModel(0) && getModel(0)->getName() )
@@ -573 +573 @@
     }
 
-    SYNCHELP_WRITE_STRING( name );
+    SYNCHELP_WRITE_STRING( name, NWT_WE_PN_MODELFILENAME );
   }
   else
   {
-    SYNCHELP_WRITE_STRING("");
-  }
-
-  SYNCHELP_WRITE_FLOAT( scaling );
+    SYNCHELP_WRITE_STRING("", NWT_WE_PN_MODELFILENAME);
+  }
+
+  SYNCHELP_WRITE_FLOAT( scaling, NWT_WE_PN_SCALING );
   /*if ( this->md2TextureFileName!=NULL && strcmp(this->md2TextureFileName, "") )
   {