Changeset 1775 for code/branches/network/src/network/Synchronisable.h

Timestamp:

Sep 12, 2008, 5:36:57 PM (16 years ago)

Author:

scheusso

Message:

we have a new gamestate concept now: dont transmit synchronisable header of objects, that dont get updated that tick. transmit objectids of deleted objects to delete them on the client too

File:

• code/branches/network/src/network/Synchronisable.h (modified) (4 diffs)

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

@@ -33 +33 @@
 
 #include <list>
+#include <map>
+#include <queue>
 #include "core/OrxonoxClass.h"
 #include "util/XMLIncludes.h"
@@ -74 +76 @@
     void registerVar(void *var, int size, variableType t, int mode=1, NetworkCallbackBase *cb=0);
     bool getData(unsigned char*& men, unsigned int id, int mode=0x0);
-    int getSize2(unsigned int id, int mode=0x0);
+    int getSize(unsigned int id, int mode=0x0);
     bool updateData(unsigned char*& mem, int mode=0x0);
     bool isMyData(unsigned char* mem);
@@ -84 +86 @@
     static void setClient(bool b);
     
-    static bool fabricate(unsigned char*& mem, int mode=0x0);
+    static Synchronisable *fabricate(unsigned char*& mem, int mode=0x0);
+    static bool deleteObject(unsigned int objectID);
+    static Synchronisable *getSynchronisable(unsigned int objectID);
+    static unsigned int getNumberOfDeletedObject(){ return deletedObjects_.size(); }
+    static unsigned int popDeletedObject(){ unsigned int i = deletedObjects_.front(); deletedObjects_.pop(); return i; }
+    
+    
   protected:
     Synchronisable();
   private:
-    int getSize(unsigned int id, int mode=0x0);
     bool isMyTick(unsigned int id);
     std::list<synchronisableVariable *> *syncList;
@@ -96 +103 @@
     unsigned int objectFrequency_;
     int objectMode_;
+    static std::map<unsigned int, Synchronisable *> objectMap_;
+    static std::queue<unsigned int> deletedObjects_;
   };
 }