Changeset 206 for trunk/src/lua/lua_map_area.cc

Timestamp:

08/19/13 06:37:47 (12 years ago)

Author:

epyon

Message:

• lua - major refactoring of the lua state/table
• lua - added state_wrapper common to state/table
• lua_values - fixed returning of simple types
• lua_area - fixed area.coords and area.edges
• lua_map_area - "fixed" case when object is used as base

File:

• trunk/src/lua/lua_map_area.cc (modified) (3 diffs)

trunk/src/lua/lua_map_area.cc

@@ -9 +9 @@
 #include "nv/lua/lua_area.hh"
 #include "nv/lua/lua_glm.hh"
+#include "nv/lua/lua_values.hh"
 #include "nv/lua/lua_raw.hh"
 
@@ -53 +54 @@
 nv::map_area* nlua_to_map_area( lua_State* L, int index )
 {
-        return *(nv::map_area**)luaL_checkudata( L, index, NLUA_MAP_AREA_METATABLE );
+        if ( lua_type( L, index ) == LUA_TTABLE )
+        {
+                nv::map_area* o = nullptr;
+                if ( lua_istable( L , index ) )
+                {
+                        lua_pushstring( L, "__map_area_ptr" );
+                        lua_rawget( L, index );
+                        if ( lua_isuserdata( L, -1 ) )
+                        {
+                                o = static_cast<nv::map_area*>( lua_touserdata( L, -1 ) );
+                        } 
+                        lua_pop( L, 1 );
+                }
+                return o;
+        }
+        else
+        {
+                return *(nv::map_area**)luaL_checkudata( L, index, NLUA_MAP_AREA_METATABLE );
+        }
 }
 
@@ -83 +102 @@
 {
         nv::map_area* ma = nlua_to_map_area( L, 1 );
-        nlua_push_area( L, ma->get_rectangle() );
+        nv::rectangle r  = ma->get_rectangle();
+        r.lr.x -= 1;
+        r.lr.y -= 1;
+        nlua_push_area( L, r );
         return 1;
 }