Changeset 5781 for code/trunk/src/libraries/core/LuaState.cc

Timestamp:

Sep 24, 2009, 11:02:42 AM (16 years ago)

Author:

rgrieder

Message:

Reverted trunk again. We might want to find a way to delete these revisions again (x3n's changes are still available as diff in the commit mails).

File:

• code/trunk/src/libraries/core/LuaState.cc (modified) (8 diffs)

code/trunk/src/libraries/core/LuaState.cc

@@ -30 +30 @@
 #include "LuaState.h"
 
-#include <boost/filesystem.hpp>
 #include <tolua/tolua++.h>
 extern "C" {
@@ -39 +38 @@
 #include "util/Debug.h"
 #include "Core.h"
+#include "Resource.h"
 #include "ToluaBindCore.h"
 
@@ -71 +71 @@
         // Create dummy file info
         sourceFileInfo_.reset(new ResourceInfo());
+        sourceFileInfo_->group = "General";
+        sourceFileInfo_->size = 0;
 
         // Push 'this' pointer
@@ -85 +87 @@
     }
 
-    shared_ptr<ResourceInfo> LuaState::getFileInfo(const std::string& filename, bool bSearchOtherPaths)
+    shared_ptr<ResourceInfo> LuaState::getFileInfo(const std::string& filename, const std::string& resourceGroup, bool bSearchOtherPaths)
     {
         shared_ptr<ResourceInfo> sourceInfo;
-        sourceInfo = this->getFileInfo(filename);
+        if (resourceGroup != "NoResourceGroupProvided")
+            sourceInfo = Resource::getInfo(filename, resourceGroup);
 
         // Continue search if not explicitely forbidden
@@ -94 +97 @@
         {
             // Call might be relative to the file currently being processed
-            sourceInfo = this->getFileInfo(sourceFileInfo_->path + filename);
+            sourceInfo = Resource::getInfo(sourceFileInfo_->path + filename, sourceFileInfo_->group);
             if (sourceInfo == NULL)
             {
                 // Maybe find something in the same group but in the root path
-                sourceInfo = this->getFileInfo(filename);
+                sourceInfo = Resource::getInfo(filename, sourceFileInfo_->group);
             }
         }
@@ -104 +107 @@
     }
 
-    shared_ptr<ResourceInfo> LuaState::getFileInfo(const std::string& filename)
-    {
-        boost::filesystem::path filepath = Core::getDataPath() / "lua" / filename;
-        if (boost::filesystem::exists(filepath))
-        {
-            shared_ptr<ResourceInfo> info(new ResourceInfo());
-            info->filename = filepath.string();
-            info->path = filepath.branch_path().string();
-            info->basename = filepath.leaf();
-            return info;
-        }
-        else
-            return shared_ptr<ResourceInfo>();
-    }
-
-    std::string LuaState::loadFile(const std::string& filename)
-    {
-        std::ifstream file(filename.c_str());
-        std::ostringstream oss;
-        oss << file.rdbuf();
-        return oss.str();
-    }
-
-    void LuaState::includeFile(const std::string& filename, bool bSearchOtherPaths)
-    {
-        shared_ptr<ResourceInfo> sourceInfo = this->getFileInfo(filename, bSearchOtherPaths);
+    void LuaState::includeFile(const std::string& filename, const std::string& resourceGroup, bool bSearchOtherPaths)
+    {
+        shared_ptr<ResourceInfo> sourceInfo = this->getFileInfo(filename, resourceGroup, bSearchOtherPaths);
         if (sourceInfo != NULL)
-            this->includeString(this->loadFile(sourceInfo->filename), sourceInfo);
-        else
-            COUT(2) << "LuaState: Cannot include file '" << filename << std::endl;
+            this->includeString(Resource::open(sourceInfo->filename, sourceInfo->group)->getAsString(), sourceInfo);
+        else
+            COUT(2) << "LuaState: Cannot include file '" << filename << "' in resource group '"
+                    << (resourceGroup == "NoResourceGroupProvided" ? sourceFileInfo_->group : resourceGroup) << "': group not found." << std::endl;
     }
 
@@ -148 +129 @@
     }
 
-    void LuaState::doFile(const std::string& filename, bool bSearchOtherPaths)
-    {
-        shared_ptr<ResourceInfo> sourceInfo = this->getFileInfo(filename, bSearchOtherPaths);
+    void LuaState::doFile(const std::string& filename, const std::string& resourceGroup, bool bSearchOtherPaths)
+    {
+        shared_ptr<ResourceInfo> sourceInfo = this->getFileInfo(filename, resourceGroup, bSearchOtherPaths);
         if (sourceInfo != NULL)
-            this->doString(this->loadFile(sourceInfo->filename), sourceInfo);
-        else
-            COUT(2) << "LuaState: Cannot do file '" << filename << std::endl;
+            this->doString(Resource::open(sourceInfo->filename, sourceInfo->group)->getAsString(), sourceInfo);
+        else
+            COUT(2) << "LuaState: Cannot do file '" << filename << "' in resource group '"
+                << (resourceGroup == "NoResourceGroupProvided" ? sourceFileInfo_->group : resourceGroup) << "': group not found." << std::endl;
     }
 
@@ -204 +186 @@
     }
 
-    bool LuaState::fileExists(const std::string& filename, bool bSearchOtherPaths)
-    {
-        shared_ptr<ResourceInfo> info =  this->getFileInfo(filename, bSearchOtherPaths);
+    bool LuaState::fileExists(const std::string& filename, const std::string& resourceGroup, bool bSearchOtherPaths)
+    {
+        shared_ptr<ResourceInfo> info =  this->getFileInfo(filename, resourceGroup, bSearchOtherPaths);
         if (info == NULL)
             return false;