Changeset 6341 in orxonox.OLD for trunk/src/world_entities/world_entity.cc

Timestamp:

Dec 30, 2005, 1:57:12 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network branche back to the trunk, so we do not get away from each other to fast

File:

• trunk/src/world_entities/world_entity.cc (modified) (3 diffs)

trunk/src/world_entities/world_entity.cc

@@ -105 +105 @@
 void WorldEntity::loadModel(const char* fileName, float scaling, unsigned int modelNumber)
 {
-  if (fileName != NULL)
+  if ( fileName != NULL && strcmp(fileName, "") )
   {
    // search for the special character # in the LoadParam
@@ -144 +144 @@
   }
   else
+  {
     this->setModel(NULL);
+  }
 }
 
@@ -340 +342 @@
   glPopMatrix();
 }
+
+/**
+ * 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 WorldEntity::writeState( const byte * data, int length, int sender )
+{
+  char* modelFileName;
+  SYNCHELP_READ_BEGIN();
+
+  SYNCHELP_READ_FKT( PNode::writeState );
+
+  SYNCHELP_READ_STRINGM( modelFileName );
+  SYNCHELP_READ_FLOAT( scaling );
+  //check if modelFileName is relative to datadir or absolute
+  if ( strstr(modelFileName, ResourceManager::getInstance()->getDataDir()) )
+  {
+    loadModel( modelFileName+strlen(ResourceManager::getInstance()->getDataDir()), scaling );
+  }
+  else
+  {
+    loadModel( modelFileName, scaling );
+  }
+  delete[] modelFileName;
+
+  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 WorldEntity::readState( byte * data, int maxLength )
+{
+  SYNCHELP_WRITE_BEGIN();
+
+  SYNCHELP_WRITE_FKT( PNode::readState );
+
+  SYNCHELP_WRITE_STRING( getModel( 0 )->getName() );
+  SYNCHELP_WRITE_FLOAT( scaling );
+  return SYNCHELP_WRITE_N;
+}