Added option to remove transition

Fixes #117

Author: britzl

game.project

@@ -4,7 +4,7 @@ version = 0.9
 dependencies#0 = https://github.com/britzl/deftest/archive/2.7.0.zip
 
 [bootstrap]
-main_collection = /example/advanced/advanced.collectionc
+main_collection = /test/test.collectionc
 
 [input]
 game_binding = /input/game.input_bindingc

monarch/monarch.lua

@@ -1321,14 +1321,13 @@ end
 -- IMPORTANT! You must call monarch.on_message() from the same script as
 -- this function was called
 -- @param id Screen id to associate transition with
--- @param fn Transition handler function
+-- @param fn Transition handler function or nil to remove transition
 function M.on_transition(id, fn)
 	assert(id, "You must provide a screen id")
-	assert(fn, "You must provide a transition function")
 	id = tohash(id)
 	assert(screens[id], ("There is no screen registered with id %s"):format(tostring(id)))
 	local screen = screens[id]
-	screen.transition_url = msg.url()
+	screen.transition_url = fn and msg.url() or nil
 	screen.transition_fn = fn
 end
 

test/data/transition1.gui_script

@@ -1,10 +1,11 @@
+local monarch = require "monarch.monarch"
 local transitions = require "monarch.transitions.gui"
 
 function init(self)
-	self.transition = transitions.in_right_out_left(gui.get_node("root"), 1)
+	local transition = transitions.in_right_out_left(gui.get_node("root"), 1)
+	monarch.on_transition("transition1", transition)
 end
 
 function on_message(self, message_id, message, sender)
-	print(message_id)
-	self.transition.handle(message_id, message, sender)
+	monarch.on_message(message_id, message, sender)
 end

test/test_monarch.lua

@@ -379,6 +379,23 @@ return function()
 			assert(wait_until_not_busy())
 		end)
 
+		it("should be possible to remove a transition", function()
+			local start = socket.gettime()
+			monarch.show(TRANSITION1)
+			assert(wait_until_stack({ TRANSITION1 }))
+			assert(wait_until_not_busy())
+			local t = socket.gettime() - start
+			assert_greater_than(t, 0.2)
+
+			monarch.on_transition(TRANSITION1, nil)
+			start = socket.gettime()
+			monarch.hide(TRANSITION1)
+			assert(wait_until_stack({ }))
+			assert(wait_until_not_busy())
+			local t = socket.gettime() - start
+			assert_less_than(t, 0.1)
+		end)
+		
 		it("should be able to preload a screen and wait for it", function()
 			assert(not monarch.is_preloading(TRANSITION1))
 			monarch.preload(TRANSITION1)
@@ -569,5 +586,6 @@ return function()
 			assert(not monarch.is_popup(SCREEN1))
 			assert(monarch.is_popup(POPUP1))
 		end)
+		
 	end)
 end

test/test_transitions.lua

@@ -40,6 +40,7 @@ describe("transitions", function()
 
 		local node = gui.new_box_node(vmath.vector3(), vmath.vector3(100, 100, 0))
 		local duration = 2
+		local delay = 0
 		local t = transitions.create(node)
 		t.show_in(dummy_transition1, easing.OUT, duration, delay or 0)
 		t.show_in(dummy_transition2, easing.OUT, duration, delay or 0)
@@ -57,6 +58,7 @@ describe("transitions", function()
 
 		local node = gui.new_box_node(vmath.vector3(), vmath.vector3(100, 100, 0))
 		local duration = 2
+		local delay = 0
 		local t = transitions.create(node)
 		.show_in(dummy_transition, easing.OUT, duration, delay or 0)
 		.show_out(dummy_transition, easing.IN, duration, delay or 0)