Changeset 8044 in orxonox.OLD for branches/script_engine/src/lib/script_engine/account.cc

Timestamp:

May 31, 2006, 9:24:11 PM (19 years ago)

Author:

snellen

Message:

calling scriptfunctions from c++ works now (includeing adding parameters)

File:

• branches/script_engine/src/lib/script_engine/account.cc (modified) (4 diffs)

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

@@ -1 @@
-    #include "luaincl.h"
-    #include <iostream>
 
-    #include "lunar.h"
+#include <iostream>
+
+#include "luaincl.h"
+#include "lunar.h"
+#include "Script.h"
 
     class Account {
@@ -11 +13 @@
 
       Account(lua_State *L)      { m_balance = luaL_checknumber(L, 1); }
+      Account(double balance=0)    : m_balance(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; }
@@ -36 +39 @@
 
         Object(lua_State* L) {callCount = 0; }
+        Object(){callCount = 0;};
         ~Object() { printf("deleted Object (%p)\n", this); }
+
 
         int printName(lua_State* L)
         {
+          callCount ++;
           printf("Hi i'm object %p ! This is the %i. call.\n",this,callCount);
-          callCount ++;
           return 0;
         }
@@ -60 +65 @@
     int main(int argc, char *argv[])
     {
-      lua_State *L = lua_open();
+      Script script;
+      Lunar<Account>::Register(&script);
+      Lunar<Object>::Register(&script);
 
-      luaopen_base(L);
-      luaopen_table(L);
-      luaopen_io(L);
-      luaopen_string(L);
-      luaopen_math(L);
-      luaopen_debug(L);
+      Object* obj= new Object();
+      Account a;
+      Account *b = new Account(30);
 
-      Lunar<Account>::Register(L);
-      Lunar<Object>::Register(L);
+      Lunar<Object>::insertObject(&script,obj,"Obj",true);
+      Lunar<Account>::insertObject(&script,&a,"a",false);
+      Lunar<Account>::insertObject(&script,b,"b",true);
 
-      Object* obj= new Object(L);
-      Lunar<Object>::insertObject(L,obj,"Obj",false);
-      //delete obj;
 
-      if(argc>1) lua_dofile(L, argv[1]);
+      std::string file(argv[1]);
 
-      lua_setgcthreshold(L, 0);  // collected garbage
-      lua_close(L);
+      if(script.loadFile(file))
+        printf("file %s succefully loaded\n", file.c_str());
+
+      //script.executeFile();
+
+      std::string main("main");
+      script.selectFunction(main,1);
+      script.pushParam(3,main);
+      script.executeFunction();
+
+      //if(argc>1) lua_dofile(script.getLuaState(), argv[1]);
+
       return 0;
     }