Changeset 977 for code/branches

Timestamp:

Apr 3, 2008, 2:12:10 PM (17 years ago)

Author:

scheusso

Message:

more adjustments for synchronisation

Location:

code/branches/network

Files:

• TODO (modified) (1 diff)
• src/orxonox/objects/Ambient.cc (modified) (4 diffs)
• src/orxonox/objects/Ambient.h (modified) (2 diffs)
• src/orxonox/objects/NPC.cc (modified) (2 diffs)
• src/orxonox/objects/NPC.h (modified) (1 diff)
• src/orxonox/objects/Skybox.cc (modified) (2 diffs)
• src/orxonox/objects/Skybox.h (modified) (1 diff)
• src/orxonox/objects/WorldEntity.cc (modified) (1 diff)

code/branches/network/TODO

@@ -2 +2 @@
 
 network:
-        -handle variables of Spaceship (registerAllVariables)
-        -make NPC class synchronisable
-        -make Ambient class synchronisable
+        -handle variables of Spaceship (registerAllVariables) ------ wait for spaceship to be cleaned up
+        -make NPC class synchronisable ----- hopefully done
+        -make Ambient class synchronisable ----- hopefully done
         -make Skybox class synchronisable ----- mostly done

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

@@ -51 +51 @@
     {
         RegisterObject(Ambient);
+        registerAllVariables();
     }
 
@@ -57 +58 @@
     }
 
+    bool Ambient::create(){
+      Orxonox::getSingleton()->getSceneManager()->setAmbientLight(ambientLight_);
+      return true;
+    }
+    
+    void Ambient::registerAllVariables(){
+      registerVar(&ambientLight_, sizeof(ColourValue), network::DATA);
+      
+    }
+    
     void Ambient::loadParams(TiXmlElement* xmlElem)
     {
@@ -76 +87 @@
    void Ambient::setAmbientLight(const ColourValue& colour)
    {
-        Orxonox::getSingleton()->getSceneManager()->setAmbientLight(colour);
+      ambientLight_=colour;     
    }
 
@@ -90 +101 @@
 
         XMLPortParamLoadOnly(Ambient, "colourvalue", setAmbientLight, xmlelement, loading);
+        create();
     }
 }

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

@@ -5 +5 @@
 
 #include "core/BaseObject.h"
+#include "network/Synchronisable.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Ambient : public BaseObject
+    class _OrxonoxExport Ambient : public BaseObject, network::Synchronisable
     {
         public:
@@ -17 +18 @@
             virtual void XMLPort(Element& xmlelement, bool loading);
             void setAmbientLight(const ColourValue& colour);
+            bool create();
+            void registerAllVariables();
 
         private:
-
+            ColourValue ambientLight_;
 
     };

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

@@ -39 +39 @@
     RegisterObject(NPC);
     movable_ = true;
+    registerAllVariables();
   }
 
@@ -58 +59 @@
     this->translate(location);
     movable_ = movable;
+  }
+  
+  void NPC::registerAllVariables(){
+    Model::registerAllVariables();
+    registerVar(&movable_, sizeof(movable_), network::DATA);
+  }
+  
+  bool NPC::create(){
+    Model::create();
+    return true;
   }
 

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

@@ -26 +26 @@
       void update();
       void setValues(Vector3 location, Vector3 speed, Vector3 acceleration, bool movable);
+      void registerAllVariables();
+      bool create();
 
     private:

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

@@ -72 +72 @@
    }
 
+   void Skybox::setSkyboxSrc(std::string src){
+     skyboxSrc_ = src;
+   }
+   
     /**
         @brief XML loading and saving.
@@ -82 +86 @@
         BaseObject::XMLPort(xmlelement, loading);
 
-        XMLPortParamLoadOnly(Skybox, "src", setSkybox, xmlelement, loading);
+        XMLPortParamLoadOnly(Skybox, "src", setSkyboxSrc, xmlelement, loading);
+        create();
     }
     

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

@@ -23 +23 @@
             bool create();
             void registerAllVariables();
+            void setSkyboxSrc(std::string src);
 
         private:

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

@@ -190 +190 @@
 
         XMLPortObject(WorldEntity, WorldEntity, "attached", attachWorldEntity, getAttachedWorldEntity, xmlelement, loading);
+        
+        //create();
     }