Changeset 8101 in orxonox.OLD for branches/script_engine/src/lib/script_engine/example.cc

Timestamp:

Jun 1, 2006, 7:24:22 PM (19 years ago)

Author:

bensch

Message:

EXECUTOR USED

File:

• branches/script_engine/src/lib/script_engine/example.cc (modified) (9 diffs)

branches/script_engine/src/lib/script_engine/example.cc

@@ -6 +6 @@
 #include "script.h"
 
-    class Account {
+
+    class Account : public BaseObject {
       lua_Number m_balance;
     public:
@@ -14 +15 @@
       Account(lua_State *L)      { m_balance = luaL_checknumber(L, 1); }
       Account(double balance=0)    : m_balance(balance) { }
+
+      void deposit (float value) { m_balance += value; };
+      void withdraw(float value) { m_balance -= value; };
+      float balance() { return m_balance; };;;;;;;;;;;;;;
+
       int deposit (lua_State *L) { m_balance += luaL_checknumber(L, 1); return 0; }
       int withdraw(lua_State *L) { m_balance -= luaL_checknumber(L, 1); return 0; }
@@ -26 +32 @@
 
     Lunar<Account>::RegType Account::methods[] = {
-      method(Account, deposit),
-      method(Account, withdraw),
-      method(Account, balance),
-      {0,0}
+      {"deposit", new ExecutorLua1<Account, float>(&Account::deposit)},
+      {"withdraw", new ExecutorLua1<Account, float>(&Account::withdraw)},
+      {"balance", new ExecutorLua0ret<Account, float>(&Account::balance)},
+      {0,NULL}
     };
 
 
-    class Object {
+    class Object : public BaseObject {
       public:
         static const char className[];
@@ -47 +53 @@
         {
          int calls = getCallCount();
-         lua_pushnumber(L,(lua_Number)calls); 
+         lua_pushnumber(L,(lua_Number)calls);
          return 1; // return number of values that the function wants to return to lua
         }
@@ -53 +59 @@
          //function that takes an argument from lua
          int takeParam(lua_State* L)
-         { 
+         {
           int param = (int)lua_tonumber(L,-1);
           takeParam(param);
-          return 0; 
+          return 0;
          }
 
@@ -67 +73 @@
         int printName(lua_State* L)
         {
-          callCount ++;
-          printf("Hi i'm object %p ! This is the %i. call.\n",this,callCount);
+          this->printName();
           return 0;
         }
 
-        int getCallCount(){return callCount;}
+        void printName()
+        {
+          callCount ++;
+          printf("Hi i'm object %p ! This is the %i. call.\n",this,callCount);
+        }
+
+        int getCallCount(){ return callCount; }
 
       private:
@@ -82 +93 @@
 
     Lunar<Object>::RegType Object::methods[] = {
-      method(Object, printName),
-      method(Object, getCallCount),
-      method(Object, takeParam),
+      {"printName", new ExecutorLua0<Object>(&Object::printName)},
+      {"getCallCount", new ExecutorLua0ret<Object, int>(&Object::getCallCount)},
+      {"takeParam", new ExecutorLua1<Object, int>(&Object::takeParam)},
       {0,0}
     };
@@ -123 +134 @@
       float retf = script.getReturnedFloat();
       printf("main returned %f\n",retf);
-      
+
 
       if(script.getReturnedBool())
@@ -142 +153 @@
       script.executeFunction();
 
-      
+
       //if(argc>1) lua_dofile(script.getLuaState(), argv[1]);
       printf("-------------------------- top of the stack:%i\n",lua_gettop(script.getLuaState()));