Added flow.until_input_x

Author: Björn Ritzl

examples/flow/flow.script

@@ -3,19 +3,23 @@ local flow = require "ludobits.m.flow"
 function init(self)
 	msg.post(".", "acquire_input_focus")
 	flow(function()
-		print("1 Flow has started")
+		print("Flow has started")
 
 		-- wait until 0.5 seconds have elapsed
 		flow.delay(0.5)
-		print("2 flow.delay() half a second has elapsed")
+		print("flow.delay() half a second has elapsed")
 
 		-- wait until 10 updates/frames have been registered for this flow
 		flow.frames(10)
-		print("3 flow.frames() 10 frames have elapsed")
+		print("flow.frames() 10 frames have elapsed")
+		
+		print("Waiting for input")
+		local action_id, action = flow.until_input_released(hash("touch"))
+		print("flow.until_input_released()", action_id)
 
 		-- load a collection proxy and wait for it to become loaded
 		flow.load("#a_proxy")
-		print("4 flow.load() a_proxy loaded")
+		print("flow.load() a_proxy loaded")
 
 		-- the running flow will wait for this flow to finish
 		flow(function()
@@ -25,66 +29,66 @@ function init(self)
 			flow.until_true(function()
 				return go.get_position().x == 500
 			end)
-			print("5 flow.until_true() go.animate() done")
+			print("flow.until_true() go.animate() done")
 
 			-- flows can be nested to any depth
 			flow(function()
 				flow.delay(1)
 
 				flow.load("#b_proxy")
-				print("6 flow.load() b_proxy loaded")
+				print("flow.load() b_proxy loaded")
 			end)
 
 			flow.go_animate(".", "position.y", go.PLAYBACK_ONCE_PINGPONG, 500, go.EASING_INOUTCUBIC, 1, 0)
-			print("7 flow.go_animate() done")
+			print("flow.go_animate() done")
 		end)
 
 		-- unload a collection proxy and wait until it is unloaded
 		flow.unload("#a_proxy")
-		print("8 flow.unload() a_proxy unloaded")
+		print("flow.unload() a_proxy unloaded")
 
 		-- the running flow will not wait for this flow to finish
 		flow(function()
-			print("10 Parallel flow starting")
+			print("Parallel flow starting")
 			flow.delay(2)
-			print("11 The outer flow did not wait for me")
+			print("The outer flow did not wait for me")
 			msg.post("#", "fooo")
 			flow.delay(0.2)
 			msg.post("#", "abc")
 			flow.delay(0.2)
 			msg.post("#", "booo")
 		end, { parallel = true })
 
-		print("9 This flow will continue to run without waiting for the parallel flow to finish")
+		print("This flow will continue to run without waiting for the parallel flow to finish")
 
 		-- wait for any message (the message will be posted by the parallel flow created above)
 		local message_id, message, sender = flow.until_any_message()
-		print("12 flow.until_any_message()", message_id, message, sender)
+		print("flow.until_any_message()", message_id, message, sender)
 
 		-- wait for a specific message (the message will be posted by the parallel flow created above)
 		local message_id, message, sender = flow.until_message(hash("booo"))
-		print("13 flow.until_message()", message_id, message, sender)
+		print("flow.until_message()", message_id, message, sender)
 
 		-- wait until a callback is invoked
 		-- in this case we make a http.request call and wait for the callback
 		local self, id, response = flow.until_callback(function(callback)
 			http.request("http://www.google.com", "GET", callback)
 		end)
-		print("14 flow.until_callback() http.request() with callback done", response.status)
+		print("flow.until_callback() http.request() with callback done", response.status)
 
 		-- waiting for a callback must also work when the callback is
 		-- invoked immediately (as opposed to the result of some async operation)
 		local foo, bar = flow.until_callback(function(callback)
 			callback("foo", "bar")
 		end)
-		print("15 flow.until_callback() immediate callback", foo, bar)
+		print("flow.until_callback() immediate callback", foo, bar)
 
 		flow.load("#a_proxy")
-		print("16 flow.load() a_proxy loaded")
+		print("flow.load() a_proxy loaded")
 
 		-- play a sprite animation and wait until it is done
 		flow.play_animation("#sprite", "green_walk_once")
-		print("17 DONE")
+		print("DONE")
 	end)
 
 	flow(function()
@@ -110,8 +114,5 @@ function on_message(self, message_id, message, sender)
 end
 
 function on_input(self, action_id, action)
-	if action.released then
-		print("stopping")
-		flow.stop(msg.url())
-	end
+	flow.on_input(action_id, action)
 end

ludobits/m/flow.lua

@@ -226,6 +226,40 @@ function M.until_message(...)
 end
 
 
+--- Wait until input action with pressed state
+-- @param action_id Optional action to wait for (nil for any action)
+-- @return action_id
+-- @return action
+function M.until_input_pressed(action_id)
+	local instance = create_or_get(coroutine.running())
+	instance.state = WAITING
+	instance.on_input = function(action_id, action)
+		if (action_id and action_id == action_id) and action.pressed then
+			instance.result = table_pack(action_id, action)
+			instance.on_input = nil
+			instance.state = READY
+		end
+	end
+	return coroutine.yield()
+end
+
+--- Wait until input action with released state
+-- @param action_id Optional action to wait for (nil for any action)
+-- @return action_id
+-- @return action
+function M.until_input_released(action_id)
+	local instance = create_or_get(coroutine.running())
+	instance.state = WAITING
+	instance.on_input = function(action_id, action)
+		if (action_id and action_id == action_id) and action.released then
+			instance.result = table_pack(action_id, action)
+			instance.on_input = nil
+			instance.state = READY
+		end
+	end
+	return coroutine.yield()
+end
+
 --- Wait until a callback function is invoked
 -- @param fn The function to call. The function must take a callback function as its first argument
 -- @param arg1 Additional argument to pass to fn
@@ -433,6 +467,15 @@ function M.on_message(message_id, message, sender)
 	end
 end
 
+function M.on_input(action_id, action)
+	local url = msg.url()
+	for _,instance in pairs(instances) do
+		if instance.on_input and instance.url == url then
+			instance.on_input(action_id, action)
+		end
+	end
+end
+
 return setmetatable(M, {
 	__call = function(self, ...)
 		return M.start(...)