Changeset 7808 in orxonox.OLD for branches

Timestamp:

May 24, 2006, 3:25:09 PM (18 years ago)

Author:

snellen

Message:

object pointer is now found

Location:

branches/script_engine/src/lib/script_engine

Files:

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

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

@@ -37 +37 @@
     return 1;
   }
+
 protected:
   double m_balance;
@@ -93 +94 @@
   lua_State* L = lua_open();
   lua_baselibopen(L);
-
   Luna<Account>::Register(L);
-  Luna<Euclid>::Register(L);
+ // Luna<Euclid>::Register(L);
 
   lua_dofile(L, argv[1]);
+
 
   lua_close(L);

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

@@ -2 +2 @@
 -- Luna Account example
 --
+
+print("testoutput from lua")
 local a = Account{balance=100}
 a:deposit(50.00)

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

@@ -28 +28 @@
       lua_setglobal(L, T::className);
 
+
      /* if (otag == 0) {
         otag = lua_newtag(L);
@@ -41 +42 @@
    static int thunk(lua_State* L) {
       /* stack = closure(-1), [args...], 'self' table(1) */
-      int i = static_cast<int>(lua_tonumber(L,-1));
-      lua_pushnumber(L, 0); /* userdata object at index 0 */
-      lua_gettable(L, 1);
-      T* obj = static_cast<T*>(lua_touserdata(L,-1));
+      //int i = static_cast<int>(lua_tonumber(L,-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 */
+
+        printf("FUNCTION:: %d\n", i );
+        printf("OBJECT %p\n", obj);
+
+
       return (obj->*(T::Register[i].mfunc))(L);
    }
@@ -64 +72 @@
    static int constructor(lua_State* L) {
       T* obj= new T(L); /* new T */
+       printf("OBJECT CREATED %p\n", obj);
+
       return registerObject(obj, L);
    }
@@ -82 +92 @@
       lua_newtable(L); /* new table object */
       int  objRef = luaL_ref (L, LUA_REGISTRYINDEX);
-std::cout<<"test"<<std::endl;
+
+      //lua_pushnumber(L, 0); /* userdata obj at index 0 */
+      lua_rawgeti(L, LUA_REGISTRYINDEX, objRef);
+      lua_pushlightuserdata(L, obj);
+      lua_rawseti(L,-2,0);
+      //lua_pushusertag(L, obj, otag); /* have gc call tm */
+      //lua_settable(L, -3);
+      //std::cout<<"test"<<std::endl;
+
+    /* Set up garbage collection */
       if(lua_getmetatable(L, objRef) != 0)
        {
-        std::cout<<"test"<<std::endl;
+        //std::cout<<"test"<<std::endl;
         lua_pushstring (L, "__gc");
         lua_pushcfunction(L, &Luna<T>::gc_obj);
-        lua_rawset(L,-3);
-//        lua_setfield(L, objRef, "__gc");
+        lua_settable(L,-3);
        }
-      
-      lua_pushnumber(L, 0); /* userdata obj at index 0 */
-
-//      lua_pushusertag(L, obj, otag); /* have gc call tm */
-
-      lua_settable(L, -3);
-      
+    
+      lua_rawgeti (L, LUA_REGISTRYINDEX, objRef);
       /* register the member functions */
       for (int i=0; T::Register[i].name; i++) {
+          
          lua_pushstring(L, T::Register[i].name);
          lua_pushnumber(L, i);
          lua_pushcclosure(L, &Luna<T>::thunk, 1);
-         lua_settable(L, -3);
+         lua_settable(L,-3);
       }
       return 1; /* return the table object */