Changeset 974 for code/branches

Timestamp:

Apr 3, 2008, 12:52:48 PM (17 years ago)

Author:

scheusso

Message:

Made some adjustments because of synchronisable (mostly in skybox)

Location:

code/branches/network

Files:

• TODO (added)
• src/orxonox/objects/Model.cc (modified) (1 diff)
• src/orxonox/objects/Skybox.cc (modified) (3 diffs)
• src/orxonox/objects/Skybox.h (modified) (3 diffs)
• src/orxonox/objects/WorldEntity.cc (modified) (2 diffs)

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

@@ -84 +84 @@
 
     bool Model::create(){
-      WorldEntity::create();
+      if(!WorldEntity::create())
+        return false;
       if(meshSrc_.compare("")!=0){
         this->mesh_.setMesh(meshSrc_);

code/branches/network/src/orxonox/objects/Skybox.cc

@@ -49 +49 @@
     {
         RegisterObject(Skybox);
+        registerAllVariables();
     }
 
@@ -59 +60 @@
         if (xmlElem->Attribute("src"))
         {
-                std::string skyboxSrc = xmlElem->Attribute("src");
-                this->setSkybox(skyboxSrc);
+                skyboxSrc_ = xmlElem->Attribute("src");
+        this->create();
 
-                COUT(4) << "Loader: Set skybox: "<< skyboxSrc << std::endl << std::endl;
+                COUT(4) << "Loader: Set skybox: "<< skyboxSrc_ << std::endl << std::endl;
         }
    }
@@ -83 +84 @@
         XMLPortParamLoadOnly(Skybox, "src", setSkybox, xmlelement, loading);
     }
+    
+    bool Skybox::create(){
+      this->setSkybox(skyboxSrc_);
+      return true;
+    }
+    
+    void Skybox::registerAllVariables(){
+      registerVar(&skyboxSrc_, skyboxSrc_.length()+1 ,network::STRING);
+    }
+    
 }

code/branches/network/src/orxonox/objects/Skybox.h

@@ -5 +5 @@
 
 #include "core/BaseObject.h"
+#include "network/Synchronisable.h"
 
 class TiXmlElement; // Forward declaration
@@ -10 +11 @@
 namespace orxonox
 {
-    class _OrxonoxExport Skybox : public BaseObject
+    class _OrxonoxExport Skybox : public BaseObject, public network::Synchronisable
     {
         public:
@@ -19 +20 @@
             virtual void XMLPort(Element& xmlelement, bool loading);
             void setSkybox(const std::string& skyboxname);
+            
+            bool create();
+            void registerAllVariables();
 
         private:
+            std::string skyboxSrc_;
 
 

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

@@ -72 +72 @@
         }
     }
+    
 
     WorldEntity::~WorldEntity()
@@ -162 +163 @@
 */
     }
+    
 
     void WorldEntity::setYawPitchRoll(const Degree& yaw, const Degree& pitch, const Degree& roll)