Changeset 8101 in orxonox.OLD

Timestamp:

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

Author:

bensch

Message:

EXECUTOR USED

Location:

branches/script_engine/src/lib

Files:

• script_engine/Makefile.am (modified) (3 diffs)
• script_engine/example.cc (modified) (9 diffs)
• script_engine/lunar.h (modified) (2 diffs)
• util/executor/executor_lua.h (modified) (6 diffs)

branches/script_engine/src/lib/script_engine/Makefile.am

@@ -1 +1 @@
 MAINSRCDIR=../..
 include $(MAINSRCDIR)/defs/include_paths.am
+
+
+LIB_PREFIX=$(MAINSRCDIR)/lib
+include $(MAINSRCDIR)/lib/BuildLibs.am
+
+
 
 INCLUDES= -I../../../extern_libs
@@ -13 +19 @@
 
 bin_PROGRAMS = example
-example_SOURCES = \
-                example.cc \
-                \
-                ../util/executor/executor_lua.cc
 
 
-
-
-example_LDADD = libORXscript.a -L../../../extern_libs @LUA_LIBS@
-
-#main_LDFLAGS =
 
 
@@ -31 +28 @@
                 script.h\
                 script_manager.h
+
+
+
+example_DEPENDENCIES = \
+                $(MAINSRCDIR)/world_entities/libORXwe.a \
+                $(libORXlibs_a_LIBRARIES_) \
+                $(MAINSRCDIR)/util/libORXutils.a
+
+example_LDADD = \
+                $(MAINSRCDIR)/util/libORXutils.a \
+                $(libORXlibs_a_LIBRARIES_) \
+                libORXscript.a -L../../../extern_libs @LUA_LIBS@ \
+                $(MAINSRCDIR)/world_entities/libORXwe.a \
+                $(libORXlibs_a_LIBRARIES_) \
+                $(MAINSRCDIR)/util/libORXutils.a
+
+example_SOURCES= \
+                example.cc \
+                \
+                ../util/executor/executor_lua.cc

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()));

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

@@ -13 +13 @@
       typedef struct { T *pT; } userdataType;
     public:
-      typedef int (T::*mfp)(lua_State *L);
+      typedef Executor* mfp;
       typedef struct { const char *name; mfp mfunc; } RegType;
 
@@ -164 +164 @@
         // get member function from upvalue
         RegType *l = static_cast<RegType*>(lua_touserdata(L, lua_upvalueindex(1)));
-        return (obj->*(l->mfunc))(L);  // call member function
+        int value;
+        (*l->mfunc)(obj, value, L);  // call member function
+        return value;
       }
 

branches/script_engine/src/lib/util/executor/executor_lua.h

@@ -75 +75 @@
       return new ExecutorLua0<T>(ExecutorLua0<T>(this->functionPointer));
     }
+  private:
+    void          (T::*functionPointer)();
 };
 
@@ -122 +124 @@
       return new ExecutorLua1<T, type0>((this->functionPointer));
     }
+  private:
+    void          (T::*functionPointer)(type0);
 };
 
@@ -171 +175 @@
       return new ExecutorLua2<T, type0, type1>(this->functionPointer);
     }
+  private:
+    void          (T::*functionPointer)(type0, type1);
 };
 
@@ -227 +233 @@
       return new ExecutorLua0ret<T, ret>(this->functionPointer);
     }
+  private:
+    ret           (T::*functionPointer)();
 };
 
@@ -275 +283 @@
       return new ExecutorLua1ret<T, ret, type0>(this->functionPointer);
     }
+  private:
+    ret           (T::*functionPointer)(type0);
 };
 
@@ -322 +332 @@
       return new ExecutorLua2ret<T, ret, type0, type1>(this->functionPointer);
     }
+  private:
+    ret           (T::*functionPointer)(type0, type1);
 };