From 78dd8bc5476b0adb20a2b521619b31e255b8394b Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Tue, 24 Mar 2015 20:45:21 -0300 Subject: [PATCH] Added love.touch.getPressure(touchid). Not useful on most touch-capable devices, but I do expect Apple's Force Touch to make it into iPhones in the near future. --- src/modules/event/sdl/Event.cpp | 2 ++ src/modules/touch/Touch.h | 6 ++++++ src/modules/touch/sdl/Touch.cpp | 9 +++++++++ src/modules/touch/sdl/Touch.h | 7 ++++--- src/modules/touch/wrap_Touch.cpp | 24 +++++++++++++++++++----- src/modules/touch/wrap_Touch.h | 3 +++ src/scripts/boot.lua | 16 ++++++++-------- src/scripts/boot.lua.h | 21 +++++++++++---------- 8 files changed, 62 insertions(+), 26 deletions(-) diff --git a/src/modules/event/sdl/Event.cpp b/src/modules/event/sdl/Event.cpp index cdcc5615b..936d7afe6 100644 --- a/src/modules/event/sdl/Event.cpp +++ b/src/modules/event/sdl/Event.cpp @@ -277,6 +277,7 @@ Message *Event::convert(const SDL_Event &e) const touchinfo.y = e.tfinger.y; touchinfo.dx = e.tfinger.dx; touchinfo.dy = e.tfinger.dy; + touchinfo.pressure = e.tfinger.pressure; #ifdef LOVE_LINUX // FIXME: hacky workaround for SDL not normalizing touch coordinates in @@ -310,6 +311,7 @@ Message *Event::convert(const SDL_Event &e) const vargs.push_back(new Variant(touchinfo.y)); vargs.push_back(new Variant(touchinfo.dx)); vargs.push_back(new Variant(touchinfo.dy)); + vargs.push_back(new Variant(touchinfo.pressure)); if (e.type == SDL_FINGERDOWN) txt = "touchpressed"; diff --git a/src/modules/touch/Touch.h b/src/modules/touch/Touch.h index c735e505e..433059243 100644 --- a/src/modules/touch/Touch.h +++ b/src/modules/touch/Touch.h @@ -46,6 +46,7 @@ public: double y; // Position in pixels along the y-axis. double dx; // Amount in pixels moved along the x-axis. double dy; // Amount in pixels moved along the y-axis. + double pressure; }; virtual ~Touch() {} @@ -63,6 +64,11 @@ public: **/ virtual void getPosition(int64 id, double &x, double &y) const = 0; + /** + * Gets the pressure of a specific touch, using its ID. + **/ + virtual double getPressure(int64 id) const = 0; + }; // Touch } // touch diff --git a/src/modules/touch/sdl/Touch.cpp b/src/modules/touch/sdl/Touch.cpp index 0185c3225..5330f51d8 100644 --- a/src/modules/touch/sdl/Touch.cpp +++ b/src/modules/touch/sdl/Touch.cpp @@ -51,6 +51,15 @@ void Touch::getPosition(int64 id, double &x, double &y) const y = it->second.y; } +double Touch::getPressure(int64 id) const +{ + const auto it = touches.find(id); + if (it == touches.end()) + throw love::Exception("Invalid active touch ID: %d", id); + + return it->second.pressure; +} + const char *Touch::getName() const { return "love.touch.sdl"; diff --git a/src/modules/touch/sdl/Touch.h b/src/modules/touch/sdl/Touch.h index c7caca03e..56d862a57 100644 --- a/src/modules/touch/sdl/Touch.h +++ b/src/modules/touch/sdl/Touch.h @@ -43,11 +43,12 @@ public: virtual ~Touch() {} - virtual std::vector getIDs() const; - virtual void getPosition(int64 id, double &x, double &y) const; + std::vector getIDs() const override; + void getPosition(int64 id, double &x, double &y) const override; + double getPressure(int64 id) const override; // Implements Module. - virtual const char *getName() const; + const char *getName() const override; // SDL has functions to query the state of touch presses, but unfortunately // they are updated on a different thread in some backends, which causes diff --git a/src/modules/touch/wrap_Touch.cpp b/src/modules/touch/wrap_Touch.cpp index ebccb0f2b..e8e8900b2 100644 --- a/src/modules/touch/wrap_Touch.cpp +++ b/src/modules/touch/wrap_Touch.cpp @@ -19,7 +19,6 @@ **/ #include "common/config.h" -#include "common/int.h" // LOVE #include "wrap_Touch.h" @@ -33,6 +32,14 @@ namespace touch #define instance() (Module::getInstance(Module::M_TOUCH)) +int64 luax_checktouchid(lua_State *L, int idx) +{ + if (!lua_islightuserdata(L, idx)) + return luax_typerror(L, idx, "touch id"); + + return (int64) (intptr_t) lua_touserdata(L, 1); +} + int w_getIDs(lua_State *L) { std::vector ids = instance()->getIDs(); @@ -55,10 +62,7 @@ int w_getIDs(lua_State *L) int w_getPosition(lua_State *L) { - if (!lua_islightuserdata(L, 1)) - return luax_typerror(L, 1, "touch id"); - - int64 id = (int64) (intptr_t) lua_touserdata(L, 1); + int64 id = luax_checktouchid(L, 1); double x = 0; double y = 0; @@ -70,10 +74,20 @@ int w_getPosition(lua_State *L) return 2; } +int w_getPressure(lua_State *L) +{ + int64 id = luax_checktouchid(L, 1); + double pressure = 0.0; + luax_catchexcept(L, [&](){ pressure = instance()->getPressure(id); }); + lua_pushnumber(L, pressure); + return 1; +} + static const luaL_Reg functions[] = { { "getIDs", w_getIDs }, { "getPosition", w_getPosition }, + { "getPressure", w_getPressure }, { 0, 0 } }; diff --git a/src/modules/touch/wrap_Touch.h b/src/modules/touch/wrap_Touch.h index 7d3b4f32c..6b715d2eb 100644 --- a/src/modules/touch/wrap_Touch.h +++ b/src/modules/touch/wrap_Touch.h @@ -24,14 +24,17 @@ // LOVE #include "Touch.h" #include "common/runtime.h" +#include "common/int.h" namespace love { namespace touch { +int64 luax_checktouchid(lua_State *L, int idx); int w_getIDs(lua_State *L); int w_getPosition(lua_State *L); +int w_getPressure(lua_State *L); extern "C" LOVE_EXPORT int luaopen_love_touch(lua_State *L); } // touch diff --git a/src/scripts/boot.lua b/src/scripts/boot.lua index 80342f394..812df720a 100644 --- a/src/scripts/boot.lua +++ b/src/scripts/boot.lua @@ -178,14 +178,14 @@ function love.createhandlers() wheelmoved = function (x,y) if love.wheelmoved then return love.wheelmoved(x,y) end end, - touchpressed = function (id,x,y,dx,dy) - if love.touchpressed then return love.touchpressed(id,x,y,dx,dy) end + touchpressed = function (id,x,y,dx,dy,p) + if love.touchpressed then return love.touchpressed(id,x,y,dx,dy,p) end end, - touchreleased = function (id,x,y,dx,dy) - if love.touchreleased then return love.touchreleased(id,x,y,dx,dy) end + touchreleased = function (id,x,y,dx,dy,p) + if love.touchreleased then return love.touchreleased(id,x,y,dx,dy,p) end end, - touchmoved = function (id,x,y,dx,dy) - if love.touchmoved then return love.touchmoved(id,x,y,dx,dy) end + touchmoved = function (id,x,y,dx,dy,p) + if love.touchmoved then return love.touchmoved(id,x,y,dx,dy,p) end end, joystickpressed = function (j,b) if love.joystickpressed then return love.joystickpressed(j,b) end @@ -504,13 +504,13 @@ function love.run() -- Process events. if love.event then love.event.pump() - for name, a,b,c,d,e in love.event.poll() do + for name, a,b,c,d,e,f in love.event.poll() do if name == "quit" then if not love.quit or not love.quit() then return end end - love.handlers[name](a,b,c,d,e) + love.handlers[name](a,b,c,d,e,f) end end diff --git a/src/scripts/boot.lua.h b/src/scripts/boot.lua.h index ff675450c..53fb1a068 100644 --- a/src/scripts/boot.lua.h +++ b/src/scripts/boot.lua.h @@ -316,28 +316,29 @@ const unsigned char boot_lua[] = 0x09, 0x09, 0x65, 0x6e, 0x64, 0x2c, 0x0a, 0x09, 0x09, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x28, 0x69, 0x64, 0x2c, 0x78, 0x2c, 0x79, 0x2c, 0x64, 0x78, - 0x2c, 0x64, 0x79, 0x29, 0x0a, + 0x2c, 0x64, 0x79, 0x2c, 0x70, 0x29, 0x0a, 0x09, 0x09, 0x09, 0x69, 0x66, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64, 0x28, - 0x69, 0x64, 0x2c, 0x78, 0x2c, 0x79, 0x2c, 0x64, 0x78, 0x2c, 0x64, 0x79, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, + 0x69, 0x64, 0x2c, 0x78, 0x2c, 0x79, 0x2c, 0x64, 0x78, 0x2c, 0x64, 0x79, 0x2c, 0x70, 0x29, 0x20, 0x65, 0x6e, + 0x64, 0x0a, 0x09, 0x09, 0x65, 0x6e, 0x64, 0x2c, 0x0a, 0x09, 0x09, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x28, 0x69, 0x64, 0x2c, 0x78, 0x2c, 0x79, 0x2c, 0x64, - 0x78, 0x2c, 0x64, 0x79, 0x29, 0x0a, + 0x78, 0x2c, 0x64, 0x79, 0x2c, 0x70, 0x29, 0x0a, 0x09, 0x09, 0x09, 0x69, 0x66, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x64, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, - 0x64, 0x28, 0x69, 0x64, 0x2c, 0x78, 0x2c, 0x79, 0x2c, 0x64, 0x78, 0x2c, 0x64, 0x79, 0x29, 0x20, 0x65, 0x6e, - 0x64, 0x0a, + 0x64, 0x28, 0x69, 0x64, 0x2c, 0x78, 0x2c, 0x79, 0x2c, 0x64, 0x78, 0x2c, 0x64, 0x79, 0x2c, 0x70, 0x29, 0x20, + 0x65, 0x6e, 0x64, 0x0a, 0x09, 0x09, 0x65, 0x6e, 0x64, 0x2c, 0x0a, 0x09, 0x09, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x28, 0x69, 0x64, 0x2c, 0x78, 0x2c, 0x79, 0x2c, 0x64, 0x78, 0x2c, 0x64, - 0x79, 0x29, 0x0a, + 0x79, 0x2c, 0x70, 0x29, 0x0a, 0x09, 0x09, 0x09, 0x69, 0x66, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x28, 0x69, 0x64, 0x2c, 0x78, - 0x2c, 0x79, 0x2c, 0x64, 0x78, 0x2c, 0x64, 0x79, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, + 0x2c, 0x79, 0x2c, 0x64, 0x78, 0x2c, 0x64, 0x79, 0x2c, 0x70, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x09, 0x09, 0x65, 0x6e, 0x64, 0x2c, 0x0a, 0x09, 0x09, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x28, 0x6a, 0x2c, 0x62, 0x29, 0x0a, @@ -921,8 +922,8 @@ const unsigned char boot_lua[] = 0x09, 0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x75, 0x6d, 0x70, 0x28, 0x29, 0x0a, 0x09, 0x09, 0x09, 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x20, 0x61, 0x2c, 0x62, 0x2c, 0x63, - 0x2c, 0x64, 0x2c, 0x65, 0x20, 0x69, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x65, 0x76, 0x65, 0x6e, 0x74, - 0x2e, 0x70, 0x6f, 0x6c, 0x6c, 0x28, 0x29, 0x20, 0x64, 0x6f, 0x0a, + 0x2c, 0x64, 0x2c, 0x65, 0x2c, 0x66, 0x20, 0x69, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x65, 0x76, 0x65, + 0x6e, 0x74, 0x2e, 0x70, 0x6f, 0x6c, 0x6c, 0x28, 0x29, 0x20, 0x64, 0x6f, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x69, 0x66, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x71, 0x75, 0x69, 0x74, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x71, @@ -932,7 +933,7 @@ const unsigned char boot_lua[] = 0x09, 0x09, 0x09, 0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x73, 0x5b, - 0x6e, 0x61, 0x6d, 0x65, 0x5d, 0x28, 0x61, 0x2c, 0x62, 0x2c, 0x63, 0x2c, 0x64, 0x2c, 0x65, 0x29, 0x0a, + 0x6e, 0x61, 0x6d, 0x65, 0x5d, 0x28, 0x61, 0x2c, 0x62, 0x2c, 0x63, 0x2c, 0x64, 0x2c, 0x65, 0x2c, 0x66, 0x29, 0x0a, 0x09, 0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a, 0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a, 0x09, 0x09, 0x2d, 0x2d, 0x20, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x20, 0x64, 0x74, 0x2c, 0x20, 0x61, 0x73,