Changeset 6277 in orxonox.OLD

Timestamp:

Dec 24, 2005, 3:27:23 PM (18 years ago)

Author:

rennerc

Message:

terrain loads now

Location:

branches/network/src

Files:

• lib/network/synchronizeable.h (modified) (1 diff)
• world_entities/skybox.cc (modified) (2 diffs)
• world_entities/terrain.cc (modified) (6 diffs)
• world_entities/terrain.h (modified) (1 diff)
• world_entities/world_entity.cc (modified) (3 diffs)
• world_entities/world_entity.h (modified) (2 diffs)

branches/network/src/lib/network/synchronizeable.h

@@ -110 +110 @@
                                       return; \
 } \
+                                    __synchelp_read_i += __synchelp_read_n; \
 }
 #define SYNCHELP_READ_BYTE(b)      { \

branches/network/src/world_entities/skybox.cc

@@ -238 +238 @@
   if ( isOutOfSync() && !requestedSync() && this->getHostID()!=this->getOwner() )
   {
-    //PRINTF(0)("Requesting sync! %d\n", this->getUniqueID());
     (NetworkGameManager::getInstance())->sync( this->getUniqueID(), this->getOwner() );
     setRequestedSync( true );
@@ -246 +245 @@
   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;
 

branches/network/src/world_entities/terrain.cc

@@ -59 +59 @@
     {
       this->loadModel(fileName);
-      strncpy( terrainFile, fileName, 1024 );
     }
   else
@@ -101 +100 @@
   this->ssp = NULL;
   this->vegetation = NULL;
-  strncpy( this->vegetationFile, "", 1024 );
-  strncpy( this->terrainFile, "", 1024 );
 }
 
@@ -123 +120 @@
     PRINTF(4)("fetching %s\n", vegetationFile);
     this->vegetation = (Model*)ResourceManager::getInstance()->load(vegetationFile, OBJ, RP_CAMPAIGN);
-    strncpy( this->vegetationFile, vegetationFile, 1024);
   }
   else
@@ -328 +324 @@
   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 );
+  SYNCHELP_READ_BEGIN();
+  SYNCHELP_READ_STRING( modelFileName, 1024 );
+
+  if ( strcmp(modelFileName, "") )
+    this->loadModel( modelFileName );
 
 }
@@ -344 +336 @@
   if ( isOutOfSync() && !requestedSync() && this->getHostID()!=this->getOwner() )
   {
-    //PRINTF(0)("Requesting sync! %d\n", this->getUniqueID());
     (NetworkGameManager::getInstance())->sync( this->getUniqueID(), this->getOwner() );
     setRequestedSync( true );
@@ -352 +343 @@
   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 );
+    SYNCHELP_WRITE_BEGIN();
+    SYNCHELP_WRITE_STRING( modelFileName );
+
+    return SYNCHELP_WRITE_N;
 
   }

branches/network/src/world_entities/terrain.h

@@ -49 +49 @@
    Model*              vegetation;
    int                 objectList;
-   char                vegetationFile[1024];
-   char                terrainFile[1024];
+
 };
 

branches/network/src/world_entities/world_entity.cc

@@ -58 +58 @@
 
   this->toList(OM_NULL);
+
+  strncpy( modelFileName, "", 1024 );
 }
 
@@ -101 +103 @@
 void WorldEntity::loadModel(const char* fileName, float scaling, unsigned int modelNumber)
 {
-  if (fileName != NULL)
-  {
+  if ( fileName != NULL && strcmp(fileName, "") )
+  {
+    strncpy( modelFileName, fileName, 1024 );
     // search for the special character # in the LoadParam
     if (strchr(fileName, '#') != NULL)
@@ -129 +132 @@
   }
   else
+  {
+    strncpy( modelFileName, "", 1024 );
     this->setModel(NULL);
+  }
 }
 

branches/network/src/world_entities/world_entity.h

@@ -74 +74 @@
  protected:
   //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity
+   char                   modelFileName[1024];  //!< the filename of the loaded model
 
  private:
@@ -85 +86 @@
   std::list<WorldEntity*>::iterator objectListIterator; //!< The iterator position of this Entity in the given list of the ObjectManager.
 
+
 };