Changeset 454 for trunk/src/lua

Timestamp:

07/31/15 20:25:22 (10 years ago)

Author:

epyon

Message:

• math library work
• glm only referenced in math/common.hh
• still a lot work to do, but its WURF

Location:

trunk/src/lua

Files:

• lua_area.cc (modified) (2 diffs)
• lua_values.cc (modified) (1 diff)

trunk/src/lua/lua_area.cc

@@ -255 +255 @@
         nv::rectangle* a = to_parea( L, 1 );
         nv::ivec2*     c = to_pcoord( L, 2 );
-        *c = glm::clamp( *c, a->ul, a->lr );
+        *c = nv::math::clamp( *c, a->ul, a->lr );
         return 0;
 }
@@ -263 +263 @@
         nv::rectangle* a = to_parea( L, 1 );
         nv::ivec2*     c = to_pcoord( L, 2 );
-        push_coord( L, glm::clamp( *c, a->ul, a->lr ) );
+        push_coord( L, nv::math::clamp( *c, a->ul, a->lr ) );
         return 0;
 }

trunk/src/lua/lua_values.cc

@@ -25 +25 @@
 void* nv::lua::detail::raw_check_userdata( lua_State *L, int index, const char* metatable )
 {
-        return luaL_checkudata( L, index, metatable );
+        return luaL_testudata( L, index, metatable );
 }