Changeset 1098 for code/branches/network2/src/orxonox

Timestamp:

Apr 17, 2008, 2:35:51 PM (17 years ago)

Author:

rgrieder

Message:

merged network branch into new network2 branch (from trunk)

Location:

code/branches/network2/src/orxonox

Files:

• Orxonox.cc (modified) (1 diff)
• objects/Ambient.cc (modified) (4 diffs)
• objects/Ambient.h (modified) (3 diffs)
• objects/Model.cc (modified) (2 diffs)
• objects/NPC.cc (modified) (2 diffs)
• objects/NPC.h (modified) (1 diff)
• objects/Skybox.cc (modified) (4 diffs)
• objects/Skybox.h (modified) (2 diffs)
• objects/WorldEntity.cc (modified) (3 diffs)

code/branches/network2/src/orxonox/Orxonox.cc

@@ -305 +305 @@
     hudOverlay->show();
 
-    client_g->establishConnection();
+    if( !client_g->establishConnection() )
+      COUT(1) <<"CLIENT COULD NOT ESTABLISH CONNECTION" << std::endl;
     client_g->tick(0);
 

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

@@ -57 +57 @@
         RegisterObject(Ambient);
         Ambient::instance_s = this;
+        registerAllVariables();
     }
 
@@ -63 +64 @@
     }
 
+    bool Ambient::create(){
+      Orxonox::getSingleton()->getSceneManager()->setAmbientLight(ambientLight_);
+      return true;
+    }
+    
+    void Ambient::registerAllVariables(){
+      registerVar(&ambientLight_, sizeof(ColourValue), network::DATA);
+      
+    }
+    
     void Ambient::loadParams(TiXmlElement* xmlElem)
     {
@@ -83 +94 @@
    {
         GraphicsEngine::getSingleton().getSceneManager()->setAmbientLight(colour);
+      ambientLight_=colour;     
    }
 
@@ -96 +108 @@
 
         XMLPortParamLoadOnly(Ambient, "colourvalue", setAmbientLight, xmlelement, mode);
+        create();
     }
 }

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

@@ -34 +34 @@
 #include "util/Math.h"
 #include "core/BaseObject.h"
+#include "network/Synchronisable.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Ambient : public BaseObject
+    class _OrxonoxExport Ambient : public BaseObject, network::Synchronisable
     {
         public:
@@ -46 +47 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             void setAmbientLight(const ColourValue& colour);
+            bool create();
+            void registerAllVariables();
 
             static void setAmbientLightTest(const ColourValue& colour)
@@ -52 +55 @@
         private:
             static Ambient* instance_s;
+            ColourValue ambientLight_;
 
     };

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

@@ -82 +82 @@
 
     bool Model::create(){
-      WorldEntity::create();
+      if(!WorldEntity::create())
+        return false;
       if ((this->meshSrc_ != "") && (this->meshSrc_.size() > 0))
       {
         this->mesh_.setMesh(meshSrc_);
         this->attachObject(this->mesh_.getEntity());
-        COUT(4) << "Loader: Created model" << std::endl;
+        COUT(4) << "Loader (Model.cc): Created model" << std::endl;
       }
       return true;
@@ -93 +94 @@
 
     void Model::registerAllVariables(){
-      WorldEntity::registerAllVariables();
+//       WorldEntity::registerAllVariables();
+      COUT(5) << "Model.cc:registering new meshsrc with size: " << meshSrc_.length()+1 << " this: " << this << std::endl;
       registerVar(&meshSrc_, meshSrc_.length() + 1, network::STRING);
     }

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

@@ -40 +40 @@
     RegisterObject(NPC);
     movable_ = true;
+    registerAllVariables();
   }
 
@@ -59 +60 @@
     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/network2/src/orxonox/objects/NPC.h

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

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

@@ -47 +47 @@
     {
         RegisterObject(Skybox);
+        registerAllVariables();
     }
 
@@ -57 +58 @@
         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;
         }
    }
@@ -69 +70 @@
    }
 
+   void Skybox::setSkyboxSrc(std::string src){
+     skyboxSrc_ = src;
+   }
+   
     /**
         @brief XML loading and saving.
@@ -80 +85 @@
 
         XMLPortParamLoadOnly(Skybox, "src", setSkybox, xmlelement, mode);
+        XMLPortParamLoadOnly(Skybox, "src", setSkyboxSrc, xmlelement, loading);
+        create();
     }
+    
+    bool Skybox::create(){
+      this->setSkybox(skyboxSrc_);
+      return true;
+    }
+    
+    void Skybox::registerAllVariables(){
+      registerVar(&skyboxSrc_, skyboxSrc_.length()+1 ,network::STRING);
+    }
+    
 }

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

@@ -33 +33 @@
 
 #include "core/BaseObject.h"
+#include "network/Synchronisable.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Skybox : public BaseObject
+    class _OrxonoxExport Skybox : public BaseObject, public network::Synchronisable
     {
         public:
@@ -45 +46 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             void setSkybox(const std::string& skyboxname);
+            
+            bool create();
+            void registerAllVariables();
+            void setSkyboxSrc(std::string src);
 
         private:
+            std::string skyboxSrc_;
 
 

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

@@ -72 +72 @@
         }
     }
+    
 
     WorldEntity::~WorldEntity()
@@ -162 +163 @@
 */
     }
+    
 
     void WorldEntity::setYawPitchRoll(const Degree& yaw, const Degree& pitch, const Degree& roll)
@@ -188 +190 @@
 
         XMLPortObject(WorldEntity, WorldEntity, "attached", attachWorldEntity, getAttachedWorldEntity, xmlelement, mode, false, true);
+        
+        //create();
     }