Changeset 6686 in orxonox.OLD

Timestamp:

Jan 25, 2006, 11:05:01 AM (18 years ago)

Author:

patrick

Message:

network: water gets synced correctly now

Location:

branches/network/src/world_entities/environments

Files:

• water.cc (modified) (3 diffs)
• water.h (modified) (1 diff)

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

@@ -28 +28 @@
 #include "skybox.h"
 
+#include "network_game_manager.h"
 
 using namespace std;
@@ -229 +230 @@
 int Water::writeBytes( const byte * data, int length, int sender )
 {
-//   setRequestedSync( false );
-//   setIsOutOfSync( false );
-//
-//   SYNCHELP_READ_BEGIN();
-//
-//   SYNCHELP_READ_FKT( WorldEntity::writeState );
-//
-//   return SYNCHELP_READ_N;
+  setRequestedSync( false );
+  setIsOutOfSync( false );
+
+  SYNCHELP_READ_BEGIN();
+
+  SYNCHELP_READ_FKT( Water::writeState );
+
+  return SYNCHELP_READ_N;
 }
 
@@ -248 +249 @@
 int Water::readBytes( byte * data, int maxLength, int * reciever )
 {
-//   SYNCHELP_WRITE_BEGIN();
-//
-//   if ( isOutOfSync() && !requestedSync() && this->getHostID()!=this->getOwner() )
-//   {
-//     (NetworkGameManager::getInstance())->sync( this->getUniqueID(), this->getOwner() );
-//     setRequestedSync( true );
-//   }
-//
-//   int rec = this->getRequestSync();
-//   if ( rec > 0 )
-//   {
-//     *reciever = rec;
-//
-//     SYNCHELP_WRITE_FKT( WorldEntity::readState );
-//
-//   }
-//
-//   *reciever = 0;
-//   return SYNCHELP_WRITE_N;
-}
+  SYNCHELP_WRITE_BEGIN();
+
+  if ( isOutOfSync() && !requestedSync() && this->getHostID()!=this->getOwner() )
+  {
+    (NetworkGameManager::getInstance())->sync( this->getUniqueID(), this->getOwner() );
+    setRequestedSync( true );
+  }
+
+  int rec = this->getRequestSync();
+  if ( rec > 0 )
+  {
+    *reciever = rec;
+    SYNCHELP_WRITE_FKT( Water::readState );
+  }
+
+  *reciever = 0;
+  return SYNCHELP_WRITE_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 Water::readState( byte * data, int maxLength )
+{
+  SYNCHELP_WRITE_BEGIN();
+
+  SYNCHELP_WRITE_FKT( WorldEntity::readState );
+
+  // sync the size
+  SYNCHELP_WRITE_FLOAT( this->sizeX );
+  SYNCHELP_WRITE_FLOAT( this->sizeY );
+
+  //sync resolution
+  SYNCHELP_WRITE_INT( this->resX );
+  SYNCHELP_WRITE_INT( this->resY );
+
+  //sync the height
+  SYNCHELP_WRITE_FLOAT( this->height );
+
+  return SYNCHELP_WRITE_N;
+}
+
+
+/**
+ * Writes data from network containing information about the state
+ * @param data pointer to data
+ * @param length length of data
+ * @param sender hostID of sender
+ */
+int Water::writeState( const byte * data, int length, int sender )
+{
+  SYNCHELP_READ_BEGIN();
+
+  SYNCHELP_READ_FKT( WorldEntity::writeState );
+
+  float f1, f2;
+  int i1, i2;
+
+  //read the size
+  SYNCHELP_READ_FLOAT( f1 );
+  SYNCHELP_READ_FLOAT( f2 );
+  this->sizeX = f1;
+  this->sizeY = f2;
+  PRINTF(0)("Setting Water to size: %f x %f\n", f1, f2);
+
+  //read the resolution
+  SYNCHELP_READ_INT( i1 );
+  SYNCHELP_READ_INT( i2 );
+  this->resX = i1;
+  this->resY = i2;
+  PRINTF(0)("Setting Water to resolution: %i x %i\n", i1, i2);
+
+  //read the height
+  SYNCHELP_READ_FLOAT( f1 );
+  this->height = f1;
+
+  this->rebuildGrid();
+
+  return SYNCHELP_READ_N;
+}
+
+

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

@@ -38 +38 @@
    virtual int readBytes(byte* data, int maxLength, int * reciever);
 
+   int writeState( const byte * data, int length, int sender );
+   int readState( byte * data, int maxLength );
+
 
   private: