mirror of
https://github.com/love2d/love.git
synced 2026-08-17 19:23:38 +02:00
Expose love.event.poll_i
Now love.event.poll just returns love.event.poll_i, instead of returning a new c function every call. This means love no longer creates garbage each frame (with an empty project). See pull request #81 for details, and an alternative fix. Thanks @bjornbytes for the pull request, and for finding this issue. Note: in the pull request I also mentioned love.filesystem.lines/File:lines. I haven't "fixed" those since they use actual closures. --HG-- branch : minor
This commit is contained in:
@@ -25,6 +25,11 @@
|
|||||||
|
|
||||||
#include "sdl/Event.h"
|
#include "sdl/Event.h"
|
||||||
|
|
||||||
|
// Shove the wrap_Event.lua code directly into a raw string literal.
|
||||||
|
static const char event_lua[] =
|
||||||
|
#include "wrap_Event.lua"
|
||||||
|
;
|
||||||
|
|
||||||
namespace love
|
namespace love
|
||||||
{
|
{
|
||||||
namespace event
|
namespace event
|
||||||
@@ -47,12 +52,6 @@ static int w_poll_i(lua_State *L)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int w_poll(lua_State *L)
|
|
||||||
{
|
|
||||||
lua_pushcclosure(L, &w_poll_i, 0);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
int w_pump(lua_State *L)
|
int w_pump(lua_State *L)
|
||||||
{
|
{
|
||||||
luax_catchexcept(L, [&]() { instance()->pump(); });
|
luax_catchexcept(L, [&]() { instance()->pump(); });
|
||||||
@@ -107,7 +106,7 @@ int w_quit(lua_State *L)
|
|||||||
static const luaL_Reg functions[] =
|
static const luaL_Reg functions[] =
|
||||||
{
|
{
|
||||||
{ "pump", w_pump },
|
{ "pump", w_pump },
|
||||||
{ "poll", w_poll },
|
{ "poll_i", w_poll_i },
|
||||||
{ "wait", w_wait },
|
{ "wait", w_wait },
|
||||||
{ "push", w_push },
|
{ "push", w_push },
|
||||||
{ "clear", w_clear },
|
{ "clear", w_clear },
|
||||||
@@ -134,6 +133,11 @@ extern "C" int luaopen_love_event(lua_State *L)
|
|||||||
|
|
||||||
int ret = luax_register_module(L, w);
|
int ret = luax_register_module(L, w);
|
||||||
|
|
||||||
|
if (luaL_loadbuffer(L, (const char *)event_lua, sizeof(event_lua), "wrap_Event.lua") == 0)
|
||||||
|
lua_call(L, 0, 0);
|
||||||
|
else
|
||||||
|
lua_error(L);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
R"luastring"--(
|
||||||
|
-- DO NOT REMOVE THE ABOVE LINE. It is used to load this file as a C++ string.
|
||||||
|
-- There is a matching delimiter at the bottom of the file.
|
||||||
|
|
||||||
|
--[[
|
||||||
|
Copyright (c) 2006-2017 LOVE Development Team
|
||||||
|
|
||||||
|
This software is provided 'as-is', without any express or implied
|
||||||
|
warranty. In no event will the authors be held liable for any damages
|
||||||
|
arising from the use of this software.
|
||||||
|
|
||||||
|
Permission is granted to anyone to use this software for any purpose,
|
||||||
|
including commercial applications, and to alter it and redistribute it
|
||||||
|
freely, subject to the following restrictions:
|
||||||
|
|
||||||
|
1. The origin of this software must not be misrepresented; you must not
|
||||||
|
claim that you wrote the original software. If you use this software
|
||||||
|
in a product, an acknowledgment in the product documentation would be
|
||||||
|
appreciated but is not required.
|
||||||
|
2. Altered source versions must be plainly marked as such, and must not be
|
||||||
|
misrepresented as being the original software.
|
||||||
|
3. This notice may not be removed or altered from any source distribution.
|
||||||
|
--]]
|
||||||
|
|
||||||
|
function love.event.poll()
|
||||||
|
return love.event.poll_i
|
||||||
|
end
|
||||||
|
|
||||||
|
-- DO NOT REMOVE THE NEXT LINE. It is used to load this file as a C++ string.
|
||||||
|
--)luastring"--"
|
||||||
Reference in New Issue
Block a user