Changeset 2012 for code/branches/objecthierarchy

Timestamp:

Oct 25, 2008, 8:19:40 PM (16 years ago)

Author:

landauf

Message:

renamed LevelInfo as Level

Location:

code/branches/objecthierarchy/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• OrxonoxPrereqs.h (modified) (1 diff)
• objects/infos/Level.cc (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/infos/LevelInfo.cc) (11 diffs)
• objects/infos/Level.h (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/infos/LevelInfo.h) (5 diffs)
• overlays/hud/ChatOverlay.cc (modified) (2 diffs)

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

@@ -69 +69 @@
 
   objects/infos/Info.cc
-  objects/infos/LevelInfo.cc
+  objects/infos/Level.cc
   objects/infos/PlayerInfo.cc
 

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

@@ -98 +98 @@
 
     class Info;
-    class LevelInfo;
+    class Level;
     class PlayerInfo;
 

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

@@ -28 +28 @@
 
 #include "OrxonoxStableHeaders.h"
-#include "LevelInfo.h"
+#include "Level.h"
 
 #include <OgreSceneManager.h>
@@ -49 +49 @@
 namespace orxonox
 {
-    SetConsoleCommand(LevelInfo, listPlayers, true);
-
-    CreateFactory(LevelInfo);
-
-    LevelInfo::LevelInfo()
-    {
-        RegisterObject(LevelInfo);
+    SetConsoleCommand(Level, listPlayers, true);
+
+    CreateFactory(Level);
+
+    Level::Level()
+    {
+        RegisterObject(Level);
 
         this->rootGametype_ = 0;
@@ -71 +71 @@
         // test test test
 
-        COUT(0) << "created LevelInfo" << std::endl;
-    }
-
-    LevelInfo* LevelInfo::getActiveLevelInfo()
-    {
-        for (ObjectList<LevelInfo>::iterator it = ObjectList<LevelInfo>::begin(); it != ObjectList<LevelInfo>::end(); ++it)
+        COUT(0) << "created Level" << std::endl;
+    }
+
+    Level* Level::getActiveLevel()
+    {
+        for (ObjectList<Level>::iterator it = ObjectList<Level>::begin(); it != ObjectList<Level>::end(); ++it)
             if (it->isActive())
                 return (*it);
@@ -83 +83 @@
     }
 
-    PlayerInfo* LevelInfo::getClient(unsigned int clientID)
-    {
-        LevelInfo* levelinfo = LevelInfo::getActiveLevelInfo();
-
-        if (levelinfo)
-        {
-            std::map<unsigned int, PlayerInfo*>::const_iterator it = levelinfo->clients_.find(clientID);
-            if (it != levelinfo->clients_.end())
+    PlayerInfo* Level::getClient(unsigned int clientID)
+    {
+        Level* level = Level::getActiveLevel();
+
+        if (level)
+        {
+            std::map<unsigned int, PlayerInfo*>::const_iterator it = level->clients_.find(clientID);
+            if (it != level->clients_.end())
                 return it->second;
         }
@@ -102 +102 @@
     }
 
-    void LevelInfo::listPlayers()
-    {
-        LevelInfo* levelinfo = LevelInfo::getActiveLevelInfo();
-
-        if (levelinfo->getGametype())
-        {
-            for (std::set<PlayerInfo*>::const_iterator it = levelinfo->getGametype()->getPlayers().begin(); it != levelinfo->getGametype()->getPlayers().end(); ++it)
+    void Level::listPlayers()
+    {
+        Level* level = Level::getActiveLevel();
+
+        if (level->getGametype())
+        {
+            for (std::set<PlayerInfo*>::const_iterator it = level->getGametype()->getPlayers().begin(); it != level->getGametype()->getPlayers().end(); ++it)
                 COUT(0) << "ID: " << (*it)->getClientID() << ", Name: " << (*it)->getName() << std::endl;
         }
@@ -118 +118 @@
     }
 
-    void LevelInfo::clientConnected(unsigned int clientID)
+    void Level::clientConnected(unsigned int clientID)
     {
         COUT(0) << "client connected" << std::endl;
@@ -132 +132 @@
     }
 
-    void LevelInfo::clientDisconnected(unsigned int clientID)
+    void Level::clientDisconnected(unsigned int clientID)
     {
         COUT(0) << "client disconnected" << std::endl;
@@ -144 +144 @@
     }
 
-    void LevelInfo::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(LevelInfo, XMLPort, xmlelement, mode);
-
-        XMLPortParam(LevelInfo, "description", setDescription, getDescription, xmlelement, mode);
-        XMLPortParam(LevelInfo, "gametype", setGametypeString, getGametypeString, xmlelement, mode).defaultValues("Gametype");
-        XMLPortParam(LevelInfo, "skybox", setSkybox, getSkybox, xmlelement, mode);
-        XMLPortParam(LevelInfo, "ambientlight", setAmbientLight, getAmbientLight, xmlelement, mode).defaultValues(ColourValue(0.2, 0.2, 0.2, 1));
+    void Level::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(Level, XMLPort, xmlelement, mode);
+
+        XMLPortParam(Level, "description", setDescription, getDescription, xmlelement, mode);
+        XMLPortParam(Level, "gametype", setGametypeString, getGametypeString, xmlelement, mode).defaultValues("Gametype");
+        XMLPortParam(Level, "skybox", setSkybox, getSkybox, xmlelement, mode);
+        XMLPortParam(Level, "ambientlight", setAmbientLight, getAmbientLight, xmlelement, mode).defaultValues(ColourValue(0.2, 0.2, 0.2, 1));
 
         this->xmlfile_ = this->getFilename();
     }
 
-    void LevelInfo::registerVariables()
-    {
-        REGISTERSTRING(this->xmlfile_,     network::direction::toclient, new network::NetworkCallback<LevelInfo>(this, &LevelInfo::applyXMLFile));
-        REGISTERSTRING(this->name_,        network::direction::toclient, new network::NetworkCallback<LevelInfo>(this, &LevelInfo::changedName));
+    void Level::registerVariables()
+    {
+        REGISTERSTRING(this->xmlfile_,     network::direction::toclient, new network::NetworkCallback<Level>(this, &Level::networkcallback_applyXMLFile));
+        REGISTERSTRING(this->name_,        network::direction::toclient, new network::NetworkCallback<Level>(this, &Level::changedName));
         REGISTERSTRING(this->description_, network::direction::toclient);
-        REGISTERSTRING(this->skybox_,      network::direction::toclient, new network::NetworkCallback<LevelInfo>(this, &LevelInfo::applySkybox));
-        REGISTERDATA(this->ambientLight_,  network::direction::toclient, new network::NetworkCallback<LevelInfo>(this, &LevelInfo::applyAmbientLight));
-    }
-
-    void LevelInfo::applyXMLFile()
+        REGISTERSTRING(this->skybox_,      network::direction::toclient, new network::NetworkCallback<Level>(this, &Level::networkcallback_applySkybox));
+        REGISTERDATA(this->ambientLight_,  network::direction::toclient, new network::NetworkCallback<Level>(this, &Level::networkcallback_applyAmbientLight));
+    }
+
+    void Level::networkcallback_applyXMLFile()
     {
         COUT(0) << "Loading level \"" << this->xmlfile_ << "\"..." << std::endl;
@@ -178 +178 @@
     }
 
-    void LevelInfo::setSkybox(const std::string& skybox)
+    void Level::setSkybox(const std::string& skybox)
     {
         if (Core::showsGraphics())
@@ -187 +187 @@
     }
 
-    void LevelInfo::setAmbientLight(const ColourValue& colour)
+    void Level::setAmbientLight(const ColourValue& colour)
     {
         if (Core::showsGraphics())
@@ -195 +195 @@
     }
 
-    void LevelInfo::setGametypeString(const std::string& gametype)
+    void Level::setGametypeString(const std::string& gametype)
     {
         Identifier* identifier = ClassByString(gametype);

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

@@ -27 +27 @@
  */
 
-#ifndef _LevelInfo_H__
-#define _LevelInfo_H__
+#ifndef _Level_H__
+#define _Level_H__
 
 #include "OrxonoxPrereqs.h"
@@ -41 +41 @@
 namespace orxonox
 {
-    class _OrxonoxExport LevelInfo : public Info, public network::ClientConnectionListener
+    class _OrxonoxExport Level : public Info, public network::ClientConnectionListener
     {
         public:
-            LevelInfo();
-            virtual ~LevelInfo() {}
+            Level();
+            virtual ~Level() {}
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
@@ -72 +72 @@
                 { return this->rootGametype_; }
 
-            static LevelInfo* getActiveLevelInfo();
+            static Level* getActiveLevel();
             static void listPlayers();
             static PlayerInfo* getClient(unsigned int clientID);
@@ -80 +80 @@
             virtual void clientDisconnected(unsigned int clientID);
 
-            void applyXMLFile();
+            void networkcallback_applyXMLFile();
 
-            void applySkybox()
+            void networkcallback_applySkybox()
                 { this->setSkybox(this->skybox_); }
-            void applyAmbientLight()
+            void networkcallback_applyAmbientLight()
                 { this->setAmbientLight(this->ambientLight_); }
 
@@ -98 +98 @@
 }
 
-#endif /* _LevelInfo_H__ */
+#endif /* _Level_H__ */

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

@@ -39 +39 @@
 
 #include "GraphicsEngine.h"
-#include "objects/infos/LevelInfo.h"
+#include "objects/infos/Level.h"
 #include "objects/infos/PlayerInfo.h"
 #include "overlays/console/InGameConsole.h"
@@ -76 +76 @@
             std::string name = "unknown";
 
-            PlayerInfo* player = LevelInfo::getClient(senderID);
+            PlayerInfo* player = Level::getClient(senderID);
             if (player)
                 name = player->getName();