Changeset 8385 in orxonox.OLD for branches/script_engine/src/lib

Timestamp:

Jun 14, 2006, 2:21:59 PM (19 years ago)

Author:

snellen

Message:

executor_lua shuould now be able to handle orxonox objects

Location:

branches/script_engine/src/lib

Files:

• script_engine/lunar.h (modified) (1 diff)
• script_engine/script_manager.cc (modified) (1 diff)
• util/executor/executor_lua.cc (modified) (2 diffs)
• util/executor/executor_lua.h (modified) (2 diffs)

branches/script_engine/src/lib/script_engine/lunar.h

@@ -172 +172 @@
       static int new_T(lua_State *L) {
         lua_remove(L, 1);   // use classname:new(), instead of classname.new()
-        T *obj = new T(L);  // call constructor for T objects
+        T *obj = new T();  // call constructor for T objects
         push(L, obj, true); // gc_T will delete this object
         return 1;           // userdata containing pointer to T object

branches/script_engine/src/lib/script_engine/script_manager.cc

@@ -38 +38 @@
 void ScriptManager::loadParams(const TiXmlElement* root)
 {
-  //BaseObject::loadParams(root);
+  BaseObject::loadParams(root);
   {
     LoadParamXML(root, "Scripts", this, ScriptManager, createScripts);

branches/script_engine/src/lib/util/executor/executor_lua.cc

@@ -20 +20 @@
 std::string temp;
 
+template<typename type> type* fromLua(lua_State* state, int index) { type *obj = Lunar<type>::check(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); };
@@ -28 +29 @@
 
 
-
+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); };

branches/script_engine/src/lib/util/executor/executor_lua.h

@@ -11 +11 @@
 #include "debug.h"
 #include "luaincl.h"
-
-
-
-template<typename type> type fromLua(lua_State* state, int index) { PRINTF(1)("NOT IMPLEMENTED\n"); };
+#include "lunar.h"
+
+
+
+template<typename type> type fromLua(lua_State* state, int index);
 template<> bool fromLua<bool>(lua_State* state, int index);
 template<> int fromLua<int>(lua_State* state, int index);
@@ -23 +24 @@
 
 
-template<typename type> void toLua(lua_State* state, type value) { PRINTF(1)("NOT IMPLEMENTED\n"); };
+template<typename type> void toLua(lua_State* state, type value);
 template<> void toLua<bool>(lua_State* state, bool value);
 template<> void toLua<int>(lua_State* state, int value);