Changeset 2413

Timestamp:

Dec 11, 2008, 11:09:01 PM (16 years ago)

Author:

scheusso

Message:

trafficControl working now, but further tweaking in diff and priorities is needed

Location:

code/branches/presentation/src/network

Files:

• TrafficControl.cc (modified) (5 diffs)
• TrafficControl.h (modified) (5 diffs)

code/branches/presentation/src/network/TrafficControl.cc

@@ -68 +68 @@
         TrafficControl::TrafficControl()
         {
-    RegisterRootObject(TrafficControl);
+    RegisterObject(TrafficControl);
           assert(instance_==0);
           instance_=this;
-//     targetSize = 2500;//5000bytes
-    SetConfigValue ( targetSize, 28000./25. );
+    this->setConfigValues();
         }
         
@@ -88 +87 @@
 *Definition of public members
 */
+
+  void TrafficControl::setConfigValues()
+  {
+    SetConfigValue ( targetSize, 5000 );
+  }
 
   /**
@@ -261 +265 @@
       else
       {
-//         COUT(0) << "cut" << endl;
+        COUT(0) << "cut" << endl;
         clientListPerm_[currentClientID][(*itvec).objID].objValueSched += SCHED_PRIORITY_OFFSET; // NOTE: SCHED_PRIORITY_OFFSET is negative
 //         ittemp = itvec;
@@ -399 +403 @@
   }
   
-  void TrafficControl::priRemoveClient(int clientID)
+  void TrafficControl::clientDisconnected(unsigned int clientID)
   {
     assert(clientListTemp_.find(clientID) != clientListTemp_.end() );
@@ -405 +409 @@
     clientListTemp_.erase(clientListTemp_.find(clientID));
     clientListPerm_.erase(clientListPerm_.find(clientID));
-  }
-  void TrafficControl::pubRemoveClient(int clientID)
-  {
-    priRemoveClient(clientID);
   }
 

code/branches/presentation/src/network/TrafficControl.h

@@ -38 +38 @@
 #include "util/Integers.h"
 #include "core/OrxonoxClass.h"
+#include "network/ClientConnectionListener.h"
 
 namespace orxonox {
@@ -79 +80 @@
 *
 */
-class TrafficControl : public OrxonoxClass{
+class TrafficControl : public ClientConnectionListener {
   private:
 
@@ -141 +142 @@
     void evaluateList(unsigned int clientID, std::list<obj> *list);//done    
     void ack(unsigned int clientID, unsigned int gamestateID);  // this function gets called when the server receives an ack from the client
-    void priRemoveClient(int clientID);
+    
+    //ClientConnectionListener functions
+    virtual void clientConnected(unsigned int clientID){};
+    virtual void clientDisconnected(unsigned int clientID);
+
  
   protected:
@@ -155 +160 @@
     *Elements of struct i are therefore: *list[i].objID
     */
+    void setConfigValues();
     static TrafficControl *getInstance();
     void processObjectList(unsigned int clientID, unsigned int gamestateID, std::list<obj>* list); //gets a pointer to the list (containing objectIDs) and sorts it
@@ -166 +172 @@
     void printList(std::list<obj> *list, unsigned int clientID);
     void fixCreatorDependencies(std::list<obj>::iterator it, std::list<obj> *list, unsigned int clientID);
-    void pubRemoveClient(int clientID);
 };