Changeset 8408 in orxonox.OLD for trunk/src/lib/script_engine/object.cc

Timestamp:

Jun 14, 2006, 5:50:18 PM (18 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/script_engine/object.cc (modified) (1 diff)

trunk/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:
+  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;};
-     ~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";
-
- 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);
+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)));