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

Timestamp:

Dec 29, 2005, 5:37:00 PM (18 years ago)

Author:

rennerc

Message:

synchronizeable: writeBytes now returns int
converter: converts now 0.0f without endless loop

Location:

branches/network/src/world_entities

Files:

• skybox.cc (modified) (4 diffs)
• skybox.h (modified) (1 diff)
• terrain.cc (modified) (1 diff)
• terrain.h (modified) (1 diff)
• weapons/ground_turret.cc (modified) (2 diffs)
• weapons/ground_turret.h (modified) (1 diff)
• world_entity.cc (modified) (3 diffs)
• world_entity.h (modified) (1 diff)

branches/network/src/world_entities/skybox.cc

@@ -220 +220 @@
 }
 
-void SkyBox::writeBytes( const byte * data, int length, int sender )
+int SkyBox::writeBytes( const byte * data, int length, int sender )
 {
   setRequestedSync( false );
@@ -226 +226 @@
 
   SYNCHELP_READ_BEGIN();
+
+  SYNCHELP_READ_FKT( WorldEntity::writeState );
+
   SYNCHELP_READ_FLOAT( size );
   if ( textureName )
@@ -239 +242 @@
   this->setTextureAndType( textureName, "jpg" );
   this->rebuild();
+
+  return SYNCHELP_READ_N;
 }
 
@@ -258 +263 @@
 
     SYNCHELP_WRITE_BEGIN();
+
+    SYNCHELP_WRITE_FKT( WorldEntity::readState );
+
     SYNCHELP_WRITE_FLOAT(this->size);
     SYNCHELP_WRITE_STRING(this->textureName);

branches/network/src/world_entities/skybox.h

@@ -41 +41 @@
                    const char* right, const char* front, const char* back);
 
-  virtual void      writeBytes(const byte* data, int length, int sender);
+  virtual int       writeBytes(const byte* data, int length, int sender);
   virtual int       readBytes(byte* data, int maxLength, int * reciever);
   virtual void      writeDebug() const;

branches/network/src/world_entities/terrain.cc

@@ -319 +319 @@
 }
 
-void Terrain::writeBytes( const byte * data, int length, int sender )
+int Terrain::writeBytes( const byte * data, int length, int sender )
 {
   setRequestedSync( false );
   setIsOutOfSync( false );
 
-  WorldEntity::writeState(data, length, sender);
+  SYNCHELP_READ_BEGIN();
+  SYNCHELP_READ_FKT( WorldEntity::writeState );
+
+  return SYNCHELP_READ_N;
 }
 

branches/network/src/world_entities/terrain.h

@@ -30 +30 @@
   virtual ~Terrain();
 
-  virtual void      writeBytes(const byte* data, int length, int sender);
+  virtual int       writeBytes(const byte* data, int length, int sender);
   virtual int       readBytes(byte* data, int maxLength, int * reciever);
   virtual void      writeDebug() const;

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

@@ -19 +19 @@
 
 #include "factory.h"
+#include "network_game_manager.h"
 #include "load_param.h"
 
@@ -168 +169 @@
 
 }
+
+/**
+ * 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 GroundTurret::writeBytes( const byte * data, int length, int sender )
+{
+  setRequestedSync( false );
+  setIsOutOfSync( false );
+
+  SYNCHELP_READ_BEGIN();
+
+  SYNCHELP_READ_FKT( WorldEntity::writeState );
+
+  return SYNCHELP_READ_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 GroundTurret::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;
+}

branches/network/src/world_entities/weapons/ground_turret.h

@@ -30 +30 @@
   virtual void collidesWith (WorldEntity* entity, const Vector& location);
 
+  virtual int writeBytes(const byte* data, int length, int sender);
+  virtual int readBytes(byte* data, int maxLength, int * reciever);
+
  private:
    Weapon *left, *right;

branches/network/src/world_entities/world_entity.cc

@@ -335 +335 @@
  * @param sender hostID of sender
  */
-void WorldEntity::writeState( const byte * data, int length, int sender )
+int WorldEntity::writeState( const byte * data, int length, int sender )
 {
   char* modelFileName;
   SYNCHELP_READ_BEGIN();
+
+  SYNCHELP_READ_FKT( PNode::writeState );
+
   SYNCHELP_READ_STRINGM( modelFileName );
   //check if modelFileName is relative to datadir or absolute
@@ -350 +353 @@
   }
   delete[] modelFileName;
+
+  return SYNCHELP_READ_N;
 }
 
@@ -361 +366 @@
 {
   SYNCHELP_WRITE_BEGIN();
+
+  SYNCHELP_WRITE_FKT( PNode::readState );
+
   SYNCHELP_WRITE_STRING( getModel( 0 )->getName() );
   PRINTF(0)("%s\n", getModel( 0 )->getName());

branches/network/src/world_entities/world_entity.h

@@ -73 +73 @@
   std::list<WorldEntity*>::iterator& getEntityIterator() { return this->objectListIterator; }
 
-  virtual void      writeState(const byte* data, int length, int sender);
-  virtual int       readState(byte* data, int maxLength );
+  int       writeState(const byte* data, int length, int sender);
+  int       readState(byte* data, int maxLength );
  protected:
   //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity