Changeset 630 for code/branches

Timestamp:

Dec 19, 2007, 12:04:49 AM (17 years ago)

Author:

scheusso

Message:

made Model and WorldEntity synchronisable

Location:

code/branches/FICN/src

Files:

• network/GameStateManager.cc (modified) (1 diff)
• network/Synchronisable.cc (modified) (1 diff)
• network/Synchronisable.h (modified) (1 diff)
• orxonox/objects/Model.cc (modified) (2 diffs)
• orxonox/objects/Model.h (modified) (1 diff)
• orxonox/objects/WorldEntity.cc (modified) (2 diffs)
• orxonox/objects/WorldEntity.h (modified) (1 diff)

code/branches/FICN/src/network/GameStateManager.cc

@@ -114 +114 @@
     // allocate additional space
     if(totalsize+tempsize>memsize){
-      retval->data = (unsigned char *)realloc((void *)retval->data, totalsize+1000);
-      memsize+=1000;
+      if(tempsize<1000){
+        retval->data = (unsigned char *)realloc((void *)retval->data, totalsize+1000);
+        memsize+=1000;
+      } else {
+        retval->data = (unsigned char *)realloc((void *)retval->data, totalsize+1000);
+        memsize+=tempsize+1000;
+      }
     }
 

code/branches/FICN/src/network/Synchronisable.cc

@@ -26 +26 @@
   datasize=0;
   objectID=idCounter++;
-//   registerAllVariables();
+  //registerAllVariables();
 }
 

code/branches/FICN/src/network/Synchronisable.h

@@ -58 +58 @@
   int getSize();
   bool updateData(syncData vars);
-  virtual void registerAllVariables()=0;
-  virtual bool create(){return true;}
+  void registerAllVariables();
+  virtual bool create()=0;
 protected:
   Synchronisable();

code/branches/FICN/src/orxonox/objects/Model.cc

@@ -15 +15 @@
     {
         RegisterObject(Model);
+        registerAllVariables();
     }
 
@@ -27 +28 @@
         if (xmlElem->Attribute("mesh"))
         {
-            std::string src = xmlElem->Attribute("mesh");
-            this->mesh_.setMesh(src);
-            this->attachObject(this->mesh_.getEntity());
+            meshSrc_ = xmlElem->Attribute("mesh");
         }
+    }
+    
+    bool Model::create(){
+      this->mesh_.setMesh(meshSrc_);
+      this->attachObject(this->mesh_.getEntity());
 
-        COUT(4) << "Loader: Created model" << std::endl;
+      COUT(4) << "Loader: Created model" << std::endl;
+      return true;
+    }
+    
+    void Model::registerAllVariables(){
+      registerVar(&meshSrc_, meshSrc_.length()+1, network::STRING);
     }
 }

code/branches/FICN/src/orxonox/objects/Model.h

@@ -14 +14 @@
             ~Model();
             virtual void loadParams(TiXmlElement* xmlElem);
+            bool create();
 
         private:
+            std::string meshSrc_;
             Mesh mesh_;
+            void registerAllVariables();
     };
 }

code/branches/FICN/src/orxonox/objects/WorldEntity.cc

@@ -46 +46 @@
         RegisterObject(WorldEntity);
 
+        registerAllVariables();
         if (Orxonox::getSingleton()->getSceneManager())
         {
@@ -151 +152 @@
         }
 
+        create();
+        
     }
 
+    bool WorldEntity::create(){
+      return true;
+    }
+    
     void WorldEntity::registerAllVariables()
     {
-      // to be implemented !
+      // register coordinates
+      registerVar( (void*) &(this->getPosition().x), sizeof(this->getPosition().x), network::DATA);
+      registerVar( (void*) &(this->getPosition().y), sizeof(this->getPosition().y), network::DATA);
+      registerVar( (void*) &(this->getPosition().z), sizeof(this->getPosition().z), network::DATA);
+      // register orientation
+      registerVar( (void*) &(this->getOrientation().w), sizeof(this->getOrientation().w), network::DATA);
+      registerVar( (void*) &(this->getOrientation().x), sizeof(this->getOrientation().x), network::DATA);
+      registerVar( (void*) &(this->getOrientation().y), sizeof(this->getOrientation().y), network::DATA);
+      registerVar( (void*) &(this->getOrientation().z), sizeof(this->getOrientation().z), network::DATA);
+      // not needed at the moment, because we don't have prediction yet
+      /*// register velocity_
+      registerVar( (void*) &(this->getVelocity().x), sizeof(this->getVelocity().x), network::DATA);
+      registerVar( (void*) &(this->getVelocity().y), sizeof(this->getVelocity().y), network::DATA);
+      registerVar( (void*) &(this->getVelocity().z), sizeof(this->getVelocity().z), network::DATA);
+      // register rotationAxis/rate
+      registerVar( (void*) &(this->getRotationRate()), sizeof(this->getRotationRate()), network::DATA);
+      registerVar( (void*) &(this->getRotationAxis().x), sizeof(this->getRotationAxis().x), network::DATA);
+      registerVar( (void*) &(this->getRotationAxis().y), sizeof(this->getRotationAxis().y), network::DATA);
+      registerVar( (void*) &(this->getRotationAxis().z), sizeof(this->getRotationAxis().z), network::DATA);*/
     }
 }

code/branches/FICN/src/orxonox/objects/WorldEntity.h

@@ -21 +21 @@
       virtual void tick(float dt);
       virtual void loadParams(TiXmlElement* xmlElem);
-
+      bool create();
+      
       inline Ogre::SceneNode* getNode()
           { return this->node_; }