Changeset 172 for trunk

Timestamp:

07/25/13 14:37:24 (12 years ago)

Author:

epyon

Message:

• sdl - missing 2.0 sdl_functions
• lua - compat implementation of lua_upvalueindex
• position - rectangle single argument constructor made explicit
• gl_window - fix for SDL 2.0 ascii code of key press
• lua/glm - coord as a separate class (behaves like ivec2)

Location:

trunk

Files:

• nv/lib/detail/sdl_functions_20.inc (modified) (1 diff)
• nv/lib/lua.hh (modified) (1 diff)
• nv/position.hh (modified) (2 diffs)
• src/gl/gl_window.cc (modified) (1 diff)
• src/lib/lua.cc (modified) (3 diffs)
• src/lua/lua_glm.cc (modified) (1 diff)

trunk/nv/lib/detail/sdl_functions_20.inc

@@ -302 +302 @@
 NV_SDL_FUN( int , SDL_GetNumTouchFingers, (SDL_TouchID touchID) );
 NV_SDL_FUN( SDL_Finger * , SDL_GetTouchFinger, (SDL_TouchID touchID, int index) ); 
+
+NV_SDL_FUN( char *, SDL_getenv, (const char *name) );
+NV_SDL_FUN( int , SDL_setenv, (const char *name, const char *value, int overwrite) );
+NV_SDL_FUN( int , SDL_isdigit, (int x) );
+NV_SDL_FUN( int , SDL_isspace, (int x) );
+NV_SDL_FUN( int , SDL_toupper, (int x) );
+NV_SDL_FUN( int , SDL_tolower, (int x) ); 

trunk/nv/lib/lua.hh

@@ -363 +363 @@
 
 extern const lua_Number* (*lua_version) (lua_State *L);
+extern int LUA_UPVALUEINDEX;
 extern int LUA_REGISTRYINDEX;
 extern int LUA_VERSION_NUM;
+#define lua_upvalueindex(i)    (LUA_UPVALUEINDEX-(i))
 #define lua_tounsigned(L,idx) (lua_Number)lua_tointeger(L,idx)
 #define lua_pushunsigned(L,u) lua_pushinteger(L,(lua_Integer)u)

trunk/nv/position.hh

@@ -41 +41 @@
                  * @param p The position to assign the rectangle to.
                  */
-                rectangle( position p ) : ul(p), lr(p) {}
+                explicit rectangle( position p ) : ul(p), lr(p) {}
                 
                 /**
@@ -152 +152 @@
 
                 /**
+                 * Gets the area of the rectangle.
+                 *
+                 * @returns The area of the rectangle, including the edge
+                 */
+                value_type get_enclosed_area() const { return (lr.y - ul.y + 1) * (lr.x - ul.x + 1); }
+
+                /**
                  * Checks to see if the rectangle is backwards.
                  *

trunk/src/gl/gl_window.cc

@@ -28 +28 @@
         {
                 kevent.key.ascii = static_cast<char8>( ucode );
+#if NV_SDL_VERSION == NV_SDL_20
+                if (ucode >= 'a' && ucode <= 'z')
+                {
+                        int shifted = !!(ke.keysym.mod & KMOD_SHIFT);
+                        int capslock = !!(ke.keysym.mod & KMOD_CAPS);
+                        if ((shifted ^ capslock) != 0) {
+                                kevent.key.ascii = SDL_toupper(ucode);
+                        }
+                }
+#endif
         }
 

trunk/src/lib/lua.cc

@@ -45 +45 @@
 #       include <nv/lib/detail/lua_functions_compat.inc>
 #       undef NV_LUA_COMPAT_FUN
+int LUA_UPVALUEINDEX  = 0;
 int LUA_REGISTRYINDEX = 0;
 int LUA_VERSION_NUM   = 0;
@@ -266 +267 @@
                 NV_LUA_LOAD( luaL_getsubtable );
 
+                LUA_UPVALUEINDEX  = LUA_REGISTRYINDEX_52;
                 LUA_REGISTRYINDEX = LUA_REGISTRYINDEX_52;
                 LUA_VERSION_NUM   = 502;
@@ -292 +294 @@
                 NV_LUA_LOAD( lua_equal );
                 lua_compare       = lua_compare_51;
+                LUA_UPVALUEINDEX  = LUA_GLOBALSINDEX_51;
                 LUA_REGISTRYINDEX = LUA_REGISTRYINDEX_51;
                 LUA_VERSION_NUM   = 501;

trunk/src/lua/lua_glm.cc

@@ -340 +340 @@
         int stack = lua_gettop( L );
 
+        luaL_requiref(L, "coord", luaopen_vec<nv::ivec2>, 1);
         luaL_requiref(L, "ivec2", luaopen_vec<nv::ivec2>, 1);
         luaL_requiref(L, "ivec3", luaopen_vec<nv::ivec3>, 1);