Changeset 1950 for code/branches/objecthierarchy

Timestamp:

Oct 19, 2008, 5:32:58 PM (16 years ago)

Author:

landauf

Message:

small update to do further network tests

Location:

code/branches/objecthierarchy/src

Files:

• core/BaseObject.h (modified) (2 diffs)
• orxonox/objects/gametypes/Gametype.cc (modified) (4 diffs)
• orxonox/objects/gametypes/Gametype.h (modified) (4 diffs)
• orxonox/objects/infos/PlayerInfo.cc (modified) (2 diffs)
• orxonox/objects/worldentities/PositionableEntity.h (modified) (1 diff)

code/branches/objecthierarchy/src/core/BaseObject.h

@@ -59 +59 @@
 
             /** @brief Sets the name of the object. @param name The name */
-            inline void setName(const std::string& name) { this->name_ = name; this->changedName(); }
-            /** @brief Returns the name of the object. @return The name */
+            inline void setName(const std::string& name) { this->oldName_ = this->name_; this->name_ = name; this->changedName(); }
+            /** @brief Returns the name of the object. */
             inline const std::string& getName() const { return this->name_; }
+            /** @brief Returns the old name of the object. */
+            inline const std::string& getOldName() const { return this->oldName_; }
             /** @brief This function gets called if the name of the object changes. */
             virtual void changedName() {}
@@ -95 +97 @@
         protected:
             std::string name_;                          //!< The name of the object
+            std::string oldName_;                       //!< The old name of the object
             bool bActive_;                              //!< True = the object is active
             bool bVisible_;                             //!< True = the object is visible

code/branches/objecthierarchy/src/orxonox/objects/gametypes/Gametype.cc

@@ -31 +31 @@
 
 #include "core/CoreIncludes.h"
+#include "core/ConsoleCommand.h"
 #include "objects/infos/PlayerInfo.h"
 
 namespace orxonox
 {
+    SetConsoleCommand(Gametype, listPlayers, true);
+
     CreateUnloadableFactory(Gametype);
 
@@ -54 +57 @@
     }
 
+    void Gametype::listPlayers()
+    {
+        Gametype* gametype = Gametype::getCurrentGametype();
+
+        if (gametype)
+        {
+            for (std::set<PlayerInfo*>::const_iterator it = gametype->players_.begin(); it != gametype->players_.end(); ++it)
+                COUT(0) << "ID: " << (*it)->getClientID() << ", Name: " << (*it)->getName() << std::endl;
+        }
+        else
+        {
+            for (ObjectList<PlayerInfo>::iterator it = ObjectList<PlayerInfo>::begin(); it != ObjectList<PlayerInfo>::end(); ++it)
+                COUT(0) << "ID: " << (*it)->getClientID() << ", Name: " << (*it)->getName() << std::endl;
+        }
+    }
+
     void Gametype::clientConnected(unsigned int clientID)
     {
         COUT(0) << "client connected" << std::endl;
 
+        // create new PlayerInfo instance
         PlayerInfo* player = new PlayerInfo();
         player->setClientID(clientID);
+
+        // add to clients-map
+        assert(!this->clients_[clientID]);
+        this->clients_[clientID] = player;
     }
 
@@ -65 +89 @@
     {
         COUT(0) << "client disconnected" << std::endl;
+
+        // remove from clients-map
+        PlayerInfo* player = this->clients_[clientID];
+        this->clients_.erase(clientID);
+
+        // delete PlayerInfo instance
+        delete player;
     }
 
@@ -88 +119 @@
         COUT(0) << "player " << player->getName() << " left" << std::endl;
     }
+
+    void Gametype::playerChangedName(PlayerInfo* player)
+    {
+        if (this->players_.find(player) != this->players_.end())
+        {
+            if (player->getName() != player->getOldName())
+            {
+                COUT(0) << "player " << player->getOldName() << " changed name to " << player->getName() << std::endl;
+            }
+        }
+    }
 }

code/branches/objecthierarchy/src/orxonox/objects/gametypes/Gametype.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include <map>
+
 #include "core/BaseObject.h"
 #include "network/ClientConnectionListener.h"
@@ -39 +41 @@
     class _OrxonoxExport Gametype : public BaseObject, public network::ClientConnectionListener
     {
+        friend class PlayerInfo;
+
         public:
             Gametype();
@@ -44 +48 @@
 
             static Gametype* getCurrentGametype();
-            void addPlayer(PlayerInfo* player);
-            void removePlayer(PlayerInfo* player);
+            static void listPlayers();
 
         protected:
@@ -54 +57 @@
             virtual void playerLeft(PlayerInfo* player);
 
+            virtual void playerChangedName(PlayerInfo* player);
+
         private:
+            void addPlayer(PlayerInfo* player);
+            void removePlayer(PlayerInfo* player);
+
             std::set<PlayerInfo*> players_;
+            std::map<unsigned int, PlayerInfo*> clients_;
     };
 }

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

@@ -51 +51 @@
 
         this->ping_ = -1;
+        this->clientID_ = (unsigned int)-1;
         this->bLocalPlayer_ = Core::isStandalone();
         this->bLocalPlayer_ = false;
@@ -85 +86 @@
     {
 std::cout << "# PI(" << this->getObjectID() << "): changedName to " << this->getName() << std::endl;
+        Gametype* gametype = Gametype::getCurrentGametype();
+        if (gametype)
+            gametype->playerChangedName(this);
     }
 

code/branches/objecthierarchy/src/orxonox/objects/worldentities/PositionableEntity.h

@@ -44 +44 @@
 
             inline void setPosition(const Vector3& position)
-                { this->node_->setPosition(position); std::cout << "set position to " << position << std::endl; }
+                { this->node_->setPosition(position); }
             inline void translate(const Vector3& distance, Ogre::Node::TransformSpace relativeTo = Ogre::Node::TS_LOCAL)
                 { this->node_->translate(distance, relativeTo); }