Changeset 2168 for code/branches/objecthierarchy/src

Timestamp:

Nov 9, 2008, 7:11:53 PM (16 years ago)

Author:

landauf

Message:

Split up LevelManager into LevelManager and PlayerManager where LevelManager handles all levels and is only active on the server, while PlayerManager handles client connections and passes new players to the LevelManager (if running on a server). If running on a client, PlayerManager just maps PlayerInfos with clientIDs.

Also added a small hack in Level.cc to show the ChatOverlay on clients.

Location:

code/branches/objecthierarchy/src

Files:

• network/Synchronisable.cc (modified) (11 diffs)
• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/LevelManager.cc (modified) (3 diffs)
• orxonox/LevelManager.h (modified) (3 diffs)
• orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• orxonox/PlayerManager.cc (added)
• orxonox/PlayerManager.h (added)
• orxonox/objects/infos/Level.cc (modified) (4 diffs)
• orxonox/overlays/hud/ChatOverlay.cc (modified) (2 diffs)

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

@@ -79 +79 @@
     classID = (unsigned int)-1;
     syncList = new std::list<synchronisableVariable *>;
-    
-    
+
+
 #ifndef NDEBUG
     ObjectList<Synchronisable>::iterator it;
@@ -173 +173 @@
       return 0;
     }
-    
+
     COUT(4) << "fabricating object with id: " << header->objectID << std::endl;
 
@@ -240 +240 @@
     if (it1 != objectMap_.end())
       return it1->second;
-    
+
     ObjectList<Synchronisable>::iterator it;
     for(it = ObjectList<Synchronisable>::begin(); it; ++it){
@@ -295 +295 @@
 #endif
   }
-  
+
   void Synchronisable::unregisterVariable(void *var){
     std::list<synchronisableVariable *>::iterator it = syncList->begin();
@@ -311 +311 @@
     // the variable has not been registered before
   }
-  
+
 
   /**
@@ -366 +366 @@
         continue;  // this variable should only be received
       }
-      
+
       // =========== start bidirectional stuff =============
       // if the variable gets synchronised bidirectional, then add the reference to the bytestream
@@ -397 +397 @@
       }
       // ================== end bidirectional stuff
-       
+
       switch((*i)->type){
         case DATA:
@@ -461 +461 @@
       bool callback=false;
       bool master=false;
-      
+
       if( ( (*i)->mode & direction::bidirectional ) == direction::bidirectional )
       {
@@ -505 +505 @@
         mem += sizeof((*i)->varReference);
       }
-      
+
       switch((*i)->type){
         case DATA:
@@ -525 +525 @@
           (*i)->size = *(size_t *)mem;
           mem += sizeof(size_t);
-          
+
           if( (*i)->callback) // check whether this string changed
             if( *static_cast<std::string*>((*i)->var) != std::string((char *)mem) )
@@ -535 +535 @@
               *static_cast<std::string*>((*i)->varBuffer)=*static_cast<std::string*>( (void*)(mem+sizeof(size_t)) );
           }
-          
+
           *((std::string *)((*i)->var)) = std::string((const char*)mem);
           COUT(5) << "synchronisable: char: " << (const char*)mem << " string: " << std::string((const char*)mem) << std::endl;

code/branches/objecthierarchy/src/orxonox/CMakeLists.txt

@@ -4 +4 @@
   LevelManager.cc
   Main.cc
+  PlayerManager.cc
   Settings.cc
 

code/branches/objecthierarchy/src/orxonox/LevelManager.cc

@@ -28 +28 @@
 
 #include "OrxonoxStableHeaders.h"
-
 #include "LevelManager.h"
 
-#include "core/CoreIncludes.h"
-
+#include "PlayerManager.h"
 #include "objects/infos/Level.h"
 #include "objects/infos/HumanPlayer.h"
@@ -42 +40 @@
     LevelManager::LevelManager()
     {
-        RegisterRootObject(LevelManager);
-
         assert(singletonRef_s == 0);
         singletonRef_s = this;
-
-        this->getConnectedClients();
     }
 
@@ -95 +89 @@
         {
             this->levels_s.front()->setActive(true);
-            for (std::map<unsigned int, PlayerInfo*>::iterator it = this->clients_.begin(); it != this->clients_.end(); ++it)
+            for (std::map<unsigned int, PlayerInfo*>::const_iterator it = PlayerManager::getInstance().getClients().begin(); it != PlayerManager::getInstance().getClients().end(); ++it)
                 this->levels_s.front()->playerEntered(it->second);
         }
     }
-
-
-    void LevelManager::clientConnected(unsigned int clientID)
-    {
-        COUT(3) << "client connected" << std::endl;
-
-        // create new HumanPlayer instance
-        HumanPlayer* player = new HumanPlayer(0);
-        player->setClientID(clientID);
-
-        // add to clients-map
-        assert(!this->clients_[clientID]);
-        this->clients_[clientID] = player;
-
-        if (this->getActiveLevel())
-            this->getActiveLevel()->playerEntered(player);
-    }
-
-    void LevelManager::clientDisconnected(unsigned int clientID)
-    {
-        COUT(3) << "client disconnected" << std::endl;
-
-        // remove from clients-map
-        PlayerInfo* player = this->clients_[clientID];
-        this->clients_.erase(clientID);
-
-        if (this->getActiveLevel())
-            this->getActiveLevel()->playerLeft(player);
-
-        // delete PlayerInfo instance
-        if (player)
-            delete player;
-    }
-
-
-    PlayerInfo* LevelManager::getClient(unsigned int clientID) const
-    {
-        std::map<unsigned int, PlayerInfo*>::const_iterator it = this->clients_.find(clientID);
-        if (it != this->clients_.end())
-            return it->second;
-        else
-            return 0;
-    }
 }

code/branches/objecthierarchy/src/orxonox/LevelManager.h

@@ -36 +36 @@
 #include <cassert>
 
-#include "network/ClientConnectionListener.h"
-
 namespace orxonox
 {
-    class _OrxonoxExport LevelManager : public ClientConnectionListener
+    class _OrxonoxExport LevelManager
     {
         public:
@@ -50 +48 @@
             Level* getActiveLevel();
 
-            PlayerInfo* getClient(unsigned int clientID) const;
-            inline const std::map<unsigned int, PlayerInfo*>& getClients() const
-                { return this->clients_; }
-
+            static LevelManager* getInstancePtr() { return singletonRef_s; }
             static LevelManager& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
 
@@ -59 +54 @@
             LevelManager(const LevelManager&);
 
-            void clientConnected(unsigned int clientID);
-            void clientDisconnected(unsigned int clientID);
-
             void activateNextLevel();
 
             std::list<Level*> levels_s;
-            std::map<unsigned int, PlayerInfo*> clients_;
-
             static LevelManager* singletonRef_s;
     };

code/branches/objecthierarchy/src/orxonox/OrxonoxPrereqs.h

@@ -82 +82 @@
     class CameraManager;
     class LevelManager;
+    class PlayerManager;
 
     // objects

code/branches/objecthierarchy/src/orxonox/objects/infos/Level.cc

@@ -40 +40 @@
 #include "PlayerInfo.h"
 #include "objects/gametypes/Gametype.h"
+#include "overlays/OverlayGroup.h"
 
 #include "util/Math.h"
@@ -62 +63 @@
         if (this->isInitialized())
         {
-            LevelManager::getInstance().releaseActivity(this);
+            if (LevelManager::getInstancePtr())
+                LevelManager::getInstance().releaseActivity(this);
 
             if (this->xmlfile_)
@@ -93 +95 @@
         mask.exclude(Class(BaseObject));
         mask.include(Class(Template));
+        mask.include(Class(OverlayGroup)); // HACK to include the ChatOverlay
 
         this->xmlfile_ = new XMLFile(Settings::getDataPath() + this->xmlfilename_, mask);
@@ -112 +115 @@
                 (*it)->setGametype(rootgametype);
 
-            LevelManager::getInstance().requestActivity(this);
+            if (LevelManager::getInstancePtr())
+                LevelManager::getInstance().requestActivity(this);
         }
     }

code/branches/objecthierarchy/src/orxonox/overlays/hud/ChatOverlay.cc

@@ -38 +38 @@
 #include "network/ClientInformation.h"
 
-#include "LevelManager.h"
+#include "PlayerManager.h"
 #include "objects/infos/PlayerInfo.h"
 #include "overlays/console/InGameConsole.h"
@@ -76 +76 @@
             std::string name = "unknown";
 
-            PlayerInfo* player = LevelManager::getInstance().getClient(senderID);
+            PlayerInfo* player = PlayerManager::getInstance().getClient(senderID);
             if (player)
                 name = player->getName();