Changeset 8403 in orxonox.OLD for branches

Timestamp:

Jun 14, 2006, 5:22:13 PM (18 years ago)

Author:

bensch

Message:

methods should work

Location:

branches/script_engine/src/lib/script_engine

Files:

• lunar.h (modified) (5 diffs)
• script_method.h (modified) (1 diff)

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

@@ -21 +21 @@
 
 
-  static void Register(Script* script, const std::string& className, const ScriptMethod* scriptMethod)
+  static void Register(Script* script, const std::string& className, const ScriptMethod* scriptMethods)
   {
     if(script != NULL)
-      Register(script->getLuaState(), className, scriptMethod);
-  }
-
-  static void Register(lua_State *L, const std::string& className, const ScriptMethod* scriptMethod)
+      Register(script->getLuaState(), className, scriptMethods);
+  }
+
+  static void Register(lua_State *L, const std::string& className, const ScriptMethod* scriptMethods)
   {
     Lunar<T>::className = className;
+    Lunar<T>::scriptMethods = scriptMethods;
     lua_newtable(L);
     int methods = lua_gettop(L);
@@ -62 +63 @@
 
     // fill method table with methods from class T
+    /* as it was originally
     for (RegType *l = T::methods; l->name; l++)
     {
@@ -68 +70 @@
       lua_pushcclosure(L, thunk, 1);
       lua_settable(L, methods);
-    }
-
+  }*/
+    for (unsigned int i = 0; i < Lunar<T>::scriptMethods->size(); i++)
+    {
+      lua_pushstring(L, Lunar<T>::scriptMethods->name(i).c_str());
+      lua_pushlightuserdata(L, (void*)Lunar<T>::scriptMethods->executor(i));
+      lua_pushcclosure(L, thunk, 1);
+      lua_settable(L, methods);
+    }
     lua_pop(L, 2);  // drop metatable and method table
   }
@@ -176 +184 @@
     lua_remove(L, 1);  // remove self so member function args start at index 1
     // get member function from upvalue
-    RegType *l = static_cast<RegType*>(lua_touserdata(L, lua_upvalueindex(1)));
+    Executor *l = static_cast<Executor*>(lua_touserdata(L, lua_upvalueindex(1)));
     int value;
-    (*l->mfunc)(obj, value, L);  // call member function
+    (*l)(obj, value, L);  // call member function
     return value;
   }
@@ -268 +276 @@
   private:
     static std::string className;
+    static const ScriptMethod* scriptMethods;
 };
 
 template <typename T>
     std::string Lunar<T>::className = "";
+template <typename T>
+    const ScriptMethod* Lunar<T>::scriptMethods = NULL;
 
 #endif /* _LUNAR_H */

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

@@ -20 +20 @@
   ScriptMethod* addMethod(const std::string& methodName, const Executor& executor);
 
+  unsigned int size() const { return methods.size(); };
+
   const std::string& name(unsigned int methodNumber) const { return methods[methodNumber].name; };
   const Executor* executor(unsigned int methodNumber) const { return methods[methodNumber].executor; };