Merge branch 'release/1.5.0'

Author: rm-code

Screen.lua

@@ -53,6 +53,8 @@ function Screen.new()
 
     function self:keyreleased(key) end
 
+    function self:lowmemory() end
+
     function self:textinput(input) end
 
     function self:mousereleased(x, y, button) end
@@ -65,6 +67,14 @@ function Screen.new()
 
     function self:quit(dquit) end
 
+    function self:touchmoved(id, x, y, pressure) end
+
+    function self:touchpressed(id, x, y, pressure) end
+
+    function self:touchreleased(id, x, y, pressure) end
+
+    function self:wheelmoved(x, y) end
+
     function self:isActive()
         return active;
     end
@@ -84,4 +94,4 @@ return Screen;
 
 --==================================================================================================
 -- Created 02.06.14 - 20:25                                                                        =
---==================================================================================================
+--==================================================================================================

ScreenManager.lua

@@ -21,7 +21,7 @@
 --===============================================================================--
 
 local ScreenManager = {
-    _VERSION     = '1.4.1',
+    _VERSION     = '1.5.0',
     _DESCRIPTION = 'Screen/State Management for the LÖVE framework',
     _URL         = 'https://github.com/rm-code/screenmanager/',
 };
@@ -198,6 +198,13 @@ function ScreenManager.keyreleased(key)
     ScreenManager.peek():keyreleased(key);
 end
 
+---
+-- Callback function triggered when the system is running out of memory on mobile devices.
+--
+function ScreenManager.lowmemory()
+    ScreenManager.peek():lowmemory();
+end
+
 ---
 -- Reroute the textinput callback to the currently active screen.
 -- @param input
@@ -253,6 +260,47 @@ function ScreenManager.quit(dquit)
     ScreenManager.peek():quit(dquit);
 end
 
+---
+-- Callback function triggered when a touch press moves inside the touch screen.
+-- @param id - The identifier for the touch press.
+-- @param x - The x-axis position of the touch press inside the window, in pixels.
+-- @param y - The y-axis position of the touch press inside the window, in pixels.
+-- @param pressure - The amount of pressure being applied. Most touch screens aren't pressure sensitive, in which case the pressure will be 1.
+--
+function ScreenManager.touchmoved(id, x, y, pressure)
+    ScreenManager.peek():touchmoved(id, x, y, pressure);
+end
+
+---
+-- Callback function triggered when the touch screen is touched.
+-- @param id - The identifier for the touch press.
+-- @param x - The x-axis position of the touch press inside the window, in pixels.
+-- @param y - The y-axis position of the touch press inside the window, in pixels.
+-- @param pressure - The amount of pressure being applied. Most touch screens aren't pressure sensitive, in which case the pressure will be 1.
+--
+function ScreenManager.touchpressed(id, x, y, pressure)
+    ScreenManager.peek():touchpressed(id, x, y, pressure);
+end
+
+---
+-- Callback function triggered when the touch screen stops being touched.
+-- @param id - The identifier for the touch press.
+-- @param x - The x-axis position of the touch press inside the window, in pixels.
+-- @param y - The y-axis position of the touch press inside the window, in pixels.
+-- @param pressure - The amount of pressure being applied. Most touch screens aren't pressure sensitive, in which case the pressure will be 1.
+--
+function ScreenManager.touchreleased(id, x, y, pressure)
+    ScreenManager.peek():touchreleased(id, x, y, pressure);
+end
+
+---
+-- Callback function triggered when the mouse wheel is moved.
+-- @param x - Amount of horizontal mouse wheel movement. Positive values indicate movement to the right.
+-- @param y - Amount of vertical mouse wheel movement. Positive values indicate upward movement.
+function ScreenManager.wheelmoved(x, y)
+    ScreenManager.peek():wheelmoved(x, y);
+end
+
 -- ------------------------------------------------
 -- Return Module
 -- ------------------------------------------------
@@ -261,4 +309,4 @@ return ScreenManager;
 
 --==================================================================================================
 -- Created 02.06.14 - 17:30                                                                        =
---==================================================================================================
+--==================================================================================================