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

Timestamp:

Dec 24, 2005, 2:15:49 PM (18 years ago)

Author:

rennerc

Message:

synchronizeable: added macros to help write/read data

Location:

branches/network/src/world_entities

Files:

• skybox.cc (modified) (3 diffs)
• terrain.cc (modified) (6 diffs)
• terrain.h (modified) (2 diffs)

branches/network/src/world_entities/skybox.cc

@@ -218 +218 @@
   setIsOutOfSync( false );
 
-  int flsize = Converter::byteArrayToFloat( data, &size );
-  Converter::byteArrayToString( data+flsize, textureName, length-flsize );
-
-  PRINT(0)("GOT DATA: size=%f texture=%s\n", size, textureName);
+  /*int flsize = Converter::byteArrayToFloat( data, &size );
+  Converter::byteArrayToString( data+flsize, textureName, length-flsize );*/
+
+  SYNCHELP_READ_BEGIN();
+  SYNCHELP_READ_FLOAT(size);
+  SYNCHELP_READ_STRING( textureName, 1024 );
+
+  //PRINT(0)("GOT DATA: size=%f texture=%s\n", size, textureName);
 
   this->setSize( size );
@@ -228 +232 @@
 }
 
+
+
 int SkyBox::readBytes( byte * data, int maxLength, int * reciever )
 {
   if ( isOutOfSync() && !requestedSync() && this->getHostID()!=this->getOwner() )
   {
-    PRINTF(0)("Requesting sync! %d\n", this->getUniqueID());
+    //PRINTF(0)("Requesting sync! %d\n", this->getUniqueID());
     (NetworkGameManager::getInstance())->sync( this->getUniqueID(), this->getOwner() );
     setRequestedSync( true );
@@ -240 +246 @@
   if ( rec > 0 )
   {
-    PRINTF(0)("Serving client %d which requested sync %d size=%f texture=%s\n", rec, this->getUniqueID(), this->size, this->textureName);
+    //PRINTF(0)("Serving client %d which requested sync %d size=%f texture=%s\n", rec, this->getUniqueID(), this->size, this->textureName);
     *reciever = rec;
 
-    int flsize = Converter::floatToByteArray( this->size, data, maxLength );
-
-    if ( flsize <= 0 )
-    {
-      PRINTF(1)("Byte array is too small (%d) to store float\n", maxLength );
-      return 0;
-    }
-
-    if ( strlen(textureName)+INTSIZE+flsize > maxLength )
-    {
-      PRINTF(1)("Byte array is too small (%d) to store data\n", maxLength );
-      return 0;
-    }
-
-    return flsize + Converter::stringToByteArray( textureName, data+flsize, strlen(textureName), maxLength-flsize );
-
+    SYNCHELP_WRITE_BEGIN();
+    SYNCHELP_WRITE_FLOAT(this->size);
+    SYNCHELP_WRITE_STRING(this->textureName);
+
+    return SYNCHELP_WRITE_N;
   }
 

branches/network/src/world_entities/terrain.cc

@@ -24 +24 @@
 #include "resource_manager.h"
 #include "model.h"
+#include "network_game_manager.h"
+
 
 #include "glincl.h"
@@ -57 +59 @@
     {
       this->loadModel(fileName);
+      strncpy( terrainFile, fileName, 1024 );
     }
   else
@@ -98 +101 @@
   this->ssp = NULL;
   this->vegetation = NULL;
+  strncpy( this->vegetationFile, "", 1024 );
+  strncpy( this->terrainFile, "", 1024 );
 }
 
@@ -111 +116 @@
 void Terrain::loadVegetation(const char* vegetationFile)
 {
+  PRINTF(0)("loadVegetation: %s\n", vegetationFile);
   if (this->vegetation)
     ResourceManager::getInstance()->unload(this->vegetation, RP_LEVEL);
@@ -116 +122 @@
   {
     PRINTF(4)("fetching %s\n", vegetationFile);
-      this->vegetation = (Model*)ResourceManager::getInstance()->load(vegetationFile, OBJ, RP_CAMPAIGN);
+    this->vegetation = (Model*)ResourceManager::getInstance()->load(vegetationFile, OBJ, RP_CAMPAIGN);
+    strncpy( this->vegetationFile, vegetationFile, 1024);
   }
   else
@@ -315 +322 @@
     }
 }
+
+void Terrain::writeBytes( const byte * data, int length, int sender )
+{
+  setRequestedSync( false );
+  setIsOutOfSync( false );
+
+  int n = Converter::byteArrayToString( data, vegetationFile, length );
+  Converter::byteArrayToString( data+n, terrainFile, length-n );
+
+  //PRINT(0)("GOT DATA: size=%f texture=%s\n", size, textureName);
+
+  if ( strcmp(vegetationFile, "") )
+    this->loadVegetation( vegetationFile );
+  if ( strcmp(terrainFile, "") )
+    this->loadModel( terrainFile );
+
+}
+
+int Terrain::readBytes( byte * data, int maxLength, int * reciever )
+{
+  if ( isOutOfSync() && !requestedSync() && this->getHostID()!=this->getOwner() )
+  {
+    //PRINTF(0)("Requesting sync! %d\n", this->getUniqueID());
+    (NetworkGameManager::getInstance())->sync( this->getUniqueID(), this->getOwner() );
+    setRequestedSync( true );
+  }
+
+  int rec = this->getRequestSync();
+  if ( rec > 0 )
+  {
+    //PRINTF(0)("Serving client %d which requested sync %d size=%f texture=%s\n", rec, this->getUniqueID(), this->size, this->textureName);
+    *reciever = rec;
+
+    if ( strlen(vegetationFile)+INTSIZE > maxLength )
+    {
+      PRINTF(1)("Byte array is too small (%d) to store data\n", maxLength );
+      return 0;
+    }
+
+    int n = Converter::stringToByteArray( vegetationFile, data, strlen(vegetationFile), maxLength );
+
+    return n + Converter::stringToByteArray( terrainFile, data+n, strlen(terrainFile), maxLength-n );
+
+  }
+
+  *reciever = 0;
+  return 0;
+}
+
+void Terrain::writeDebug( ) const
+{
+}
+
+void Terrain::readDebug( ) const
+{
+}

branches/network/src/world_entities/terrain.h

@@ -30 +30 @@
   virtual ~Terrain();
 
+  virtual void      writeBytes(const byte* data, int length, int sender);
+  virtual int       readBytes(byte* data, int maxLength, int * reciever);
+  virtual void      writeDebug() const;
+  virtual void      readDebug() const;
+
   void init();
   void loadParams(const TiXmlElement* root);
@@ -44 +49 @@
    Model*              vegetation;
    int                 objectList;
+   char                vegetationFile[1024];
+   char                terrainFile[1024];
 };