LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 08:11:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added love.graphics.getRendererInfo(infotype). Useful for creating more informative error reports and advanced debugging.

Browse Source 
Returned string can be highly system-dependent, so don't rely on its output!

infotype can be "name", "version", "vendor", or "device"
This commit is contained in:
Alex Szpakowski
2013-05-05 16:47:42 -03:00
parent 08d6e658c1
commit 63404f7097
11 changed files with 112 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/joystick/sdl/Joystick.cpp
+3 -5
View File
@@ -182,8 +182,7 @@ float Joystick::getAxis(int index, int axis)
int Joystick::getAxes(lua_State *L)
{
love::luax_assert_argc(L, 1, 1);
int index = (int)lua_tointeger(L, 1) - 1;
int index = luaL_checkint(L, 1) - 1;
if (!verifyJoystick(index))
return 0;
@@ -197,9 +196,8 @@ int Joystick::getAxes(lua_State *L)
int Joystick::getBall(lua_State *L)
{
love::luax_assert_argc(L, 2, 2);
int index = (int)lua_tointeger(L, 1) - 1;
int ball = (int)lua_tointeger(L, 2) - 1;
int index = luaL_checkint(L, 1) - 1;
int ball = luaL_checkint(L, 2) - 1;
if (!verifyJoystick(index))
return 0;
src/modules/joystick/sdl/wrap_Joystick.cpp
+14 -14
View File
@@ -50,43 +50,43 @@ int w_getJoystickCount(lua_State *L)
int w_getName(lua_State *L)
{
int index = luaL_checkint(L, 1)-1;
int index = luaL_checkint(L, 1) - 1;
lua_pushstring(L, instance->getName(index));
return 1;
}
int w_getAxisCount(lua_State *L)
{
int index = luaL_checkint(L, 1)-1;
int index = luaL_checkint(L, 1) - 1;
lua_pushinteger(L, instance->getAxisCount(index));
return 1;
}
int w_getBallCount(lua_State *L)
{
int index = luaL_checkint(L, 1)-1;
int index = luaL_checkint(L, 1) - 1;
lua_pushinteger(L, instance->getBallCount(index));
return 1;
}
int w_getButtonCount(lua_State *L)
{
int index = luaL_checkint(L, 1)-1;
int index = luaL_checkint(L, 1) - 1;
lua_pushinteger(L, instance->getButtonCount(index));
return 1;
}
int w_getHatCount(lua_State *L)
{
int index = luaL_checkint(L, 1)-1;
int index = luaL_checkint(L, 1) - 1;
lua_pushinteger(L, instance->getHatCount(index));
return 1;
}
int w_getAxis(lua_State *L)
{
int index = luaL_checkint(L, 1)-1;
int axis = luaL_checkint(L, 2)-1;
int index = luaL_checkint(L, 1) - 1;
int axis = luaL_checkint(L, 2) - 1;
lua_pushnumber(L, instance->getAxis(index, axis));
return 1;
}
@@ -103,15 +103,15 @@ int w_getBall(lua_State *L)
int w_isDown(lua_State *L)
{
int index = luaL_checkint(L, 1)-1;
unsigned int num = lua_gettop(L);
int index = luaL_checkint(L, 1) - 1;
int num = lua_gettop(L);
int *buttonlist = new int[num];
unsigned int counter = 0;
int counter = 0;
for (int i = 1; i < num; i++)
buttonlist[counter++] = luaL_checkint(L, i + 1) - 1;
for (unsigned int i = 1; i < num; i++)
{
buttonlist[counter++] = (int) luaL_checknumber(L, i+1)-1;
}
buttonlist[counter] = -1;
luax_pushboolean(L, instance->isDown(index, buttonlist));