Changeset 5660

Timestamp:

Aug 18, 2009, 12:06:41 PM (15 years ago)

Author:

rgrieder

Message:

Added bLuaSupport_ to XMLFile so we can load the resource locations without lua. And therefore LuaState can access its init script via resources.
Also fixed a problem in the LevelManager with level loading.

Location:

code/branches/resource2/src

Files:

• core/GraphicsManager.cc (modified) (2 diffs)
• core/Loader.cc (modified) (2 diffs)
• core/LuaState.cc (modified) (1 diff)
• core/XMLFile.h (modified) (2 diffs)
• orxonox/LevelManager.cc (modified) (1 diff)

code/branches/resource2/src/core/GraphicsManager.cc

@@ -103 +103 @@
         // Load resources
         resources_.reset(new XMLFile("resources.oxr", "dataRoot"));
+        resources_->setLuaSupport(false);
         Loader::open(resources_.get());
 
@@ -110 +111 @@
             Ogre::ResourceGroupManager::getSingleton().addResourceLocation(Core::getExternalDataPathString(), "FileSystem", "externalDataRoot", false);
             extResources_.reset(new XMLFile("resources.oxr", "externalDataRoot"));
+            extResources_->setLuaSupport(false);
             Loader::open(extResources_.get());
         }

code/branches/resource2/src/core/Loader.cc

@@ -122 +122 @@
         Loader::currentMask_s = file->getMask() * mask;
 
-        // Use the LuaState to replace the XML tags (calls our function)
-        scoped_ptr<LuaState> luaState(new LuaState());
-        luaState->setIncludeParser(&Loader::replaceLuaTags);
-        luaState->includeFile(file->getFilename(), file->getResourceGroup(), false);
-        //luaState->doString(luaInput);
+        std::string xmlInput;
+        if (file->getLuaSupport())
+        {
+            // Use the LuaState to replace the XML tags (calls our function)
+            scoped_ptr<LuaState> luaState(new LuaState());
+            luaState->setIncludeParser(&Loader::replaceLuaTags);
+            luaState->includeFile(file->getFilename(), file->getResourceGroup(), false);
+            xmlInput = luaState->getOutput().str();
+        }
+        else
+        {
+            shared_ptr<ResourceInfo> info = Resource::getInfo(file->getFilename(), file->getResourceGroup());
+            if (info == NULL)
+            {
+                COUT(1) << "Error: Could not find XML file '" << file->getFilename() << "'." << std::endl;
+                return false;
+            }
+            xmlInput = Resource::open(file->getFilename(), file->getResourceGroup())->getAsString();
+        }
 
         try
@@ -134 +148 @@
 
             ticpp::Document xmlfile(file->getFilename());
-            xmlfile.Parse(luaState->getOutput().str(), true);
+            xmlfile.Parse(xmlInput, true);
 
             ticpp::Element rootElement;

code/branches/resource2/src/core/LuaState.cc

@@ -79 +79 @@
 
         // Parse init script
-        // Note: We have to use a hard coded path because the script is required for the resource loading
-        this->doString("dofile(\"" + Core::getDataPathString() + "lua/LuaStateInit.lua\")");
+        this->doFile("LuaStateInit.lua");
     }
 

code/branches/resource2/src/core/XMLFile.h

@@ -50 +50 @@
             { }
 
+            void setLuaSupport(bool val) { bLuaSupport_ = val; }
+
             const std::string& getFilename() const { return this->filename_; }
             const std::string& getResourceGroup() const { return this->group_; }
             const ClassTreeMask& getMask() const { return this->mask_; }
+            bool getLuaSupport() const { return this->bLuaSupport_; }
 
         private:
@@ -58 +61 @@
             std::string group_;
             ClassTreeMask mask_;
+            bool bLuaSupport_;
     };
 }

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

@@ -142 +142 @@
                 it = availableLevels_.erase(it);
             else
+            {
+                size_t pos = it->find(".oxw");
+                *it = it->substr(0, pos);
                 ++it;
+            }
     }
 }