Changeset 5654 for code/branches/resource2/src/core/LuaState.h

Timestamp:

Aug 17, 2009, 4:37:10 PM (16 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)

File:

• code/branches/resource2/src/core/LuaState.h (moved) (moved from code/branches/resource2/src/core/LuaBind.h) (2 diffs)

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

@@ -22 +22 @@
  *   Author:
  *      Benjamin Knecht
+ *      Reto Grieder
  *   Co-authors:
  *      ...
@@ -27 +28 @@
  */
 
-/**
- @file
- @brief Representation of an interface to lua
- @author Benjamin Knecht <beni_at_orxonox.net>
- */
-
-#ifndef _LuaBind_H__
-#define _LuaBind_H__
+#ifndef _LuaState_H__
+#define _LuaState_H__
 
 #include "CorePrereqs.h"
 
-#include <cassert>
+#include <map>
+#include <sstream>
 #include <string>
 #include <vector>
-extern "C" {
-#include <lua.h>
-}
+#include <boost/shared_ptr.hpp>
 
-#include "util/Singleton.h"
+#include "util/ScopeGuard.h"
 
 // tolua_begin
 namespace orxonox
 {
-  class _CoreExport LuaBind : public Singleton<LuaBind>
-  {
+    /**
+    @brief
+        Representation of an interface to lua
+    */
+    class _CoreExport LuaState
+    {
 // tolua_end
-    friend class Singleton<LuaBind>;
+    public:
+        LuaState();
+        ~LuaState();
 
-    struct LoadS {
-      const char *s;
-      size_t size;
-    };
+        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>());
 
-    public:
-      LuaBind();
-      ~LuaBind();
+        void includeFile(const std::string& filename, const std::string& resourceGroup = "Genreal", bool bSearchOtherPaths = true); // tolua_export
+        void includeString(const std::string& code, shared_ptr<ResourceInfo> sourceFileInfo = shared_ptr<ResourceInfo>());
 
-      static LuaBind& getInstance() { return Singleton<LuaBind>::getInstance(); } // tolua_export
+        void luaPrint(const std::string& str); // tolua_export
+        void luaLog(unsigned int level, const std::string& message); // tolua_export
 
-    void loadFile(const std::string& filename, bool luaTags);
-    void loadString(const std::string& code);
-    //void init(lua_State *state_);
-    //void xmlToLua();
-    void run();
-    void luaPrint(const std::string& str); // tolua_export
+        const std::stringstream& getOutput() const { return output_; }
+        void clearOutput() { output_.clear(); } // tolua_export
+
+        void setIncludeParser(std::string (*function)(const std::string&)) { includeParseFunction_ = function; }
+        lua_State* getInternalLuaState() { return luaState_; }
+
+        static bool addToluaInterface(int (*function)(lua_State*), const std::string& name);
+        static bool removeToluaInterface(const std::string& name);
+        static void openToluaInterfaces(lua_State* state);
+        static void closeToluaInterfaces(lua_State* state);
+
+    private:
+        shared_ptr<ResourceInfo> getFileInfo(const std::string& filename, const std::string& resourceGroup, bool bSearchOtherPaths);
 
 #if LUA_VERSION_NUM != 501
-    static const char * lua_Chunkreader(lua_State *L, void *data, size_t *size);
+        struct LoadS
+        {
+            const char* s;
+            size_t size;
+        };
+
+        static const char * lua_Chunkreader(lua_State *L, void *data, size_t *size);
 #endif
 
-    inline lua_State* getLuaState() { return luaState_; };
-    inline const std::string& getLuaOutput() { return output_; };
-    //inline std::string* getFileString() { return &fileString_; };
-    inline void clearLuaOutput() { output_ = ""; }
+        std::stringstream output_;
+        lua_State* luaState_;
+        bool bIsRunning_;
+        shared_ptr<ResourceInfo> sourceFileInfo_;
+        std::string (*includeParseFunction_)(const std::string&);
 
-    std::string replaceLuaTags(const std::string& text); // tolua_export
+        typedef std::map<std::string, int (*)(lua_State *L)> ToluaInterfaceMap;
+        static ToluaInterfaceMap toluaInterfaces_s;
+        static std::vector<LuaState*> instances_s;
+    }; // tolua_export
+} // tolua_export
 
-    inline void setIncludePath(const std::string& includepath)
-        { this->includePath_ = includepath; }
-
-    void addToluaInterface(int (*function)(lua_State*), const std::string& name);
-    void openToluaInterfaces(lua_State* state);
-    void closeToluaInterfaces(lua_State* state);
-
-    private:
-      static LuaBind* singletonPtr_s;
-
-      std::string luaSource_;
-      std::string output_;
-      lua_State* luaState_;
-      bool isRunning_;
-      std::string includePath_;
-      std::vector<std::pair<std::string, int (*)(lua_State *L)> > toluaInterfaces_;
-
-  }; // tolua_export
-} // tolua_export
-#endif /* _LuaBind_H__ */
+#endif /* _LuaState_H__ */