Changeset 8401 in orxonox.OLD

Timestamp:

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

Author:

bensch

Message:

see this

Location:

branches/script_engine/src/lib/script_engine

Files:

• account.cc (modified) (1 diff)
• object.cc (modified) (1 diff)
• script_class.h (modified) (1 diff)
• script_method.cc (modified) (2 diffs)
• script_method.h (modified) (1 diff)

branches/script_engine/src/lib/script_engine/account.cc

@@ -39 +39 @@
  };
 
-tScriptClass<Account> global_ACCOUNT_ScriptableClass("Account", CL_ACCOUNT, new ScriptMethod("deposit", ExecutorLua1<Account, float>(&Account::deposit)));
+ tScriptClass<Account> global_ACCOUNT_ScriptableClass("Account", CL_ACCOUNT, (new ScriptMethod())->addMethod("deposit", ExecutorLua1<Account, float>(&Account::deposit)));
 
 

branches/script_engine/src/lib/script_engine/object.cc

@@ -8 +8 @@
 
 
-class Object : public BaseObject {
-   public:
-     static const char className[];
-     static Lunar<Object>::RegType methods[];
+class Object : public BaseObject
+{
+public:
+  static const char className[];
+  static Lunar<Object>::RegType methods[];
 
-     Object(lua_State* L) {callCount = 0; }
-     Object(){callCount = 0;this->setClassID(CL_TEST_OBJECT, "Object");};
-     ~Object() { printf("deleted Object (%p)\n", this); }
+  Object(lua_State* L) {callCount = 0; }
+  Object(){callCount = 0;this->setClassID(CL_TEST_OBJECT, "Object");};
+  ~Object() { printf("deleted Object (%p)\n", this); }
 
-        //meber functions
-     void takeParam(int i)
-     {
-       printf("Lua passed %i to c++\n",i);
-     }
+  //meber functions
+  void takeParam(int i)
+  {
+    printf("Lua passed %i to c++\n",i);
+  }
 
-     int printName(lua_State* L)
-     {
-       this->printName();
-       return 0;
-     }
+  int printName(lua_State* L)
+  {
+    this->printName();
+    return 0;
+  }
 
-     void printName()
-     {
-       callCount ++;
-       printf("Hi i'm object %p ! This is the %i. call.\n",this,callCount);
-     }
+  void printName()
+  {
+    callCount ++;
+    printf("Hi i'm object %p ! This is the %i. call.\n",this,callCount);
+  }
 
-     int getCallCount(){ return callCount; }
+  int getCallCount(){ return callCount; }
 
-   private:
-     int callCount;
+private:
+  int callCount;
 
- };
+};
 
- const char Object::className[] = "Object";
+const char Object::className[] = "Object";
 
- Lunar<Object>::RegType Object::methods[] = {
-   {"printName", new ExecutorLua0<Object>(&Object::printName)},
-   {"getCallCount", new ExecutorLua0ret<Object, int>(&Object::getCallCount)},
-   {"takeParam", new ExecutorLua1<Object, int>(&Object::takeParam)},
-   {0,0}
- };
+Lunar<Object>::RegType Object::methods[] = {
+      {"printName", new ExecutorLua0<Object>(&Object::printName)},
+      {"getCallCount", new ExecutorLua0ret<Object, int>(&Object::getCallCount)},
+      {"takeParam", new ExecutorLua1<Object, int>(&Object::takeParam)},
+      {0,0}
+    };
 
- CREATE_SCRIPTABLE_CLASS(Object, CL_TEST_OBJECT, ScriptMethod("printName", ExecutorLua0<Object>(&Object::printName)));
+CREATE_SCRIPTABLE_CLASS(Object, CL_TEST_OBJECT,
+                        addMethod("printName", ExecutorLua0<Object>(&Object::printName))
+                        ->addMethod("getCallCount", ExecutorLua0ret<Object, int>(&Object::getCallCount))
+                        ->addMethod("takeParam", ExecutorLua1<Object, int>(&Object::takeParam)));

branches/script_engine/src/lib/script_engine/script_class.h

@@ -19 +19 @@
  */
 #define CREATE_SCRIPTABLE_CLASS(CLASS_NAME, CLASS_ID, SCRIPT_METHODS) \
-    tScriptClass<CLASS_NAME> global_##CLASS_NAME##_ScriptableClass(#CLASS_NAME, CLASS_ID, new SCRIPT_METHODS)
+    tScriptClass<CLASS_NAME> global_##CLASS_NAME##_ScriptableClass(#CLASS_NAME, CLASS_ID, (new ScriptMethod)->SCRIPT_METHODS)
 
 

branches/script_engine/src/lib/script_engine/script_method.cc

@@ -22 +22 @@
  * @todo this constructor is not jet implemented - do it
 */
-ScriptMethod::ScriptMethod(const std::string& methodName, const Executor& executor)
-{
-  this->addMethod(methodName, executor);
-}
+ScriptMethod::ScriptMethod()
+{ }
 
 ScriptMethod* ScriptMethod::addMethod(const std::string& methodName, const Executor& executor)
@@ -50 +48 @@
   };
 }
-
-
-

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

@@ -15 +15 @@
 {
 public:
-  ScriptMethod(const std::string& methodName, const Executor& executor);
+  ScriptMethod();
   ~ScriptMethod();