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

Re-added love.graphics.getWidth/getHeight

Browse Source
This commit is contained in:
Alex Szpakowski
2013-05-28 20:23:31 -03:00
parent 252aa114a7
commit 6a76e082e4
5 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes.txt
+1 -1
View File
@@ -28,7 +28,7 @@ LOVE 0.9.0 [Baby Inspector]
* Added SpriteBatch:getCount and SpriteBatch:getBufferSize.
* Added ParticleSystem:emit.
* Added many ParticleSystem getter methods.
* Added DXT-compressed texture support via love.image.newCompressedData.
* Added DXT compressed texture support via love.image.newCompressedData.
* Added love.image.isCompressed and Image:isCompressed.
* Added Image/Canvas/ImageData:getDimensions.
* Added anisotropic filtering support for Images, Canvases, and Fonts.
src/modules/graphics/opengl/wrap_Graphics.cpp
+22
View File
@@ -62,6 +62,25 @@ int w_isCreated(lua_State *L)
return 1;
}
int w_getWidth(lua_State *L)
{
lua_pushinteger(L, instance->getWidth());
return 1;
}
int w_getHeight(lua_State *L)
{
lua_pushinteger(L, instance->getHeight());
return 1;
}
int w_getDimensions(lua_State *L)
{
lua_pushinteger(L, instance->getWidth());
lua_pushinteger(L, instance->getHeight());
return 2;
}
int w_setScissor(lua_State *L)
{
if (lua_gettop(L) == 0)
@@ -1514,6 +1533,9 @@ static const luaL_Reg functions[] =
{ "printf", w_printf },
{ "isCreated", w_isCreated },
{ "getWidth", w_getWidth },
{ "getHeight", w_getHeight },
{ "getDimensions", w_getDimensions },
{ "setScissor", w_setScissor },
{ "getScissor", w_getScissor },
src/modules/graphics/opengl/wrap_Graphics.h
+3
View File
@@ -42,6 +42,9 @@ int w_reset(lua_State *L);
int w_clear(lua_State *L);
int w_present(lua_State *L);
int w_isCreated(lua_State *L);
int w_getWidth(lua_State *L);
int w_getHeight(lua_State *L);
int w_getDimensions(lua_State *L);
int w_setScissor(lua_State *L);
int w_getScissor(lua_State *L);
int w_setStencil(lua_State *L);
src/scripts/boot.lua
+2 -2
View File
@@ -775,7 +775,7 @@ function love.errhand(msg)
local function draw()
love.graphics.clear()
love.graphics.printf(p, 70, 70, love.window.getWidth() - 70)
love.graphics.printf(p, 70, 70, love.graphics.getWidth() - 70)
love.graphics.present()
end
@@ -826,7 +826,7 @@ function love.releaseerrhand(msg)
local function draw()
love.graphics.clear()
love.graphics.printf(p, 70, 70, love.window.getWidth() - 70)
love.graphics.printf(p, 70, 70, love.graphics.getWidth() - 70)
love.graphics.present()
end
src/scripts/boot.lua.h
+4 -4
View File
@@ -1834,8 +1834,8 @@ const unsigned char boot_lua[] =
0x65, 0x61, 0x72, 0x28, 0x29, 0x0a,
0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x70, 0x72,
0x69, 0x6e, 0x74, 0x66, 0x28, 0x70, 0x2c, 0x20, 0x37, 0x30, 0x2c, 0x20, 0x37, 0x30, 0x2c, 0x20, 0x6c, 0x6f,
0x76, 0x65, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2e, 0x67, 0x65, 0x74, 0x57, 0x69, 0x64, 0x74, 0x68,
0x28, 0x29, 0x20, 0x2d, 0x20, 0x37, 0x30, 0x29, 0x0a,
0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x67, 0x65, 0x74, 0x57, 0x69, 0x64,
0x74, 0x68, 0x28, 0x29, 0x20, 0x2d, 0x20, 0x37, 0x30, 0x29, 0x0a,
0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x70, 0x72,
0x65, 0x73, 0x65, 0x6e, 0x74, 0x28, 0x29, 0x0a,
0x09, 0x65, 0x6e, 0x64, 0x0a,
@@ -1915,8 +1915,8 @@ const unsigned char boot_lua[] =
0x65, 0x61, 0x72, 0x28, 0x29, 0x0a,
0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x70, 0x72,
0x69, 0x6e, 0x74, 0x66, 0x28, 0x70, 0x2c, 0x20, 0x37, 0x30, 0x2c, 0x20, 0x37, 0x30, 0x2c, 0x20, 0x6c, 0x6f,
0x76, 0x65, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2e, 0x67, 0x65, 0x74, 0x57, 0x69, 0x64, 0x74, 0x68,
0x28, 0x29, 0x20, 0x2d, 0x20, 0x37, 0x30, 0x29, 0x0a,
0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x67, 0x65, 0x74, 0x57, 0x69, 0x64,
0x74, 0x68, 0x28, 0x29, 0x20, 0x2d, 0x20, 0x37, 0x30, 0x29, 0x0a,
0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x70, 0x72,
0x65, 0x73, 0x65, 0x6e, 0x74, 0x28, 0x29, 0x0a,
0x09, 0x65, 0x6e, 0x64, 0x0a,