Changeset 2010 for code/branches/objecthierarchy/src/orxonox

Timestamp:

Oct 25, 2008, 5:13:35 PM (16 years ago)

Author:

landauf

Message:

renamed Level to XMLFile

Location:

code/branches/objecthierarchy/src/orxonox

Files:

• gamestates/GSDedicated.cc (modified) (4 diffs)
• gamestates/GSDedicated.h (modified) (1 diff)
• gamestates/GSLevel.cc (modified) (3 diffs)
• gamestates/GSLevel.h (modified) (1 diff)
• objects/infos/LevelInfo.cc (modified) (3 diffs)
• objects/infos/LevelInfo.h (modified) (2 diffs)

code/branches/objecthierarchy/src/orxonox/gamestates/GSDedicated.cc

@@ -35 +35 @@
 #include "core/CommandLine.h"
 #include "core/Loader.h"
+#include "core/XMLFile.h"
 #include "core/Core.h"
 #include "network/Server.h"
@@ -48 +49 @@
         , server_(0)
         , sceneManager_(0)
-        , startLevel_(0)
+        , startFile_(0)
     {
     }
@@ -74 +75 @@
         // call the loader
         COUT(0) << "Loading level..." << std::endl;
-        startLevel_ = new Level(Settings::getDataPath() + "levels/sample.oxw");
-        Loader::open(startLevel_);
+        startFile_ = new XMLFile(Settings::getDataPath() + "levels/sample.oxw");
+        Loader::open(startFile_);
 
         server_->open();
@@ -89 +90 @@
         // TODO: Remove and destroy console command
 
-        Loader::unload(startLevel_);
-        delete this->startLevel_;
+        Loader::unload(startFile_);
+        delete this->startFile_;
 
         this->server_->close();

code/branches/objecthierarchy/src/orxonox/gamestates/GSDedicated.h

@@ -56 +56 @@
         network::Server*      server_;
         Ogre::SceneManager*   sceneManager_;
-        Level*                startLevel_;       //!< current hard coded default level
+        XMLFile*              startFile_;        //!< current hard coded default level
     };
 }

code/branches/objecthierarchy/src/orxonox/gamestates/GSLevel.cc

@@ -36 +36 @@
 #include "core/input/KeyBinder.h"
 #include "core/Loader.h"
+#include "core/XMLFile.h"
 #include "core/CommandExecutor.h"
 #include "core/ConsoleCommand.h"
@@ -56 +57 @@
         , inputState_(0)
         , radar_(0)
-        , startLevel_(0)
+        , startFile_(0)
     {
         RegisterObject(GSLevel);
@@ -154 +155 @@
         // call the loader
         COUT(0) << "Loading level..." << std::endl;
-        startLevel_ = new Level(Settings::getDataPath() + "levels/sample2.oxw");
-        Loader::open(startLevel_);
+        startFile_ = new XMLFile(Settings::getDataPath() + "levels/sample2.oxw");
+        Loader::open(startFile_);
     }
 
     void GSLevel::unloadLevel()
     {
-        Loader::unload(startLevel_);
-        delete this->startLevel_;
+        Loader::unload(startFile_);
+        delete this->startFile_;
     }
 

code/branches/objecthierarchy/src/orxonox/gamestates/GSLevel.h

@@ -68 +68 @@
         SimpleInputState*     inputState_;
         Radar*                radar_;            //!< represents the Radar (not the HUD part)
-        Level*                startLevel_;       //!< current hard coded default level
+        XMLFile*              startFile_;        //!< current hard coded default level
 
         // config values

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

@@ -38 +38 @@
 #include "core/ConsoleCommand.h"
 #include "core/Loader.h"
+#include "core/XMLFile.h"
 #include "core/Template.h"
 
@@ -152 +153 @@
         XMLPortParam(LevelInfo, "ambientlight", setAmbientLight, getAmbientLight, xmlelement, mode).defaultValues(ColourValue(0.2, 0.2, 0.2, 1));
 
-        this->levelfile_ = this->getLevelfile();
+        this->xmlfile_ = this->getFilename();
     }
 
     void LevelInfo::registerVariables()
     {
-        REGISTERSTRING(this->levelfile_,    network::direction::toclient, new network::NetworkCallback<LevelInfo>(this, &LevelInfo::applyLevel));
-        REGISTERSTRING(this->name_,         network::direction::toclient, new network::NetworkCallback<LevelInfo>(this, &LevelInfo::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::applyLevel()
-    {
-        COUT(0) << "Loading level \"" << this->levelfile_ << "\"..." << std::endl;
+        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));
+        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()
+    {
+        COUT(0) << "Loading level \"" << this->xmlfile_ << "\"..." << std::endl;
 
         ClassTreeMask mask;
@@ -172 +173 @@
         mask.include(Class(Template));
 
-        Level* level = new Level(Settings::getDataPath() + this->levelfile_, mask);
-
-        Loader::open(level);
+        XMLFile* file = new XMLFile(Settings::getDataPath() + this->xmlfile_, mask);
+
+        Loader::open(file);
     }
 

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

@@ -80 +80 @@
             virtual void clientDisconnected(unsigned int clientID);
 
-            void applyLevel();
+            void applyXMLFile();
 
             void applySkybox()
@@ -94 +94 @@
             SubclassIdentifier<Gametype> gametypeIdentifier_;
             Gametype* rootGametype_;
-            std::string levelfile_;
+            std::string xmlfile_;
     };
 }