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

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.h (modified) (3 diffs)

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

@@ -45 +45 @@
 namespace orxonox
 {
-    //! Stores basic information about a File
-    struct ResourceInfo
-    {
-        //! The file's fully qualified name
-        std::string filename;
-        //! Path name; separated by '/' and ending with '/'
-        std::string path;
-        //! Base filename
-        std::string basename;
-    };
-
     /**
     @brief
@@ -67 +56 @@
         ~LuaState();
 
-        void doFile(const std::string& filename, bool bSearchOtherPaths = true); // tolua_export
+        void doFile(const std::string& filename, const std::string& resourceGroup = "General", bool bSearchOtherPaths = true); // tolua_export
         void doString(const std::string& code, shared_ptr<ResourceInfo> sourceFileInfo = shared_ptr<ResourceInfo>());
 
-        void includeFile(const std::string& filename, bool bSearchOtherPaths = true); // tolua_export
+        void includeFile(const std::string& filename, const std::string& resourceGroup = "General", bool bSearchOtherPaths = true); // tolua_export
         void includeString(const std::string& code, shared_ptr<ResourceInfo> sourceFileInfo = shared_ptr<ResourceInfo>());
 
         void luaPrint(const std::string& str); // tolua_export
         void luaLog(unsigned int level, const std::string& message); // tolua_export
-        bool fileExists(const std::string& filename, bool bSearchOtherPaths = true); // tolua_export
+        bool fileExists(const std::string& filename, const std::string& resourceGroup = "General", bool bSearchOtherPaths = true); // tolua_export
 
         const std::stringstream& getOutput() const { return output_; }
@@ -89 +78 @@
 
     private:
-        shared_ptr<ResourceInfo> getFileInfo(const std::string& filename, bool bSearchOtherPaths);
-        shared_ptr<ResourceInfo> getFileInfo(const std::string& filename);
-        std::string loadFile(const std::string& filename);
+        shared_ptr<ResourceInfo> getFileInfo(const std::string& filename, const std::string& resourceGroup, bool bSearchOtherPaths);
 
 #if LUA_VERSION_NUM != 501