WallyHackenslacker/lovedos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed getEvents() -> poll() on love.mouse/keyboard

Browse Source 
Rolled love.mouse.update() into love.mouse.poll()
This commit is contained in:
rxi
2016-09-24 11:02:49 +01:00
parent c8453c6f60
commit 09e5bb0628
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/keyboard.c
View File

@@ -100,7 +100,7 @@ int l_keyboard_isDown(lua_State *L) {
} }
int l_keyboard_getEvents(lua_State *L) { int l_keyboard_poll(lua_State *L) {
lua_newtable(L); lua_newtable(L);
int idx = 1; int idx = 1;
while (keyboard_events.readi != keyboard_events.writei) { while (keyboard_events.readi != keyboard_events.writei) {
@@ -120,7 +120,7 @@ int l_keyboard_getEvents(lua_State *L) {
int luaopen_keyboard(lua_State *L) { int luaopen_keyboard(lua_State *L) {
luaL_Reg reg[] = { luaL_Reg reg[] = {
{ "getEvents", l_keyboard_getEvents }, { "poll", l_keyboard_poll },
{ "isDown", l_keyboard_isDown }, { "isDown", l_keyboard_isDown },
{ 0, 0 }, { 0, 0 },
}; };

5
src/main.c
View File

@@ -65,8 +65,7 @@ int main(void) {
"love.timer.step()\n" "love.timer.step()\n"
"while true do\n" "while true do\n"
/* Update mouse and handle mouse events */ /* Update mouse and handle mouse events */
"love.mouse.update()\n" "for _, e in ipairs(love.mouse.poll()) do\n"
"for _, e in ipairs(love.mouse.getEvents()) do\n"
"if e.type == 'motion' then\n" "if e.type == 'motion' then\n"
"if love.mousemoved then love.mousemoved(e.x, e.y, e.dx, e.dy) end\n" "if love.mousemoved then love.mousemoved(e.x, e.y, e.dx, e.dy) end\n"
"elseif e.type == 'pressed' then\n" "elseif e.type == 'pressed' then\n"
@@ -76,7 +75,7 @@ int main(void) {
"end\n" "end\n"
"end\n" "end\n"
/* Keyboard Events */ /* Keyboard Events */
"for _, e in ipairs(love.keyboard.getEvents()) do\n" "for _, e in ipairs(love.keyboard.poll()) do\n"
"if e.type == 'down' then\n" "if e.type == 'down' then\n"
"if love.keypressed then love.keypressed(e.code) end\n" "if love.keypressed then love.keypressed(e.code) end\n"
"else\n" "else\n"

9
src/mouse.c
View File

@@ -110,13 +110,9 @@ int l_mouse_isDown(lua_State *L) {
} }
int l_mouse_update(lua_State *L) { int l_mouse_poll(lua_State *L) {
mouse_update(); mouse_update();
return 0;
}
int l_mouse_getEvents(lua_State *L) {
int i; int i;
int n = 1; int n = 1;
lua_newtable(L); lua_newtable(L);
@@ -159,8 +155,7 @@ int l_mouse_getEvents(lua_State *L) {
int luaopen_mouse(lua_State *L) { int luaopen_mouse(lua_State *L) {
luaL_Reg reg[] = { luaL_Reg reg[] = {
{ "update", l_mouse_update }, { "poll", l_mouse_poll },
{ "getEvents", l_mouse_getEvents },
{ "getPosition", l_mouse_getPosition }, { "getPosition", l_mouse_getPosition },
{ "getX", l_mouse_getX }, { "getX", l_mouse_getX },
{ "getY", l_mouse_getY }, { "getY", l_mouse_getY },