Changeset 2533 for code/branches/bugger/src/network/synchronisable

Timestamp:

Dec 23, 2008, 11:34:35 PM (17 years ago)

Author:

rgrieder

Message:

Merged revisions 2384-2436 from presentation branch to bugger.

Location:

code/branches/bugger

Files:

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

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

@@ -66 +66 @@
     RegisterRootObject(Synchronisable);
     static uint32_t idCounter=0;
-    objectFrequency_=1;
     objectMode_=0x1; // by default do not send data to server
     if ( !Host::running() || ( Host::running() && Host::isServer() ) )
@@ -78 +77 @@
     classID = static_cast<uint32_t>(-1);
 
-
-//#ifndef NDEBUG
-//    ObjectList<Synchronisable>::iterator it;
-//    for(it = ObjectList<Synchronisable>::begin(); it!=ObjectList<Synchronisable>::end(); ++it){
-//        if(!(*it==this || (it->objectID==OBJECTID_UNKNOWN && it->objectMode_==0x0)))
-//        {
-//            COUT(1) << "Assertion failed: *it==this || (it->objectID==OBJECTID_UNKNOWN && it->objectMode_==0x0)" << std::endl;
-//            COUT(1) << "Possible reason for this error: Client created a synchronized object without the Server's approval." << std::endl;
-//            abort();
-//        }
-//    }
-//#endif
+    // set standard priority
+    this->setPriority( priority::normal );
+
+    
+    // get creator id
+#ifndef NDEBUG
+    ObjectList<Synchronisable>::iterator it;
+    for(it = ObjectList<Synchronisable>::begin(); it!=ObjectList<Synchronisable>::end(); ++it){
+      if( it->getObjectID()==this->objectID )
+        if(!(*it==this || (it->objectID==OBJECTID_UNKNOWN && it->objectMode_==0x0))){
+          COUT(1) << "Assertion failed: *it==this || (it->objectID==OBJECTID_UNKNOWN && it->objectMode_==0x0)" << std::endl;
+          COUT(1) << "Possible reason for this error: Client created a synchronized object without the Server's approval." << std::endl;
+          abort();
+        }
+    }
+#endif
 
     this->creatorID = OBJECTID_UNKNOWN;
@@ -177 +180 @@
       {
         mem += header->size; //.TODO: this suckz.... remove size from header
+        assert(0);
         return 0;
       }
@@ -360 +364 @@
     //assert( (mode ^ objectMode_) != 0);
     if(syncList.empty()){
+      assert(0);
       COUT(4) << "Synchronisable::updateData syncList is empty" << std::endl;
       return false;

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

@@ -61 +61 @@
     };
   }
+  
+  namespace priority{
+    enum prio{
+      very_high   = -100,
+      high        = -15,
+      normal      = 0,
+      low         = 15,
+      very_low    = 100
+    };
+  }
 
   struct _NetworkExport synchronisableHeader{
@@ -101 +111 @@
     template <class T> void unregisterVariable(T& var);
     void setObjectMode(uint8_t mode);
-    void setObjectPriority(unsigned int freq){ objectFrequency_ = freq; }
+    void setPriority(unsigned int freq){ objectFrequency_ = freq; }