Changeset 999

Timestamp:

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

Author:

bknecht

Message:

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

Location:

code/branches/script

Files:

• cmake/FindLua.cmake (modified) (1 diff)
• cmake/FindToLua.cmake (deleted)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/core/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/core/Loader.cc (modified) (3 diffs)
• src/orxonox/core/Script.cc (moved) (moved from code/branches/script/src/orxonox/script/Script.cc) (4 diffs)
• src/orxonox/core/Script.h (moved) (moved from code/branches/script/src/orxonox/script/Script.h) (1 diff)
• src/orxonox/core/tolua.pkg (moved) (moved from code/branches/script/src/orxonox/script/tolua_script.pkg)
• src/util/tolua_bind.cc (moved) (moved from code/branches/script/src/orxonox/script/tolua_script.cc)
• src/util/tolua_bind.h (moved) (moved from code/branches/script/src/orxonox/script/tolua_script.h)

code/branches/script/cmake/FindLua.cmake

@@ -32 +32 @@
 
 IF (NOT Lua_LIBRARIES)
-FIND_LIBRARY(Lua_LIBRARIES lua50 liblua
+FIND_LIBRARY(Lua_LIBRARIES lua50 lua
         /usr/lib
         /usr/local/lib
         /usr/pack/lua-5.0.3-sd/i686-debian-linux3.1/lib/)
 
-FIND_LIBRARY(Lua_LIBRARY lualib50 liblualib
+FIND_LIBRARY(Lua_LIBRARY lualib50 lualib
         /usr/lib
         /usr/local/lib

code/branches/script/src/orxonox/CMakeLists.txt

@@ -32 +32 @@
   objects/weapon/BulletManager.cc
   objects/weapon/WeaponStation.cc
-  script/Script.cc
-  script/tolua_script.cc
 )
 
@@ -43 +41 @@
   ${OGRE_LIBRARIES}
   ${OIS_LIBRARIES}
-  ${Lua_LIBRARIES}
-  ${ToLua_LIBRARIES}
   util
   core

code/branches/script/src/orxonox/core/CMakeLists.txt

@@ -18 +18 @@
   XMLPort.cc
   Tickable.cc
+  Script.cc
 )
 
@@ -25 +26 @@
 TARGET_LINK_LIBRARIES( core
   util
+  ${Lua_LIBRARIES}
 )

code/branches/script/src/orxonox/core/Loader.cc

@@ -33 +33 @@
 #include "Debug.h"
 #include "CoreIncludes.h"
-#include "../script/Script.h"
+#include "Script.h"
 
 #include "util/tinyxml/ticpp.h"
@@ -110 +110 @@
         // let Lua work this out:
         //Script* lua;
-        Script::loadFile(level->getFile(), true);
+        /*Script::loadFile(level->getFile(), true);
         Script::init(Script::getLuaState());
-        Script::run();
+        Script::run();*/
+        Script* lua = Script::getInstance();
 
         try
@@ -124 +125 @@
             ticpp::Document xmlfile;
             //xmlfile.ToDocument();
-            xmlfile.Parse(*Script::getFileString(), true);
+            xmlfile.Parse(lua->getLuaOutput(), true);
 
             for ( ticpp::Iterator<ticpp::Element> child = xmlfile.FirstChildElement(false); child != child.end(); child++ )

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

@@ -39 +39 @@
 
 #include "tolua++.h"
-#include "tolua_script.h"
+#include "toluabind.h"
 
 namespace orxonox
 {
 
-  lua_State* Script::luaState_ = lua_open();
-  //lua_State* Script::luaState_ = NULL;
-  std::string Script::fileString_ = "";
-
   Script::Script()
   {
-  }
-
-  Script::~Script()
-  {
-
-  }
-
-  /**
-      @brief Initializes a lua state
-      @param state_ the pointer of the lua_state to initialise
-  */
-  void Script::init(lua_State *state_)
-  {
-    tolua_script_open(state_);
-
-    /*
-#if LUA_VERSION_NUM == 501
-    luaL_openlibs(state_);
-#else
-    luaopen_base(state_);
-    luaopen_table(state_);
-    luaopen_io(state_);
-    luaopen_string(state_);
-    luaopen_math(state_);
-    luaopen_debug(state_);
-#endif
-    */
+    luaState_ = lua_open();
+    luaSource_ = "";
+    tolua_something_open(luaState_);
   }
 
   void Script::luaPrint(std::string str)
   {
-    fileString_ = str;
+    output_ = str;
   }
 
@@ -100 +72 @@
 
     char line[1024];
+    std::string levelString = "";
 
     while (file.good() && !file.eof())
     {
       file.getline(line, 1024);
-      fileString_ += line;
+      levelString += line;
     }
 
@@ -110 +83 @@
     //std::string output;
 
-    if (luaTags) fileString_ = replaceLuaTags(Script::fileString_);
+    if (luaTags) luaSource_ = replaceLuaTags(levelString);
   }
 
@@ -117 +90 @@
     int error = 0;
     std::string init = "local scr = orxonox.Script:new()\n";
-    init += fileString_;
+    init += luaSource_;
     error = luaL_loadstring(luaState_, init.c_str());
     if (error == 0)

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