Changeset 8408 in orxonox.OLD for trunk/src/lib/util/executor/executor_lua.cc

Timestamp:

Jun 14, 2006, 5:50:18 PM (19 years ago)

Author:

bensch

Message:

trunk: merged the script_engine branche back here
merged with command
svn merge ​https://svn.orxonox.net/orxonox/branches/script_engine . -r8284:HEAD
no conflicts

File:

• trunk/src/lib/util/executor/executor_lua.cc (modified) (2 diffs)

trunk/src/lib/util/executor/executor_lua.cc

@@ -18 +18 @@
 #include "executor_lua.h"
 
-std::string temp;
+#include "lunar.h"
 
+std::string temp[5];
+
+template<typename type> type* fromLua(lua_State* state, int index) { type *obj = Lunar<type>::check(state, 1); lua_remove(state, 1); return obj;};
 template<> bool fromLua<bool>(lua_State* state, int index) { return lua_toboolean(state, index); };
 template<> int fromLua<int>(lua_State* state, int index) { return (int)lua_tonumber(state, index); };
@@ -25 +28 @@
 template<> float fromLua<float>(lua_State* state, int index) { return (float)lua_tonumber(state, index); };
 template<> char fromLua<char>(lua_State* state, int index) { return (char)lua_tonumber(state, index); };
-template<> const std::string& fromLua<const std::string&>(lua_State* state, int index) { temp = lua_tostring(state, index); return temp; };
+template<> const std::string& fromLua<const std::string&>(lua_State* state, int index) { temp[index] = lua_tostring(state, index); return temp[index]; };
 
 
-
+template<typename type> void toLua(lua_State* state, type value) { Lunar<type>::push(state, value, false); };
 template<> void toLua<bool>(lua_State* state, bool value) { lua_pushboolean(state, (int) value); };
 template<> void toLua<int>(lua_State* state, int value)  { lua_pushnumber(state, (lua_Number) value); };