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

Timestamp:

Dec 23, 2005, 5:30:22 PM (18 years ago)

Author:

rennerc

Message:

converter: added functions for strings
network_protocol: length and id are now int
network_game_manager: fixed some more bugs
skybox: is loaded on client corectly now

Location:

branches/network/src/world_entities

Files:

• skybox.cc (modified) (2 diffs)
• skybox.h (modified) (2 diffs)

branches/network/src/world_entities/skybox.cc

@@ -22 +22 @@
 #include "static_model.h"
 #include "material.h"
+#include "network_game_manager.h"
+#include "converter.h"
 
 using namespace std;
@@ -210 +212 @@
   this->setModel(model);
 }
+
+void SkyBox::writeBytes( const byte * data, int length, int sender )
+{
+  setRequestedSync( false );
+  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);
+
+  this->setSize( size );
+  this->setTexture( textureName );
+  this->rebuild();
+}
+
+int SkyBox::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;
+
+    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 );
+
+  }
+
+  *reciever = 0;
+  return 0;
+}
+
+void SkyBox::writeDebug( ) const
+{
+}
+
+void SkyBox::readDebug( ) const
+{
+}

branches/network/src/world_entities/skybox.h

@@ -35 +35 @@
   void setSize(float size);
   /** assumes jpg as input-format */
-  void setTexture(const char* name) { this->setTextureAndType (name, "jpg"); };
+  void setTexture(const char* name) { strncpy(textureName, name, 1024); this->setTextureAndType (name, "jpg"); };
 
   void setTextureAndType(const char* name, const char* extension);
@@ -41 +41 @@
                    const char* right, const char* front, const char* back);
 
+  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;
+
  private:
   void rebuild();
 
-  Material**      material;        //!< Materials for the SkyBox. sorted by number (0-5) top, bottom, left, right, front, back
-  float           size;            //!< Size of the SkyBox. This should match the frustum maximum range.
+  Material**      material;          //!< Materials for the SkyBox. sorted by number (0-5) top, bottom, left, right, front, back
+  float           size;              //!< Size of the SkyBox. This should match the frustum maximum range.
+  char            textureName[1024]; //!< Name of the Texture
 
 };