Changeset 7975 in orxonox.OLD for branches

Timestamp:

May 30, 2006, 11:52:41 AM (18 years ago)

Author:

snellen

Message:

works finally

Location:

branches/script_engine/src/lib/script_engine

Files:

• Makefile.am (modified) (2 diffs)
• Script.cc (added)
• Script.h (added)
• account.cc (modified) (2 diffs)
• lunar.h (modified) (1 diff)
• lunartest.lua (modified) (1 diff)

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

@@ -10 +10 @@
 bin_PROGRAMS = account
 account_SOURCES = \
-                account.cc
+                account.cc\
+                Script.cc
+
 
 
@@ -19 +21 @@
 
 noinst_HEADERS = \
-                lunar.h
+                lunar.h\
+                Script.h

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

@@ -35 +35 @@
         static Lunar<Object>::RegType methods[];
 
-        Object(lua_State* L) { }
+        Object(lua_State* L) {callCount = 0; }
         ~Object() { printf("deleted Object (%p)\n", this); }
 
-        int printName(lua_State* L){std::cout<<"Hi i'm object!"<<std::endl; return 0;}
+        int printName(lua_State* L)
+        {
+          printf("Hi i'm object %p ! This is the %i. call.\n",this,callCount);
+          callCount ++;
+          return 0;
+        }
+
+
+      private:
+        int callCount;
+
     };
 
@@ -61 +71 @@
       Lunar<Account>::Register(L);
       Lunar<Object>::Register(L);
-      Object obj(L);
-      Lunar<Object>::insertObject(L,&obj,"Object",false);
 
-
-
+      Object* obj= new Object(L);
+      Lunar<Object>::insertObject(L,obj,"Obj",false);
+      //delete obj;
 
       if(argc>1) lua_dofile(L, argv[1]);

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

@@ -118 +118 @@
         int objectRef = push(L, obj, gc);
 
-        lua_pushliteral(L, "Object" );
+        lua_pushlstring(L, name.c_str(), name.size());
         lua_pushvalue(L, objectRef );
         lua_settable(L, LUA_GLOBALSINDEX );

branches/script_engine/src/lib/script_engine/lunartest.lua

@@ -5 +5 @@
 end
 
---o = Object()
-Object:printName()
+o = Object()
+o:printName()
+
+Obj:printName()
 
 a = Account(100)