Changeset 999 for code/branches/script/src/orxonox/core/Script.h

Timestamp:

Apr 6, 2008, 2:43:12 AM (17 years ago)

Author:

bknecht

Message:

some changes with the script. Made it singleton plus the files were moved into the core.

File:

• code/branches/script/src/orxonox/core/Script.h (moved) (moved from code/branches/script/src/orxonox/script/Script.h) (1 diff)

code/branches/script/src/orxonox/core/Script.h

@@ -21 +21 @@
   { // tolua_export
     public:
-    Script(); // tolua_export
-    ~Script();
+      inline static Script* getInstance() { if (!Script::singletonRef) Script::singletonRef = new Script(); return Script::singletonRef; }
+      inline ~Script() { Script::singletonRef = NULL; };
 
-    static void loadFile(std::string filename, bool luaTags);
-    static void init(lua_State *state_);
+    void loadFile(std::string filename, bool luaTags);
+    //void init(lua_State *state_);
     //void xmlToLua();
-    static void run();
+    void run();
     void luaPrint(std::string str); // tolua_export
 
-    inline static lua_State* getLuaState() { return luaState_; };
-    inline static std::string* getFileString() { return &fileString_; };
+    inline lua_State* getLuaState() { return luaState_; };
+    inline std::string getLuaOutput() { return output_; };
+    //inline std::string* getFileString() { return &fileString_; };
 
-    static unsigned int getNextQuote(const std::string& text, unsigned int start);
-    static std::string replaceLuaTags(const std::string& text);
+    unsigned int getNextQuote(const std::string& text, unsigned int start);
+    std::string replaceLuaTags(const std::string& text);
 
     private:
+      Script();
+      static Script* singletonRef;
 
-      //std::list<std::string>& getLevelFileLines();
-
-      static std::string fileString_;
-      static lua_State* luaState_;
+      std::string luaSource_;
+      std::string output_;
+      lua_State* luaState_;
 
   }; // tolua_export