Changeset 7815 in orxonox.OLD

Timestamp:

May 24, 2006, 4:49:35 PM (18 years ago)

Author:

snellen

Message:

object pointer is now found

Location:

branches/script_engine/src/lib/script_engine

Files:

• account.cc (modified) (1 diff)
• account.lua (modified) (1 diff)
• luna.h (modified) (4 diffs)

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

@@ -22 +22 @@
   int deposit(lua_State* L)
   {
+    std::cout<<"deposit called"<<std::endl;
     m_balance += lua_tonumber(L, -1);
     lua_pop(L, 1);

branches/script_engine/src/lib/script_engine/account.lua

@@ -5 +5 @@
 print("testoutput from lua")
 local a = Account{balance=100}
+a:withdraw(25.00)
 a:deposit(50.00)
-a:withdraw(25.00)
 print("Account balance = $"..a:balance())
 

branches/script_engine/src/lib/script_engine/luna.h

@@ -43 +43 @@
       /* stack = closure(-1), [args...], 'self' table(1) */
       //int i = static_cast<int>(lua_tonumber(L,-1));
-      int i = lua_upvalueindex (1);
+ 
+       int i = lua_upvalueindex (1);
+
       //lua_pushnumber(L, 0); /* userdata object at index 0 */
       //lua_gettable(L, 1);
       lua_rawgeti (L, 1, 0);
       T* obj = (T*)(lua_touserdata(L,-1));
-      lua_pop(L, 2); /* pop closure value and obj */
+      lua_pop(L, 1); /* pop closure value and obj */
 
         printf("FUNCTION:: %d\n", i );
@@ -88 +90 @@
 
  private:
+
    static int registerObject(T* obj, lua_State* L)
     {
       lua_newtable(L); /* new table object */
-      int  objRef = luaL_ref (L, LUA_REGISTRYINDEX);
+      //int  objRef = luaL_ref (L, LUA_REGISTRYINDEX);
 
       //lua_pushnumber(L, 0); /* userdata obj at index 0 */
-      lua_rawgeti(L, LUA_REGISTRYINDEX, objRef);
+      //lua_rawgeti(L, LUA_REGISTRYINDEX, objRef);
       lua_pushlightuserdata(L, obj);
       lua_rawseti(L,-2,0);
@@ -101 +104 @@
       //std::cout<<"test"<<std::endl;
 
-    /* Set up garbage collection */
+    /* Set up garbage collection 
       if(lua_getmetatable(L, objRef) != 0)
        {
@@ -109 +112 @@
         lua_settable(L,-3);
        }
-    
-      lua_rawgeti (L, LUA_REGISTRYINDEX, objRef);
+    */
+      //lua_rawgeti (L, LUA_REGISTRYINDEX, objRef);
       /* register the member functions */
-      for (int i=0; T::Register[i].name; i++) {
-          
+      for (int i=0; T::Register[i].name; i++) 
+      {
          lua_pushstring(L, T::Register[i].name);
          lua_pushnumber(L, i);