Changeset 9746 in orxonox.OLD for branches/new_class_id/src/lib/script_engine

Timestamp:

Sep 16, 2006, 3:34:04 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: does not run anymore with scripts, but i think, it is on track

lua_State is now handled over the Global Executor

Location:

branches/new_class_id/src/lib/script_engine

Files:

• script.cc (modified) (1 diff)
• script_method.h (modified) (1 diff)

branches/new_class_id/src/lib/script_engine/script.cc

@@ -26 +26 @@
 
 CREATE_SCRIPTABLE_CLASS(Script, Script::classID(),
-                    addMethod("addObject", ExecutorLua2<Script,const std::string&, const std::string& >(&Script::addObject))
-                    ->addMethod("registerClass", ExecutorLua1<Script,const std::string&>(&Script::registerClass))
-                    ->addMethod("selectFunction", ExecutorLua2ret<Script, bool, const std::string&, int >(&Script::selectFunction))
-                    ->addMethod("executeFunction", ExecutorLua0ret<Script,bool >(&Script::executeFunction))
+                    addMethod("addObject", Executor2<Script, lua_State*,const std::string&, const std::string& >(&Script::addObject))
+                    ->addMethod("registerClass", Executor1<Script, lua_State*,const std::string&>(&Script::registerClass))
+                    ->addMethod("selectFunction", Executor2ret<Script, lua_State*, bool, const std::string&, int >(&Script::selectFunction))
+                    ->addMethod("executeFunction", Executor0ret<Script, lua_State*,bool >(&Script::executeFunction))
                      );
 

branches/new_class_id/src/lib/script_engine/script_method.h

@@ -9 +9 @@
 #include <vector>
 
-#include "executor/executor_lua.h"
-
+#include "executor/executor_lua_state.h"
+#include "executor/executor_member.h"
 
 class ScriptMethod