Changeset 1748

Timestamp:

Sep 9, 2008, 11:23:40 AM (16 years ago)

Author:

scheusso

Message:

backsync should now work correctly (server can move again )

Location:

code/branches/network/src

Files:

• network/Server.cc (modified) (2 diffs)
• network/Synchronisable.cc (modified) (4 diffs)
• network/Synchronisable.h (modified) (4 diffs)
• network/packet/Welcome.cc (modified) (2 diffs)
• orxonox/objects/Model.cc (modified) (1 diff)
• orxonox/objects/SpaceShip.cc (modified) (3 diffs)

code/branches/network/src/network/Server.cc

@@ -326 +326 @@
     w->setClientID(temp->getID());
     assert(w->send());
+    packet::Gamestate *g = new packet::Gamestate();
+    g->setClientID(temp->getID());
+    assert(g->collectData(0));
+    assert(g->compressData());
+    assert(g->send());
     return true;
   }
@@ -353 +358 @@
     no->setCamera(std::string("cam_") + convertToString(client->getID()));
     no->create();
-    no->setBacksync(true);
     
     return true;

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

@@ -64 +64 @@
     datasize=0;
     objectFrequency_=1;
+    objectMode_=0x1; // by default do not send data to servere
     objectID=idCounter++;
     syncList = new std::list<synchronisableVariable *>;
@@ -82 +83 @@
   }
 
+  
   void Synchronisable::setClient(bool b){
     if(b) // client
@@ -314 +316 @@
   }
   
+  /**
+   * 
+   * @param id 
+   * @return 
+   */
   bool Synchronisable::isMyTick(unsigned int id){
 //     return true;
-    return id==0 || id%objectFrequency_==objectID%objectFrequency_;
+    return ( id==0 || id%objectFrequency_==objectID%objectFrequency_ ) && ((objectMode_&state_)!=0);
   }
   
@@ -333 +340 @@
   }
   
-  void Synchronisable::setBacksync(bool sync){
-    backsync_=sync;
-  }
-
-  bool Synchronisable::getBacksync(){
-    return backsync_;
-  }
+  void Synchronisable::setObjectMode(int mode){
+    assert(mode==0x1 || mode==0x2 || mode==0x3);
+    objectMode_=mode;
+  }
+
 
 }

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

@@ -34 +34 @@
 #include <list>
 #include "core/OrxonoxClass.h"
+#include "util/XMLIncludes.h"
 #include "NetworkCallback.h"
 
@@ -66 +67 @@
   class _NetworkExport Synchronisable : virtual public orxonox::OrxonoxClass{
   public:
-
+    
     virtual ~Synchronisable();
     unsigned int objectID;
@@ -76 +77 @@
     bool updateData(unsigned char*& mem, int mode=0x0);
     bool isMyData(unsigned char* mem);
-    void setBacksync(bool sync);
-    bool getBacksync();
+    void setObjectMode(int mode);
+    void setObjectFrequency(unsigned int freq){ objectFrequency_ = freq; }
+    
     virtual void registerAllVariables()=0;
     virtual bool create();
@@ -93 +95 @@
     bool backsync_; // if true the variables with mode > 1 will be synchronised to server (client -> server)
     unsigned int objectFrequency_;
+    int objectMode_;
   };
 }

code/branches/network/src/network/packet/Welcome.cc

@@ -32 +32 @@
 #include "Welcome.h"
 #include "network/Host.h"
+#include "network/Synchronisable.h"
 #include "core/CoreIncludes.h"
 #include <assert.h>
@@ -79 +80 @@
   Host::setShipID(shipID);
   COUT(3) << "Welcome set clientId: " << clientID << " shipID: " << shipID << std::endl;
+  Synchronisable::setClient(true);
   delete this;
   return true;

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

@@ -45 +45 @@
     CreateFactory(Model);
 
+    /**
+     * 
+     */
     Model::Model()
     {
         RegisterObject(Model);
         registerAllVariables();
+        if(this->isExactlyA(Class(Model)))
+           setObjectFrequency(1);
     }
 

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

@@ -166 +166 @@
         if(network::Host::running())
           COUT(3) << "this id: " << this->objectID << " myShipID: " << network::Host::getShipID() << std::endl;
-        if(network::Host::running() && objectID == network::Host::getShipID())
+        if(network::Host::running() && objectID == network::Host::getShipID()){
+          setObjectMode(0x3);
           myShip_=true;
+        }
         else
           this->setRadarObjectColour(this->getProjectileColour());
@@ -360 +362 @@
       if(myShip_){
         COUT(3) << "requesting focus for camera" << std::endl;
-        this->setBacksync(true);
         //CameraHandler::getInstance()->requestFocus(cam_);
         if(this->isExactlyA(Class(SpaceShip))){
@@ -466 +467 @@
             }
 
-            projectile->setBacksync(true);
+            projectile->setObjectMode(0x3);
             this->timeToReload_ = this->reloadTime_;
         }