Changeset 6815 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jan 28, 2006, 5:11:51 PM (19 years ago)

Author:

bensch

Message:

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

no conflicts…
thats what i call orthogonal work

Location:

trunk/src/world_entities

Files:

• environments/water.cc (modified) (7 diffs)
• image_entity.cc (modified) (3 diffs)
• image_entity.h (modified) (2 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) (3 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) (6 diffs)
• space_ships/space_ship.h (modified) (2 diffs)
• terrain.cc (modified) (2 diffs)
• world_entity.cc (modified) (3 diffs)

trunk/src/world_entities/environments/water.cc

@@ -302 +302 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( Water::writeState );
+  SYNCHELP_READ_FKT( Water::writeState, NWT_WAT_STATE );
 
   return SYNCHELP_READ_N;
@@ -328 +328 @@
   {
     *reciever = rec;
-    SYNCHELP_WRITE_FKT( Water::readState );
+    SYNCHELP_WRITE_FKT( Water::readState, NWT_WAT_STATE );
   }
 
@@ -347 +347 @@
   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;
@@ -374 +374 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( WorldEntity::writeState );
+  SYNCHELP_READ_FKT( WorldEntity::writeState, NWT_WAT_WE_STATE );
 
   float f1, f2;
@@ -380 +380 @@
 
   //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;
@@ -387 +387 @@
 
   //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;
@@ -394 +394 @@
 
   //read the height
-  SYNCHELP_READ_FLOAT( f1 );
+  SYNCHELP_READ_FLOAT( f1, NWT_WAT_HEIGHT );
   this->height = f1;
 

trunk/src/world_entities/image_entity.cc

@@ -49 +49 @@
 {
   if (this->material)
-  delete this->material;
-
-  // delete what has to be deleted here
-
-  GraphicsEngine::showMouse(true);
-  GraphicsEngine::stealWMEvents(false);
+    delete this->material;
 }
 
@@ -90 +85 @@
       .describe("the Speed with which the ImageEntity should rotate");
 
-  LoadParam(root, "billboarding", this, ImageEntity, toggleBillboard)
-      .describe("sets the ImageEntity to always look in the direction of the Player");
+  LoadParam(root, "billboarding", this, ImageEntity, toggleBillboarding)
+      .describe("sets the Billboard to always look in the direction of the Player");
 }
 
@@ -119 +114 @@
  * This means that the image will always look in the direction of the Player
  */
-void ImageEntity::toggleBillboard()
+void ImageEntity::toggleBillboarding()
 {
   this->bBillboarding = !this->bBillboarding;

trunk/src/world_entities/image_entity.h

@@ -1 +1 @@
 /*!
- * @file crosshair.h
-  *  Definition of ...
-
-*/
+ * @file image_entity.h
+ *  Definition of an ImageEntity
+ */
 
 #ifndef _IMAGE_ENTITY_H
@@ -34 +33 @@
   /** @param rotationSpeed the speed at what the crosshair should rotate */
   void setRotationSpeed(float rotationSpeed) { this->rotationSpeed = rotationSpeed; };
-  void toggleBillboard();
+  void toggleBillboarding();
 
   virtual void tick(float dt);

trunk/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 );
 
   }

trunk/src/world_entities/power_ups/laser_power_up.cc

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

trunk/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 );
     }
 

trunk/src/world_entities/power_ups/power_up.cc

@@ -20 +20 @@
 #include "extendable.h"
 #include "primitive_model.h"
+
+#include "assert.h"
 
 using namespace std;
@@ -124 +126 @@
 {
   SYNCHELP_WRITE_BEGIN();
-  SYNCHELP_WRITE_FKT( WorldEntity::readState );
+  SYNCHELP_WRITE_FKT( WorldEntity::readState, NWT_PU_WE_STATE );
   return SYNCHELP_WRITE_N;
 }
@@ -138 +140 @@
 {
   SYNCHELP_READ_BEGIN();
-  SYNCHELP_READ_FKT( WorldEntity::writeState );
+  SYNCHELP_READ_FKT( WorldEntity::writeState, NWT_PU_WE_STATE );
   return SYNCHELP_READ_N;
 }

trunk/src/world_entities/power_ups/turret_power_up.cc

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

trunk/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 )

trunk/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;

trunk/src/world_entities/space_ships/space_ship.cc

@@ -523 +523 @@
 #define DATA_flags       2
 #define DATA_mouse       3
+#define DATA_sync        4
+#define DATA_velocity    5
 
 int SpaceShip::writeBytes( const byte * data, int length, int sender )
@@ -529 +531 @@
 
   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 );
-     //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()*/ )
+  
+  while ( SYNCHELP_READ_REMAINING()>0 )
+  {
+    SYNCHELP_READ_BYTE( b, NWT_SS_B );
+    
+    if ( b == DATA_state )
+    {
+      setRequestedSync( false );
+      setIsOutOfSync( false );
+      SYNCHELP_READ_FKT( WorldEntity::writeState, NWT_SS_WE_STATE );
+
+      continue;
+    }
+    
+    if ( b == DATA_flags )
     {
       int flags = 0;
-      SYNCHELP_READ_INT( flags );
+      SYNCHELP_READ_INT( flags, NWT_SS_FLAGS );
 
       bUp = (flags & MASK_bUp) != 0;
@@ -561 +559 @@
       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()*/ )
-    {
-      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() )
-  {
-    SYNCHELP_READ_FLOAT( xMouse );
-    SYNCHELP_READ_FLOAT( yMouse );
-    SYNCHELP_READ_FLOAT( mouseSensitivity );
-    SYNCHELP_READ_FLOAT( cycle );
-}*/
-
-  if ( this->getOwner() != this->getHostID() )
-    SYNCHELP_READ_FKT( PNode::writeSync );
-
+      
+      continue;
+    }
+    
+    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 );
+      
+      continue;
+    }
+    
+    if ( b == DATA_sync )
+    {
+      if ( this->getOwner() != this->getHostID() )
+        SYNCHELP_READ_FKT( PNode::writeSync, NWT_SS_PN_SYNC );
+      
+      continue;
+    }
+    
+    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 );
+    }
+  }
+  
   return SYNCHELP_READ_N;
 }
@@ -608 +612 @@
     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 );
 
@@ -617 +621 @@
 
   *reciever = 0;
+  
+  if ( this->getOwner() == this->getHostID() && PNode::needsReadSync() )
+  {
+    SYNCHELP_WRITE_BYTE( DATA_sync, NWT_SS_B );
+    SYNCHELP_WRITE_FKT( PNode::readSync, NWT_SS_PN_SYNC );
+  }
 
   if ( this->getHostID()==this->getOwner() )
@@ -646 +656 @@
     {
       oldMask = mask;
-      SYNCHELP_WRITE_BYTE( DATA_flags );
-      SYNCHELP_WRITE_INT( mask );
-    }
-#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 )
+      SYNCHELP_WRITE_BYTE( DATA_flags, NWT_SS_B );
+      SYNCHELP_WRITE_INT( mask, NWT_SS_FLAGS );
+    }
+#define __OFFSET_MDIR_W 0.01
+#define __OFFSET_MDIR_V 0.01
+    if ( fabs( oldMouseDir.w - mouseDir.w ) > __OFFSET_MDIR_W ||
+         fabs( oldMouseDir.v.x - mouseDir.v.x ) > __OFFSET_MDIR_V ||
+         fabs( oldMouseDir.v.y - mouseDir.v.y ) > __OFFSET_MDIR_V ||
+         fabs( oldMouseDir.v.z - mouseDir.v.z ) > __OFFSET_MDIR_V )
     {
       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( 0 );
-
-
-  if ( this->getOwner() == this->getHostID() )
-    SYNCHELP_WRITE_FKT( PNode::readSync );
+      SYNCHELP_WRITE_BYTE( DATA_mouse, NWT_SS_B );
+      PRINTF(0)("SENDING mousedir\n");
+      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 );
+    }
+#define __OFFSET_VEL 0.05
+    if ( fabs( oldVelocity.x - velocity.x ) > __OFFSET_VEL*velocity.x ||
+         fabs( oldVelocity.y - velocity.y ) > __OFFSET_VEL*velocity.y ||
+         fabs( oldVelocity.z - velocity.z ) > __OFFSET_VEL*velocity.z )
+    {
+      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 );
+    }
+
+  }
 
   return SYNCHELP_WRITE_N;
 }
+
+

trunk/src/world_entities/space_ships/space_ship.h

@@ -42 +42 @@
     virtual int       readBytes(byte* data, int maxLength, int * reciever);
 
-
   private:
     void init();
@@ -70 +69 @@
 
     Vector                velocity;           //!< the velocity of the player.
+    Vector                oldVelocity;        //!< the velocity the player had last synced
     Quaternion            mouseDir;           //!< the direction where the player wants to fly
     Quaternion            oldMouseDir;        //!< the direction where the player wanted to fly

trunk/src/world_entities/terrain.cc

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

trunk/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, "") )
   {