Changeset 5654 for code/branches/resource2/src/orxonox

Timestamp:

Aug 17, 2009, 4:37:10 PM (15 years ago)

Author:

rgrieder

Message:

• Implemented file management via resource manager and loading of resource locations via XML. Changes made:
  • SoundManager loads via memory stream rather than via file
  • Loader uses LuaState::includeFile() to load an XML file and passes the lua tag remover function to its LuaState.
  • ConfigFileManager still loads with hard paths because the files are required before Ogre gets created
• Renamed LuaBind to LuaState, deSingletonised it and added new features:
  • doFile(), doString(), includeFile(), includeString() where include will preparse the string with a function provided with LuaState::setIncludeParser
  • Moved lua tags replace function to Loader (since it's actually an XML related task)
  • Using data_path/lua/LuaInitScript.lua to provide the following functions
    • logMessage(level, message)
    • doFile, dofile, include (all working with relative paths but within the same resource group)
• Modified Script class to work with LuaState and fixed its XML Loader
• Adjusted all level and include files (both "include" and "dofile" lua commands)

Location:

code/branches/resource2/src/orxonox

Files:

• gamestates/GSGraphics.cc (modified) (1 diff)
• gamestates/GSLevel.cc (modified) (1 diff)
• gamestates/GSRoot.cc (modified) (3 diffs)
• objects/Level.cc (modified) (1 diff)
• objects/Script.cc (modified) (1 diff)
• objects/Script.h (modified) (1 diff)
• sound/SoundBase.cc (modified) (3 diffs)
• sound/SoundBase.h (modified) (1 diff)

code/branches/resource2/src/orxonox/gamestates/GSGraphics.cc

@@ -96 +96 @@
         // load debug overlay
         COUT(3) << "Loading Debug Overlay..." << std::endl;
-        this->debugOverlay_ = new XMLFile(Core::getDataPathString() + "overlay/debug.oxo");
+        this->debugOverlay_ = new XMLFile("debug.oxo");
         Loader::open(debugOverlay_);
 

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

@@ -246 +246 @@
         // call the loader
         COUT(0) << "Loading level..." << std::endl;
-        startFile_s = new XMLFile(Core::getDataPathString() + "levels" + '/' + LevelManager::getInstance().getDefaultLevel());
+        startFile_s = new XMLFile(LevelManager::getInstance().getDefaultLevel());
         Loader::open(startFile_s);
     }

code/branches/resource2/src/orxonox/gamestates/GSRoot.cc

@@ -33 +33 @@
 #include "core/Game.h"
 #include "core/GameMode.h"
-#include "core/LuaBind.h"
+#include "core/LuaState.h"
 #include "network/NetworkFunction.h"
-#include "ToluaBindCore.h"
 #include "ToluaBindOrxonox.h"
 #include "tools/Timer.h"
@@ -56 +55 @@
 
         // Tell LuaBind about all tolua interfaces
-        LuaBind::getInstance().addToluaInterface(&tolua_Core_open, "Core");
-        LuaBind::getInstance().addToluaInterface(&tolua_Orxonox_open, "Orxonox");
+        LuaState::addToluaInterface(&tolua_Orxonox_open, "Orxonox");
     }
 
@@ -86 +84 @@
         }
 
-        // create the global LevelManager
+        // create the LevelManager
         this->levelManager_ = new LevelManager();
     }

code/branches/resource2/src/orxonox/objects/Level.cc

@@ -53 +53 @@
         this->registerVariables();
         this->xmlfilename_ = this->getFilename();
-
-        if (this->xmlfilename_.length() >= Core::getDataPathString().length())
-            this->xmlfilename_ = this->xmlfilename_.substr(Core::getDataPathString().length());
     }
 

code/branches/resource2/src/orxonox/objects/Script.cc

@@ -29 +29 @@
 #include "Script.h"
 
-#include <tinyxml/ticpp.h>
 #include "core/CoreIncludes.h"
-#include "core/LuaBind.h"
+#include "core/LuaState.h"
+#include "core/XMLPort.h"
 
 namespace orxonox
 {
-  CreateFactory(Script);
+    CreateFactory(Script);
 
-  Script::Script(BaseObject* creator) : BaseObject(creator)
-  {
-    RegisterObject(Script);
+    Script::Script(BaseObject* creator) : BaseObject(creator)
+    {
+        RegisterObject(Script);
 
-    code_ = "";
-  }
+        // Get a new LuaState
+        luaState_ = new LuaState();
+    }
 
-  Script::~Script()
-  {
-  }
+    Script::~Script()
+    {
+        if (this->isInitialized())
+            delete luaState_;
+    }
 
-  /**
-  @brief XML loading and saving.
-  @param xmlelement The XML-element
-  @param loading Loading (true) or saving (false)
-   */
-  void Script::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-  {
-    BaseObject::XMLPort(xmlelement, mode);
+    void Script::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        BaseObject::XMLPort(xmlelement, mode);
 
-    code_ = xmlelement.GetText(false);
-  }
+        XMLPortParam(Script, "code", setCode, getCode, xmlelement, mode);
+    }
 
-  void Script::execute()
-  {
-    LuaBind& lua = LuaBind::getInstance();
-    lua.loadString(this->code_);
-    lua.run();
-  }
+    void Script::execute()
+    {
+        luaState_->doString(code_);
+    }
 }

code/branches/resource2/src/orxonox/objects/Script.h

@@ -37 +37 @@
 namespace orxonox
 {
-  class _OrxonoxExport Script : public BaseObject
-  {
+    class _OrxonoxExport Script : public BaseObject
+    {
     public:
-      Script(BaseObject* creator);
-      ~Script();
-      void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-      void execute();
+        Script(BaseObject* creator);
+        ~Script();
+        void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+        void execute();
+
+        void setCode(const std::string& code) { code_ = code; }
+        const std::string& getCode() const { return code_; }
 
     private:
-      std::string code_;
-  };
+        std::string code_;
+        LuaState* luaState_;
+    };
 }
 

code/branches/resource2/src/orxonox/sound/SoundBase.cc

@@ -36 +36 @@
 #include "util/Math.h"
 #include "core/Core.h"
+#include "core/Resource.h"
 #include "orxonox/objects/worldentities/WorldEntity.h"
 #include "SoundManager.h"
@@ -134 +135 @@
     }
 
-    bool SoundBase::loadFile(std::string filename) {
-        filename = Core::getDataPathString() + "/audio/" + filename;
-
+    bool SoundBase::loadFile(const std::string& filename) {
         if(!SoundManager::getInstance().isSoundAvailable())
         {
@@ -144 +143 @@
 
         COUT(3) << "Sound: OpenAL ALUT: loading file " << filename << std::endl;
-        this->buffer_ = alutCreateBufferFromFile(filename.c_str());
+        // Get DataStream from the resources
+        shared_ptr<ResourceInfo> fileInfo = Resource::getInfo(filename);
+        if (fileInfo == NULL) {
+            COUT(2) << "Warning: Sound file '" << filename << "' not found" << std::endl;
+            return false;
+        }
+        DataStreamPtr stream = Resource::open(filename);
+        // Read everything into a temporary buffer
+        char* buffer = new char[fileInfo->size];
+        stream->read(buffer, fileInfo->size);
+
+        this->buffer_ = alutCreateBufferFromFileImage(buffer, fileInfo->size);
+        delete[] buffer;
+
         if(this->buffer_ == AL_NONE) {
             COUT(2) << "Sound: OpenAL ALUT: " << alutGetErrorString(alutGetError()) << std::endl;

code/branches/resource2/src/orxonox/sound/SoundBase.h

@@ -55 +55 @@
         bool isStopped();
 
-        bool loadFile(std::string filename);
+        bool loadFile(const std::string& filename);
 
     private: