Changeset 2485 for code/branches/presentation/src/network/synchronisable

Timestamp:

Dec 16, 2008, 6:01:13 PM (16 years ago)

Author:

landauf

Message:

Merged objecthierarchy2 into presentation branch

Couln't merge 2 lines in Gamestate.cc and a whole block of code in GSDedicated.cc (it seems like oli implemented in both branches something like a network-tick-limiter but with different approaches)

Not yet tested in network mode and with bots
The SpaceShips movement is also not yet fully adopted to the new physics (see Engine class)

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• src/network/synchronisable/Synchronisable.cc (modified) (6 diffs)
• src/network/synchronisable/Synchronisable.h (modified) (4 diffs)

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

@@ -119 +119 @@
     if (it != objectMap_.end())
       objectMap_.erase(it);
-    
+
     //HACK HACK HACK HACK HACK HACK
     // this hack ensures that childs of this object also get destroyed
@@ -166 +166 @@
 
     Identifier* id = ClassByID(header->classID);
+    if (!id)
+    {
+        COUT(0) << "Assertion failed: id" << std::endl;
+        COUT(0) << "Possible reason for this error: Client received a synchronizable object whose class has no factory." << std::endl;
+        abort();
+    }
     assert(id);
     BaseObject* creator = 0;
@@ -253 +259 @@
 
 /*  void Synchronisable::registerVariable(void *var, int size, variableType t, uint8_t mode, NetworkCallbackBase *cb){
-    assert( mode==direction::toclient || mode==direction::toserver || mode==direction::serverMaster || mode==direction::clientMaster);
+    assert( mode==variableDirection::toclient || mode==variableDirection::toserver || mode==variableDirection::serverMaster || mode==variableDirection::clientMaster);
     // create temporary synch.Var struct
     synchronisableVariable *temp = new synchronisableVariable;
@@ -261 +267 @@
     temp->type = t;
     temp->callback = cb;
-    if( ( mode & direction::bidirectional ) )
+    if( ( mode & variableDirection::bidirectional ) )
     {
       if(t!=STRING)
@@ -286 +292 @@
 #endif
   }*/
-  
+
 
   /**
@@ -444 +450 @@
     objectMode_=mode;
   }
-  
+
 
 }

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

@@ -61 +61 @@
     };
   }
-  
+
   namespace priority{
     enum prio{
@@ -100 +100 @@
     static uint32_t popDeletedObject(){ uint32_t i = deletedObjects_.front(); deletedObjects_.pop(); return i; }
 
-    inline uint32_t getObjectID(){return objectID;}
-    inline unsigned int getCreatorID(){return creatorID;}
-    inline uint32_t getClassID(){return classID;}
-    inline unsigned int getPriority(){ return objectFrequency_;}
+    inline uint32_t getObjectID() const {return objectID;}
+    inline unsigned int getCreatorID() const {return creatorID;}
+    inline uint32_t getClassID() const {return classID;}
+    inline unsigned int getPriority() const { return objectFrequency_;}
 
   protected:
@@ -134 +134 @@
     static std::queue<uint32_t> deletedObjects_;
   };
-  
+
   template <class T> void Synchronisable::registerVariable(T& variable, uint8_t mode, NetworkCallbackBase *cb, bool bidirectional)
   {
@@ -158 +158 @@
     // the variable has not been registered before
   }
-  
+
   // ================= Specialisation declarations
   template <> _NetworkExport void Synchronisable::registerVariable( const ColourValue& variable, uint8_t mode, NetworkCallbackBase* cb, bool bidirectional);