Added monarch.is_popup() (#70)

* Only allow editor script to target .gui

Disable .collection and .gui_script

* whitespace

.github/workflows/ci-workflow.yml

@@ -8,6 +8,9 @@ jobs:
         runs-on: ubuntu-latest
         steps:
           - uses: actions/checkout@v1
+          - uses: actions/setup-java@v1
+            with:
+                java-version: '11'
           - name: Run.sh
             env:
                 DEFOLD_USER: bjorn.ritzl@gmail.com

.travis.yml

@@ -1,5 +1,7 @@
 sudo: required
 
+dist: bionic
+
 script:
   - sudo unlink /usr/bin/gcc && sudo ln -s /usr/bin/gcc-5 /usr/bin/gcc
   - gcc --version
@@ -19,8 +21,6 @@ jdk:
 
 env:
   global:
-    - DEFOLD_AUTH=foobar
-    - DEFOLD_USER=bjorn.ritzl@gmail.com
     - DEFOLD_BOOSTRAP_COLLECTION=/test/test.collectionc
 
 script:

.travis/run.sh

@@ -26,11 +26,9 @@ chmod +x dmengine_headless
 echo "Downloading ${BOB_URL}"
 curl -o bob.jar ${BOB_URL}
 
-# Fetch libraries if DEFOLD_AUTH and DEFOLD_USER are set
-if [ -n "${DEFOLD_AUTH}" ] && [ -n "${DEFOLD_USER}" ]; then
-	echo "Running bob.jar - resolving dependencies"
-	java -jar bob.jar --auth "${DEFOLD_AUTH}" --email "${DEFOLD_USER}" resolve
-fi
+# Fetch libraries
+echo "Running bob.jar - resolving dependencies"
+java -jar bob.jar --auth "foobar" --email "john@doe.com" resolve
 
 echo "Running bob.jar - building"
 java -jar bob.jar --debug build --keep-unused

README.md

@@ -1,6 +1,6 @@
 ![](docs/logo.jpg)
 
-[![Build Status](https://travis-ci.org/britzl/monarch.svg?branch=master)](https://travis-ci.org/britzl/monarch)
+[![Build Status](https://travis-ci.com/britzl/monarch.svg?branch=master)](https://travis-ci.org/britzl/monarch)
 [![Code Coverage](https://codecov.io/gh/britzl/monarch/branch/master/graph/badge.svg)](https://codecov.io/gh/britzl/monarch)
 [![Latest Release](https://img.shields.io/github/release/britzl/monarch.svg)](https://github.com/britzl/monarch/releases)
 
@@ -19,14 +19,18 @@ Or point to the ZIP file of a [specific release](https://github.com/britzl/monar
 # Usage
 Using Monarch requires that screens are created in a certain way. Once you have one or more screens created you can start navigating between the screens.
 
+## Editor Script
+Right click in on a`.gui` file in the outline and selected the menu item, it creates a `.collection` and a `.gui_script` with the same name as the `.gui` file. It adds the file with some basic setup done to them, adding the selected gui script to the created gui scene and in turns adds the gui scene to the newly created collection.
+
+<img src="/docs/editor_script.gif" width="200px">
 
 ## Creating screens
 Monarch screens are created in individual collections and either loaded through collection proxies or created through collection factories.
 
 ### Collection proxies
-For proxies the recommended setup is to create one game object per screen and per game object attach a collection proxy component and an instance of the ```screen_proxy.script``` provided by Monarch. The ```screen_proxy.script``` will take care of the setup of the screen. All you need to do is to make sure that the script properties on the script are correct:
+For proxies the recommended setup is to create one game object per screen and per game object attach a collection proxy component and an instance of the `screen_proxy.script` provided by Monarch. The `screen_proxy.script` will take care of the setup of the screen. All you need to do is to make sure that the script properties on the script are correct:
 
-* **Screen Proxy (url)** - The URL to the collection proxy component containing the actual screen. Defaults to ```#collectionproxy```.
+* **Screen Proxy (url)** - The URL to the collection proxy component containing the actual screen. Defaults to `#collectionproxy`.
 * **Screen Id (hash)** - A unique id that can be used to reference the screen when navigating your app.
 * **Popup (boolean)** - Check this if the screen should be treated as a [popup](#popups).
 * **Popup on Popup (boolean)** - Check this if the screen is a [popup](#popups) and it can be shown on top of other popups.
@@ -41,9 +45,9 @@ For proxies the recommended setup is to create one game object per screen and pe
 ![](docs/setup_proxy.png)
 
 ### Collection factories
-For factories the recommended setup is to create one game object per screen and per game object attach a collection factory component and an instance of the ```screen_factory.script``` provided by Monarch. The ```screen_factory.script``` will take care of the setup of the screen. All you need to do is to make sure that the script properties on the script are correct:
+For factories the recommended setup is to create one game object per screen and per game object attach a collection factory component and an instance of the `screen_factory.script` provided by Monarch. The `screen_factory.script` will take care of the setup of the screen. All you need to do is to make sure that the script properties on the script are correct:
 
-* **Screen Factory (url)** - The URL to the collection factory component containing the actual screen. Defaults to ```#collectionfactory```.
+* **Screen Factory (url)** - The URL to the collection factory component containing the actual screen. Defaults to `#collectionfactory`.
 * **Screen Id (hash)** - A unique id that can be used to reference the screen when navigating your app.
 * **Popup (boolean)** - Check this if the screen should be treated as a [popup](#popups).
 * **Popup on Popup (boolean)** - Check this if the screen is a [popup](#popups) and it can be shown on top of other popups.
@@ -64,21 +68,21 @@ Sometimes it might be desirable to have a screen that contains one or more sub-s
 The navigation in Monarch is based around a stack of screens. When a screen is shown it is pushed to the top of the stack. When going back to a previous screen the topmost screen on the stack is removed. Example:
 
 * Showing screen A
-* Stack is ```[A]```
+* Stack is `[A]`
 * Showing screen B
-* Stack is ```[A, B]``` - (B is on top)
+* Stack is `[A, B]` - (B is on top)
 * Going back
-* Stack is ```[A]```
+* Stack is `[A]`
 
 ### Showing a new screen
 You show a screen in one of two ways:
 
-1. Post a ```show``` message to the ```screen.script```
-2. Call ```monarch.show()``` (see below)
+1. Post a `show` message to the screen script (either `screen_proxy.script` or `screen_factory.script`)
+2. Call `monarch.show()` (see below)
 
 Showing a screen will push it to the top of the stack and trigger an optional transition. The previous screen will be hidden (with an optional transition) unless the screen to be shown is a [popup](#popups).
 
-NOTE: You must ensure that the ```init()``` function of the ```screen.script``` has run. The ```init()``` function is responsible for registering the screen and it's not possible to show it until this has happened. A good practice is to delay the first call by posting a message to a controller script or similar before calling ```monarch.show()``` the first time:
+NOTE: You must ensure that the `init()` function of the screen script (either `screen_proxy.script` or `screen_factory.script`) has run. The `init()` function is responsible for registering the screen and it's not possible to show it until this has happened. A good practice is to delay the first call by posting a message to a controller script or similar before calling `monarch.show()` the first time:
 
 	function init(self)
 		msg.post("#", "show_first_screen")
@@ -89,17 +93,17 @@ NOTE: You must ensure that the ```init()``` function of the ```screen.script```
 	end
 
 #### Preventing duplicates in the stack
-You can pass an optional ```clear``` flag when showing a screen (either as a key value pair in the options table when calling ```monarch.show()``` or in the message). If the clear flag is set Monarch will search the stack for the screen in question. If the screen already exists in the stack and the ```clear``` flag is set Monarch will remove all screens between the current top and the screen in question. Example:
+You can pass an optional `clear` flag when showing a screen (either as a key value pair in the options table when calling `monarch.show()` or in the message). If the clear flag is set Monarch will search the stack for the screen in question. If the screen already exists in the stack and the `clear` flag is set Monarch will remove all screens between the current top and the screen in question. Example:
 
-* Stack is ```[A, B, C, D]``` - (D is on top)
-* A call to ```monarch.show(B, { clear = true })``` is made
-* Stack is ```[A, B]```
+* Stack is `[A, B, C, D]` - (D is on top)
+* A call to `monarch.show(B, { clear = true })` is made
+* Stack is `[A, B]`
 
-As opposed to if the ```clear``` flag was not set:
+As opposed to if the `clear` flag was not set:
 
-* Stack is ```[A, B, C, D]``` - (D is on top)
-* A call to ```monarch.show(B, { clear = false })``` is made
-* Stack is ```[A, B, C, D, B]``` - (B is on top)
+* Stack is `[A, B, C, D]` - (D is on top)
+* A call to `monarch.show(B, { clear = false })` is made
+* Stack is `[A, B, C, D, B]` - (B is on top)
 
 #### Showing a screen without adding it to the stack
 Monarch can also show a screen without adding it to the stack. This can be used to for instance load a collection containing a background that you want to have visible at all times. You show and hide such a screen like this:
@@ -113,8 +117,8 @@ Monarch can also show a screen without adding it to the stack. This can be used
 ### Going back to a previous screen
 You navigate back in the screen hierarchy in one of two ways:
 
-1. Post a ```back``` message to the ```screen.script```
-2. Call ```monarch.back()``` (see below)
+1. Post a `back` message to the screen script (either `screen_proxy.script` or `screen_factory.script`)
+2. Call `monarch.back()` (see below)
 
 
 ## Input focus
@@ -127,157 +131,33 @@ A screen that is flagged as a popup (see [list of screen properties](#creating-s
 ### Popup on normal screen
 If a popup is shown on top of a non-popup the current top screen will not be unloaded and instead remain visible in the background:
 
-* Stack is ```[A, B]```
-* A call to ```monarch.show(C)``` is made and C is a popup
-* Stack is ```[A, B, C]``` and B will still be visible
+* Stack is `[A, B]`
+* A call to `monarch.show(C)` is made and C is a popup
+* Stack is `[A, B, C]` and B will still be visible
 
 ### Popup on popup
 If a popup is at the top of the stack and another popup is shown the behavior will depend on if the new popup has the Popup on Popup flag set or not. If the Popup on Popup flag is set the underlying popup will remain visible.
 
-* Stack is ```[A, B, C]``` and C is a popup
-* A call to ```monarch.show(D)``` is made and D is a popup with the popup on popup flag set
-* Stack is ```[A, B, C, D]```
+* Stack is `[A, B, C]` and C is a popup
+* A call to `monarch.show(D)` is made and D is a popup with the popup on popup flag set
+* Stack is `[A, B, C, D]`
 
 If the Popup on Popup flag is not set then the underlying popup will be closed, just as when showing a normal screen on top of a popup (see above).
 
-* Stack is ```[A, B, C]``` and C is a popup
-* A call to ```monarch.show(D)``` is made and D is a popup without the popup on popup flag set
-* Stack is ```[A, B, D]```
+* Stack is `[A, B, C]` and C is a popup
+* A call to `monarch.show(D)` is made and D is a popup without the popup on popup flag set
+* Stack is `[A, B, D]`
 
 ### Screen on popup
 If a screen is shown on top of one or more popups they will all be removed from the stack:
 
-* Stack is ```[A, B, C, D]``` and C and D are popups
-* A call to ```monarch.show(E)``` is made and E is not a popup
-* Stack is ```[A, B, E]```
+* Stack is `[A, B, C, D]` and C and D are popups
+* A call to `monarch.show(E)` is made and E is not a popup
+* Stack is `[A, B, E]`
 
 
 ## Transitions
-You can add optional transitions when navigating between screens. The default behavior is that screen navigation is instant but if you have defined a transition for a screen Monarch will wait until the transition is completed before proceeding. The `Transition Url` (proxy) or `Transition Id` (collectionfactory) property described above should be the URL/Id to a script with an ```on_message``` handlers for the following messages:
-
-* ```transition_show_in``` (constant defined as ```monarch.TRANSITION.SHOW_IN```)
-* ```transition_show_out``` (constant defined as ```monarch.TRANSITION.SHOW_OUT```)
-* ```transition_back_in``` (constant defined as ```monarch.TRANSITION.BACK_IN```)
-* ```transition_back_out``` (constant defined as ```monarch.TRANSITION.BACK_OUT```)
-
-When a transition is completed it is up to the developer to send a ```transition_done``` (constant ```monarch.TRANSITION.DONE```) message back to the sender to indicate that the transition is completed and that Monarch can continue the navigation sequence.
-
-
-### Predefined transitions
-Monarch comes with a system for setting up transitions easily in a gui_script using the ```monarch.transitions.gui``` module. Example:
-
-	local transitions = require "monarch.transitions.gui"
-	local monarch = require "monarch.monarch"
-
-	function init(self)
-		-- create transitions for the node 'root'
-		-- the node will slide in/out from left and right with
-		-- a specific easing, duration and delay
-		self.transition = transitions.create(gui.get_node("root"))
-			.show_in(transitions.slide_in_right, gui.EASING_OUTQUAD, 0.6, 0)
-			.show_out(transitions.slide_out_left, gui.EASING_INQUAD, 0.6, 0)
-			.back_in(transitions.slide_in_left, gui.EASING_OUTQUAD, 0.6, 0)
-			.back_out(transitions.slide_out_right, gui.EASING_INQUAD, 0.6, 0)
-	end
-
-	function on_message(self, message_id, message, sender)
-		self.transition.handle(message_id, message, sender)
-		-- you can also check when a transition has completed:
-		if message_id == monarch.TRANSITION.DONE and message.transition == monarch.TRANSITION.SHOW_IN then
-			print("Show in done!")
-		end
-	end
-
-It is also possible to assign transitions to multiple nodes:
-
-	function init(self)
-		self.transition = transitions.create() -- note that no node is passed to transition.create()!
-			.show_in(gui.get_node("node1"), transitions.slide_in_right, gui.EASING_OUTQUAD, 0.6, 0)
-			.show_in(gui.get_node("node2"), transitions.slide_in_right, gui.EASING_OUTQUAD, 0.6, 0)
-	end
-
-
-The predefined transitions provided by ```monarch.transitions.gui``` are:
-
-* ```slide_in_right```
-* ```slide_in_left```
-* ```slide_in_top```
-* ```slide_in_bottom```
-* ```slide_out_right```
-* ```slide_out_left```
-* ```slide_out_top```
-* ```slide_out_bottom```
-* ```scale_in```
-* ```scale_out```
-* ```fade_in``` - Set node alpha to fully transparent (i.e. 0.0) and fade to fully opaque (i.e. 1.0)
-* ```fade_out``` - Set node alpha to fully opaque (i.e. 1.0) and fade to fully transparent (i.e. 0.0)
-
-Additionally there's functionality to create a full set of transitions for common transition styles:
-
-* ```transitions.in_right_out_left(node, duration, [delay], [easing])```
-* ```transitions.in_left_out_right(node, duration, [delay], [easing])```
-* ```transitions.in_left_out_left(node, duration, [delay], [easing])```
-* ```transitions.in_right_out_right(node, duration, [delay], [easing])```
-* ```transitions.fade_in_out(node, duration, [delay], [easing])```
-
-**PARAMETERS**
-* ```node``` (node) - Gui node to animate.
-* ```duration``` (number) - Transition duration in seconds.
-* ```delay``` (number) - Transition delay in seconds.
-* ```easing``` (table) - Easing table, created from a function provided by ```monarch.transitions.easings```
-
-**RETURN**
-* ```instance``` - The created transition instance
-
-
-### Custom transitions
-You can create and use your own transition as long as the provided transition function has the following function signature:
-
-	custom_transition(node, to, easing, duration, delay, cb)
-
-**PARAMETERS**
-* ```node``` (node) - Gui node to animate.
-* ```to``` (vector3) - Target position.
-* ```easing``` (number) - One of gui.EASING_* constants.
-* ```duration``` (number) - Transition duration in seconds.
-* ```delay``` (number) - Transition delay in seconds.
-* ```cb``` (function) - This function must be called when the transition is completed.
-
-
-### Dynamic orientation and resized windows
-When using dynamic screen orientation together with gui layouts or using transitions on a platform where the window can be resized it's important to make sure that the created transitions adapt to the change in orientation or window size. The transition system takes care of layout changes automatically, but when it comes to changes in window size you need to notify the transition manually:
-
-	local transitions = require "monarch.transitions.gui"
-
-	function init(self)
-		self.transition = transitions.create(gui.get_node("root"))
-	end
-
-	function on_message(self, message_id, message, sender)
-		if message_id == hash("my_resize_message") then
-			self.transition.window_resized(message.width, message.height)
-		end
-	end
-
-
-### Screen stack info and transitions
-The transition message sent to the Transition Url specified in the screen configuration contains additional information about the transition. For the ```transition_show_in``` and ```transition_back_out``` messages the message contains the previous screen id:
-
-	function on_message(self, message_id, message, sender)
-		if message_id == hash("transition_show_in") or message_id == hash("transition_back_out") then
-			print(message.previous_screen)
-		end
-	end
-
-For the ```transition_show_out``` and ```transition_back_in``` messages the message contains the next screen id:
-
-	function on_message(self, message_id, message, sender)
-		if message_id == hash("transition_show_out") or message_id == hash("transition_back_in") then
-			print(message.next_screen)
-		end
-	end
-
-This information can be used to create dynamic transitions where the direction of the transition depends on the previous/next screen
+You can add optional transitions when navigating between screens. This is [described in detail here](/README_TRANSITIONS.md).
 
 
 ## Screen focus gain/loss
@@ -295,205 +175,15 @@ Monarch will send focus gain and focus loss messages if a `Focus Url` (proxy) or
 
 
 ## Callbacks
-Both the ```monarch.show()``` and ```monarch.back()``` functions take an optional callback function that will be invoked when the ```transition_show_in``` (or the ```transition_back_in``` in the case of a ```monarch.back()``` call) transition is completed. The transition is considered completed when a ```transition_done``` message has been received (see section on [transitions](#transitions) above).
+Both the `monarch.show()` and `monarch.back()` functions take an optional callback function that will be invoked when the `transition_show_in` (or the `transition_back_in` in the case of a `monarch.back()` call) transition is completed. The transition is considered completed when a `transition_done` message has been received (see section on [transitions](#transitions) above).
 
 
 ## Monarch API
+The full [Monarch API is documented here](/README_API.md).
 
-### monarch.show(screen_id, [options], [data], [callback])
-Show a Monarch screen. Note that the screen must be registered before it can be shown. The ```init()``` function of the ```screen.script``` takes care of registration. This operation will be added to the queue if Monarch is busy.
 
-**PARAMETERS**
-* ```screen_id``` (string|hash) - Id of the screen to show.
-* ```options``` (table) - Options when showing the new screen (see below).
-* ```data``` (table) - Optional data to associate with the screen.  Retrieve using ```monarch.data()```.
-* ```callback``` (function) - Optional function to call when the new screen is visible.
+## Monarch FAQ
 
-The options table can contain the following fields:
+**Q**: Why am I getting `ERROR GAMEOBJECT: The collection 'default' could not be created since there is already a socket with the same name`?
 
-* ```clear``` (boolean) - If the `clear` flag is set Monarch will search the stack for the screen that is to be shown. If the screen already exists in the stack and the clear flag is set Monarch will remove all screens between the current top and the screen in question.
-* ```reload``` (boolean) - If the `reload` flag is set Monarch will reload the collection proxy if it's already loaded (this can happen if the previous screen was a popup).
-* ```no_stack``` (boolean) - If the `no_stack` flag is set Monarch will load the screen without adding it to the screen stack.
-
-
-### monarch.hide(screen_id, [callback])
-Hide a screen that has been shown using the `no_stack` option. If used on a screen that was shown without the `no_stack` option it will only hide it if the screen is on top of the stack and the behavior will be exactly like if `monarch.back()` had been called. This operation will be added to the queue if Monarch is busy.
-
-**PARAMETERS**
-* ```screen_id``` (string|hash) - Id of the screen to hide.
-* ```callback``` (function) - Optional function to call when the screen has been hidden.
-
-**RETURN**
-* ```success``` (boolean) - True if the process of hiding the screen was started successfully.
-
-
-### monarch.back([data], [callback])
-Go back to a previous Monarch screen. This operation will be added to the queue if Monarch is busy.
-
-**PARAMETERS**
-* ```data``` (table) - Optional data to associate with the screen you are going back to.  Retrieve using ```monarch.data()```.
-* ```callback``` (function) - Optional function to call when the previous screen is visible.
-
-
-### monarch.preload(screen_id, [callback])
-Preload a Monarch screen. This will load but not enable the screen. This is useful for content heavy screens that you wish to be able to show without having to wait for it load. This operation will be added to the queue if Monarch is busy.
-
-**PARAMETERS**
-* ```screen_id``` (string|hash) - Id of the screen to preload.
-* ```callback``` (function) - Optional function to call when the screen is preloaded.
-
-
-### monarch.is_preloading(screen_id)
-Check if a Monarch screen is preloading (via monarch.preload() or the Preload screen setting).
-
-**PARAMETERS**
-* ```screen_id``` (string|hash) - Id of the screen to check
-
-**RETURN**
-* ```preloading``` (boolean) - True if the screen is preloading.
-
-
-### monarch.when_preloaded(screen_id, callback)
-Invoke a callback when a screen has been preloaded.
-
-**PARAMETERS**
-* ```screen_id``` (string|hash) - Id of the screen to check
-* ```callback``` (function) - Function to call when the screen has been preloaded.
-
-
-### monarch.unload(screen_id, [callback])
-Unload a preloaded Monarch screen. A preloaded screen will automatically get unloaded when hidden, but this function can be useful if a screen has been preloaded and it needs to be unloaded again without actually hiding it. This operation will be added to the queue if Monarch is busy.
-
-**PARAMETERS**
-* ```screen_id``` (string|hash) - Id of the screen to unload.
-* ```callback``` (function) - Optional function to call when the screen is unloaded.
-
-
-### monarch.top([offset])
-Get the id of the screen at the top of the stack.
-
-**PARAMETERS**
-* ```offset``` (number) - Optional offset from the top of the stack, ie -1 to get the previous screen
-
-**RETURN**
-* ```screen_id``` (string|hash) - Id of the requested screen
-
-
-### monarch.bottom([offset])
-Get the id of the screen at the bottom of the stack.
-
-**PARAMETERS**
-* ```offset``` (number) - Optional offset from the bottom of the stack
-
-**RETURN**
-* ```screen_id``` (string|hash) - Id of the requested screen
-
-
-### monarch.data(screen_id)
-Get the data associated with a screen (from a call to ```monarch.show()``` or ```monarch.back()```).
-
-**PARAMETERS**
-* ```screen_id``` (string|hash) - Id of the screen to get data for
-
-**RETURN**
-* ```data``` (table) - Data associated with the screen.
-
-
-### monarch.screen_exists(screen_id)
-Check if a Monarch screen exists.
-
-**PARAMETERS**
-* ```screen_id``` (string|hash) - Id of the screen to get data for
-
-**RETURN**
-* ```exists``` (boolean) - True if the screen exists.
-
-
-### monarch.is_busy()
-Check if Monarch is busy showing and/or hiding a screen.
-
-**RETURN**
-* ```busy``` (boolean) - True if busy hiding and/or showing a screen.
-
-
-### monarch.is_top(screen_id)
-Check if a Monarch screen is at the top of the view stack.
-
-**PARAMETERS**
-* ```screen_id``` (string|hash) - Id of the screen to check
-
-**RETURN**
-* ```exists``` (boolean) - True if the screen is at the top of the stack.
-
-
-### monarch.is_visible(screen_id)
-Check if a Monarch screen is visible.
-
-**PARAMETERS**
-* ```screen_id``` (string|hash) - Id of the screen to check
-
-**RETURN**
-* ```exists``` (boolean) - True if the screen is visible.
-
-
-### monarch.add_listener([url])
-Add a URL that will be notified of navigation events.
-
-**PARAMETERS**
-* ```url``` (url) - URL to send navigation events to. Will use current URL if omitted.
-
-
-### monarch.remove_listener([url])
-Remove a previously added listener.
-
-**PARAMETERS**
-* ```url``` (url) - URL to remove. Will use current URL if omitted.
-
-
-### monarch.post(screen_id, message_id, [message])
-Post a message to a visible screen. If the screen is created through a collection proxy it must have specified a receiver url. If the screen is created through a collection factory the function will post the message to all game objects within the collection.
-
-**PARAMETERS**
-* ```screen_id``` (string|hash) - Id of the screen to post message to
-* ```message_id``` (string|hash) - Id of the message to send
-* ```message``` (table|nil) - Optional message data to send
-
-**RETURN**
-* ```result``` (boolean) - True if the message was sent
-* ```error``` (string|nil) - Error message if unable to send message
-
-
-### monarch.debug()
-Enable verbose logging of the internals of Monarch.
-
-
-### monarch.SCREEN_TRANSITION_IN_STARTED
-Message sent to listeners added using `monarch.add_listener()` when a screen has started to transition in.
-
-**PARAMETERS**
-* ```screen``` (hash) - Id of the screen
-* ```previous_screen``` (hash) - Id of the previous screen (if any)
-
-
-### monarch.SCREEN_TRANSITION_IN_FINISHED
-Message sent to listeners added using `monarch.add_listener()` when a screen has finished to transition in.
-
-**PARAMETERS**
-* ```screen``` (hash) - Id of the screen
-* ```previous_screen``` (hash) - Id of the previous screen (if any)
-
-
-### monarch.SCREEN_TRANSITION_OUT_STARTED
-Message sent to listeners added using `monarch.add_listener()` when a screen has started to transition out.
-
-**PARAMETERS**
-* ```screen``` (hash) - Id of the screen
-* ```next_screen``` (hash) - Id of the next screen (if any)
-
-
-### monarch.SCREEN_TRANSITION_OUT_FINISHED
-Message sent to listeners added using `monarch.add_listener()` when a screen has finished to transition out.
-
-**PARAMETERS**
-* ```screen``` (hash) - Id of the screen
-* ```next_screen``` (hash) - Id of the next screen (if any)
+**A**: Each collection that you use must be given a unique id. In this case you have more than one collection loaded with the id `default`.  Select the root of each collection in the Outline panel and change the Name field in the properties panel from the default value of `default`.

README_API.md

@@ -0,0 +1,205 @@
+
+# Monarch API
+
+## monarch.show(screen_id, [options], [data], [callback])
+Show a Monarch screen. Note that the screen must be registered before it can be shown. The `init()` function of the screen script (either `screen_proxy.script` or `screen_factory.script`) takes care of registration. This operation will be added to the queue if Monarch is busy.
+
+**PARAMETERS**
+* `screen_id` (string|hash) - Id of the screen to show.
+* `options` (table) - Options when showing the new screen (see below).
+* `data` (table) - Optional data to associate with the screen.  Retrieve using `monarch.data()`.
+* `callback` (function) - Optional function to call when the new screen is visible.
+
+The options table can contain the following fields:
+
+* `clear` (boolean) - If the `clear` flag is set Monarch will search the stack for the screen that is to be shown. If the screen already exists in the stack and the clear flag is set Monarch will remove all screens between the current top and the screen in question.
+* `reload` (boolean) - If the `reload` flag is set Monarch will reload the collection proxy if it's already loaded (this can happen if the previous screen was a popup).
+* `no_stack` (boolean) - If the `no_stack` flag is set Monarch will load the screen without adding it to the screen stack.
+* `sequential` (boolean) - If the `sequential` flag is set Monarch will start loading the screen only after the previous screen finished transitioning out.
+* `pop` (number) - If `pop` is set to a number, Monarch will pop that number of screens from the stack before adding the new one.
+
+## monarch.replace(screen_id, [options], [data], [callback])
+Replace the top of the stack with a new screen. Equivalent to calling `monarch.show()` with `pop = 1`. It takes the same parameters as `monarch.show()`.
+
+
+## monarch.hide(screen_id, [callback])
+Hide a screen that has been shown using the `no_stack` option. If used on a screen that was shown without the `no_stack` option it will only hide it if the screen is on top of the stack and the behavior will be exactly like if `monarch.back()` had been called. This operation will be added to the queue if Monarch is busy.
+
+**PARAMETERS**
+* `screen_id` (string|hash) - Id of the screen to hide.
+* `callback` (function) - Optional function to call when the screen has been hidden.
+
+**RETURN**
+* `success` (boolean) - True if the process of hiding the screen was started successfully.
+
+
+## monarch.back([data], [callback])
+Go back to a previous Monarch screen. This operation will be added to the queue if Monarch is busy.
+
+**PARAMETERS**
+* `data` (table) - Optional data to associate with the screen you are going back to.  Retrieve using `monarch.data()`.
+* `callback` (function) - Optional function to call when the previous screen is visible.
+
+
+## monarch.preload(screen_id, [callback])
+Preload a Monarch screen. This will load but not enable the screen. This is useful for content heavy screens that you wish to be able to show without having to wait for it load. This operation will be added to the queue if Monarch is busy.
+
+**PARAMETERS**
+* `screen_id` (string|hash) - Id of the screen to preload.
+* `callback` (function) - Optional function to call when the screen is preloaded.
+
+
+## monarch.is_preloading(screen_id)
+Check if a Monarch screen is preloading (via monarch.preload() or the Preload screen setting).
+
+**PARAMETERS**
+* `screen_id` (string|hash) - Id of the screen to check
+
+**RETURN**
+* `preloading` (boolean) - True if the screen is preloading.
+
+
+## monarch.when_preloaded(screen_id, callback)
+Invoke a callback when a screen has been preloaded.
+
+**PARAMETERS**
+* `screen_id` (string|hash) - Id of the screen to check
+* `callback` (function) - Function to call when the screen has been preloaded.
+
+
+## monarch.unload(screen_id, [callback])
+Unload a preloaded Monarch screen. A preloaded screen will automatically get unloaded when hidden, but this function can be useful if a screen has been preloaded and it needs to be unloaded again without actually hiding it. This operation will be added to the queue if Monarch is busy.
+
+**PARAMETERS**
+* `screen_id` (string|hash) - Id of the screen to unload.
+* `callback` (function) - Optional function to call when the screen is unloaded.
+
+
+## monarch.top([offset])
+Get the id of the screen at the top of the stack.
+
+**PARAMETERS**
+* `offset` (number) - Optional offset from the top of the stack, ie -1 to get the previous screen
+
+**RETURN**
+* `screen_id` (string|hash) - Id of the requested screen
+
+
+## monarch.bottom([offset])
+Get the id of the screen at the bottom of the stack.
+
+**PARAMETERS**
+* `offset` (number) - Optional offset from the bottom of the stack
+
+**RETURN**
+* `screen_id` (string|hash) - Id of the requested screen
+
+
+## monarch.data(screen_id)
+Get the data associated with a screen (from a call to `monarch.show()` or `monarch.back()`).
+
+**PARAMETERS**
+* `screen_id` (string|hash) - Id of the screen to get data for
+
+**RETURN**
+* `data` (table) - Data associated with the screen.
+
+
+## monarch.screen_exists(screen_id)
+Check if a Monarch screen exists.
+
+**PARAMETERS**
+* `screen_id` (string|hash) - Id of the screen to get data for
+
+**RETURN**
+* `exists` (boolean) - True if the screen exists.
+
+
+## monarch.is_busy()
+Check if Monarch is busy showing and/or hiding a screen.
+
+**RETURN**
+* `busy` (boolean) - True if busy hiding and/or showing a screen.
+
+
+## monarch.is_top(screen_id)
+Check if a Monarch screen is at the top of the view stack.
+
+**PARAMETERS**
+* `screen_id` (string|hash) - Id of the screen to check
+
+**RETURN**
+* `exists` (boolean) - True if the screen is at the top of the stack.
+
+
+## monarch.is_visible(screen_id)
+Check if a Monarch screen is visible.
+
+**PARAMETERS**
+* `screen_id` (string|hash) - Id of the screen to check
+
+**RETURN**
+* `exists` (boolean) - True if the screen is visible.
+
+
+## monarch.add_listener([url])
+Add a URL that will be notified of navigation events.
+
+**PARAMETERS**
+* `url` (url) - URL to send navigation events to. Will use current URL if omitted.
+
+
+## monarch.remove_listener([url])
+Remove a previously added listener.
+
+**PARAMETERS**
+* `url` (url) - URL to remove. Will use current URL if omitted.
+
+
+## monarch.post(screen_id, message_id, [message])
+Post a message to a visible screen. If the screen is created through a collection proxy it must have specified a receiver url. If the screen is created through a collection factory the function will post the message to all game objects within the collection.
+
+**PARAMETERS**
+* `screen_id` (string|hash) - Id of the screen to post message to
+* `message_id` (string|hash) - Id of the message to send
+* `message` (table|nil) - Optional message data to send
+
+**RETURN**
+* `result` (boolean) - True if the message was sent
+* `error` (string|nil) - Error message if unable to send message
+
+
+## monarch.debug()
+Enable verbose logging of the internals of Monarch.
+
+
+## monarch.SCREEN_TRANSITION_IN_STARTED
+Message sent to listeners added using `monarch.add_listener()` when a screen has started to transition in.
+
+**PARAMETERS**
+* `screen` (hash) - Id of the screen
+* `previous_screen` (hash) - Id of the previous screen (if any)
+
+
+## monarch.SCREEN_TRANSITION_IN_FINISHED
+Message sent to listeners added using `monarch.add_listener()` when a screen has finished to transition in.
+
+**PARAMETERS**
+* `screen` (hash) - Id of the screen
+* `previous_screen` (hash) - Id of the previous screen (if any)
+
+
+## monarch.SCREEN_TRANSITION_OUT_STARTED
+Message sent to listeners added using `monarch.add_listener()` when a screen has started to transition out.
+
+**PARAMETERS**
+* `screen` (hash) - Id of the screen
+* `next_screen` (hash) - Id of the next screen (if any)
+
+
+## monarch.SCREEN_TRANSITION_OUT_FINISHED
+Message sent to listeners added using `monarch.add_listener()` when a screen has finished to transition out.
+
+**PARAMETERS**
+* `screen` (hash) - Id of the screen
+* `next_screen` (hash) - Id of the next screen (if any)

README_TRANSITIONS.md

@@ -0,0 +1,134 @@
+# Transitions
+You can add optional transitions when navigating between screens. The default behavior is that screen navigation is instant but if you have defined a transition for a screen Monarch will wait until the transition is completed before proceeding. The `Transition Url` (proxy) or `Transition Id` (collectionfactory) property described above should be the URL/Id to a script with an `on_message` handlers for the following messages:
+
+* `transition_show_in` (constant defined as `monarch.TRANSITION.SHOW_IN`)
+* `transition_show_out` (constant defined as `monarch.TRANSITION.SHOW_OUT`)
+* `transition_back_in` (constant defined as `monarch.TRANSITION.BACK_IN`)
+* `transition_back_out` (constant defined as `monarch.TRANSITION.BACK_OUT`)
+
+When a transition is completed it is up to the developer to send a `transition_done` (constant `monarch.TRANSITION.DONE`) message back to the sender to indicate that the transition is completed and that Monarch can continue the navigation sequence.
+
+
+## Predefined transitions
+Monarch comes with a system for setting up transitions easily in a gui_script using the `monarch.transitions.gui` module. Example:
+
+```lua
+local transitions = require "monarch.transitions.gui"
+local monarch = require "monarch.monarch"
+
+function init(self)
+	-- create transitions for the node 'root'
+	-- the node will slide in/out from left and right with
+	-- a specific easing, duration and delay
+	self.transition = transitions.create(gui.get_node("root"))
+		.show_in(transitions.slide_in_right, gui.EASING_OUTQUAD, 0.6, 0)
+		.show_out(transitions.slide_out_left, gui.EASING_INQUAD, 0.6, 0)
+		.back_in(transitions.slide_in_left, gui.EASING_OUTQUAD, 0.6, 0)
+		.back_out(transitions.slide_out_right, gui.EASING_INQUAD, 0.6, 0)
+end
+
+function on_message(self, message_id, message, sender)
+	self.transition.handle(message_id, message, sender)
+	-- you can also check when a transition has completed:
+	if message_id == monarch.TRANSITION.DONE and message.transition == monarch.TRANSITION.SHOW_IN then
+		print("Show in done!")
+	end
+end
+```
+
+It is also possible to assign transitions to multiple nodes:
+
+```lua
+function init(self)
+	self.transition = transitions.create() -- note that no node is passed to transition.create()!
+		.show_in(gui.get_node("node1"), transitions.slide_in_right, gui.EASING_OUTQUAD, 0.6, 0)
+		.show_in(gui.get_node("node2"), transitions.slide_in_right, gui.EASING_OUTQUAD, 0.6, 0)
+end
+```
+
+The predefined transitions provided by `monarch.transitions.gui` are:
+
+* `slide_in_right`
+* `slide_in_left`
+* `slide_in_top`
+* `slide_in_bottom`
+* `slide_out_right`
+* `slide_out_left`
+* `slide_out_top`
+* `slide_out_bottom`
+* `scale_in`
+* `scale_out`
+* `fade_in` - Set node alpha to fully transparent (i.e. 0.0) and fade to fully opaque (i.e. 1.0)
+* `fade_out` - Set node alpha to fully opaque (i.e. 1.0) and fade to fully transparent (i.e. 0.0)
+
+Additionally there's functionality to create a full set of transitions for common transition styles:
+
+* `transitions.in_right_out_left(node, duration, [delay], [easing])`
+* `transitions.in_left_out_right(node, duration, [delay], [easing])`
+* `transitions.in_left_out_left(node, duration, [delay], [easing])`
+* `transitions.in_right_out_right(node, duration, [delay], [easing])`
+* `transitions.fade_in_out(node, duration, [delay], [easing])`
+
+**PARAMETERS**
+* `node` (node) - Gui node to animate.
+* `duration` (number) - Transition duration in seconds.
+* `delay` (number) - Transition delay in seconds.
+* `easing` (table) - Easing table, created from a function provided by `monarch.transitions.easings`
+
+**RETURN**
+* `instance` - The created transition instance
+
+
+## Custom transitions
+You can create and use your own transition as long as the provided transition function has the following function signature:
+
+	custom_transition(node, to, easing, duration, delay, cb)
+
+**PARAMETERS**
+* `node` (node) - Gui node to animate.
+* `to` (vector3) - Target position.
+* `easing` (number) - One of gui.EASING_* constants.
+* `duration` (number) - Transition duration in seconds.
+* `delay` (number) - Transition delay in seconds.
+* `cb` (function) - This function must be called when the transition is completed.
+
+
+## Dynamic orientation and resized windows
+When using dynamic screen orientation together with gui layouts or using transitions on a platform where the window can be resized it's important to make sure that the created transitions adapt to the change in orientation or window size. The transition system takes care of layout changes automatically, but when it comes to changes in window size you need to notify the transition manually:
+
+```lua
+local transitions = require "monarch.transitions.gui"
+
+function init(self)
+	self.transition = transitions.create(gui.get_node("root"))
+end
+
+function on_message(self, message_id, message, sender)
+	if message_id == hash("my_resize_message") then
+		self.transition.window_resized(message.width, message.height)
+	end
+end
+```
+
+## Screen stack info and transitions
+The transition message sent to the Transition Url specified in the screen configuration contains additional information about the transition. For the `transition_show_in` and `transition_back_out` messages the message contains the previous screen id:
+
+```lua
+function on_message(self, message_id, message, sender)
+	if message_id == hash("transition_show_in") or message_id == hash("transition_back_out") then
+		print(message.previous_screen)
+	end
+end
+```
+
+For the `transition_show_out` and `transition_back_in` messages the message contains the next screen id:
+
+```lua
+function on_message(self, message_id, message, sender)
+	if message_id == hash("transition_show_out") or message_id == hash("transition_back_in") then
+		print(message.next_screen)
+	end
+end
+```
+
+This information can be used to create dynamic transitions where the direction of the transition depends on the previous/next screen.

monarch/editor-script/make_monarch.editor_script

@@ -0,0 +1,161 @@
+local M = {}
+
+local collection_template
+local gui_script_content
+local gui_file_content
+
+local function ends_with(str, ending)
+    return ending == "" or str:sub(-#ending) == ending
+end
+
+local function file_exists(name)
+    local f=io.open(name,"r")
+    if f~=nil then io.close(f) return true else return false end
+end
+
+local function get_filename(path)   
+    local main, filename, extension = path:match("(.-)([^\\/]-%.?([^%.\\/]*))$")
+    return main, filename
+end
+
+local function create_files(file_path)
+    -- Construct paths
+    local path = editor.get(file_path, "path")
+    local main, filename = get_filename(path)
+    local basename = filename:match("(.+)%..+")
+    local target_collection_path = "." .. main .. basename .. ".collection"
+    local target_gui_script_path = "." .. main .. basename .. ".gui_script"
+    local target_gui_path = "." .. main .. basename .. ".gui"
+
+    -- Create the files if they don't exists
+    if not file_exists(target_collection_path) then
+        local collection_content = collection_template(path, basename)
+        local collection = io.open(target_collection_path, "w")
+        collection:write(collection_content)
+        collection:close()
+    end
+    if not file_exists(target_gui_script_path) then
+        local gui_script = io.open(target_gui_script_path, "w")
+        gui_script:write(gui_script_content)
+        gui_script:close()
+
+        -- Put the gui_script path into the gui file
+        local gui_file = io.open("." .. path, "rb")
+        local gui_text = gui_file:read("*a")
+        gui_file:close()
+
+        gui_text = string.gsub(gui_text, 'script: "%.*"', [[script: "]] .. main .. basename .. ".gui_script" .. [["]])
+
+        gui_file = io.open("." .. path, "w")
+        gui_file:write(gui_text)
+        gui_file:close()
+    end
+    if not file_exists(target_gui_path) then
+        local gui_content = gui_template(path)
+        local gui = io.open(target_gui_path, "w")
+        gui:write(gui_content)
+        gui:close()
+    end
+end
+
+function M.get_commands()
+    return {
+        {
+            label="Create Monarch Scene From...",
+            locations = {"Assets"},
+            query = {
+                selection = {type = "resource", cardinality = "one"}
+            },
+            active = function(opts)
+                local path = editor.get(opts.selection, "path")
+                return ends_with(path, ".gui")
+            end,
+            run = function(opts)
+                create_files(opts.selection)
+            end
+        }
+    }
+end
+
+gui_template = function(gui_script)
+    return [[script: "]].. gui_script .. [["
+background_color {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 0.0
+}
+material: "/builtins/materials/gui.material"
+adjust_reference: ADJUST_REFERENCE_PARENT
+max_nodes: 512
+]] 
+end
+
+gui_script_content = [[local monarch = require "monarch.monarch"
+
+function init(self)
+    msg.post(".", "acquire_input_focus")
+end
+
+function final(self)
+end
+
+function update(self, dt)
+end
+
+function on_message(self, message_id, message, sender)
+end
+
+function on_input(self, action_id, action)
+end
+
+function on_reload(self)
+end
+]]
+
+
+collection_template = function(gui_script, name)
+    return [[name: "]].. name .. [["
+scale_along_z: 0
+embedded_instances {
+  id: "go"
+  data: "components {\n"
+  "  id: \"monarch\"\n"
+  "  component: \"]].. gui_script .. [[\"\n"
+  "  position {\n"
+  "    x: 0.0\n"
+  "    y: 0.0\n"
+  "    z: 0.0\n"
+  "  }\n"
+  "  rotation {\n"
+  "    x: 0.0\n"
+  "    y: 0.0\n"
+  "    z: 0.0\n"
+  "    w: 1.0\n"
+  "  }\n"
+  "}\n"
+  ""
+  position {
+      x: 0.0
+      y: 0.0
+      z: 0.0
+  }
+  rotation {
+      x: 0.0
+      y: 0.0
+      z: 0.0
+      w: 1.0
+  }
+  scale3 {
+      x: 1.0
+      y: 1.0
+      z: 1.0
+  }
+}
+]]
+
+end
+
+
+
+return M

monarch/monarch.lua

@@ -69,6 +69,16 @@ local function pcallfn(fn, ...)
 	end
 end
 
+local function assign(to, from)
+	if not from then
+		return to
+	end
+	for k, v in pairs(from) do
+		to[k] = v
+	end
+	return to
+end
+
 local function cowait(delay)
 	local co = coroutine.running()
 	assert(co, "You must run this from within a coroutine")
@@ -83,7 +93,7 @@ end
 local queue = {}
 
 local function queue_error(message)
-	log(message)
+	print(message)
 	log("queue() error - clearing queue")
 	while next(queue) do
 		table.remove(queue)
@@ -178,6 +188,17 @@ function M.is_visible(id)
 end
 
 
+--- Check if a screen is a popup
+-- @param id Screen id
+-- @return true if the screen is a popup
+function M.is_popup(id)
+	assert(id, "You must provide a screen id")
+	id = tohash(id)
+	assert(screens[id], ("There is no screen registered with id %s"):format(tostring(id)))
+	return screens[id].popup
+end
+
+
 local function register(id, settings)
 	assert(id, "You must provide a screen id")
 	id = tohash(id)
@@ -371,6 +392,13 @@ local function preload(screen)
 	screen.preloading = true
 	if screen.proxy then
 		log("preload() proxy")
+		local missing_resources = collectionproxy.missing_resources(screen.proxy)
+		if #missing_resources > 0 then
+			local error_message = ("preload() collection proxy %s is missing resources"):format(tostring(screen.id))
+			log(error_message)
+			screen.preloading = false
+			return false, error_message
+		end
 		screen.wait_for = PROXY_LOADED
 		msg.post(screen.proxy, ASYNC_LOAD)
 		coroutine.yield()
@@ -640,6 +668,10 @@ end
 -- 		* clear - Set to true if the stack should be cleared down to an existing instance of the screen
 -- 		* reload - Set to true if screen should be reloaded if it already exists in the stack and is loaded.
 --				   This would be the case if doing a show() from a popup on the screen just below the popup.
+-- 		* sequential - Set to true to wait for the previous screen to show itself out before starting the
+--				   show in transition even when transitioning to a different scene ID.
+-- 		* no_stack - Set to true to load the screen without adding it to the screen stack.
+-- 		* pop - The number of screens to pop from the stack before adding the new one.
 -- @param data (*) - Optional data to set on the screen. Can be retrieved by the data() function
 -- @param cb (function) - Optional callback to invoke when screen is shown
 function M.show(id, options, data, cb)
@@ -665,41 +697,61 @@ function M.show(id, options, data, cb)
 			local top = stack[#stack]
 			-- a screen can ignore the stack by setting the no_stack to true
 			local add_to_stack = not options or not options.no_stack
-			if add_to_stack then
+			if add_to_stack and top then
 				-- manipulate the current top
 				-- close popup(s) if needed
 				-- transition out
-				if top then
-					-- keep top popup visible if new screen can be shown on top of a popup
-					if top.popup and screen.popup_on_popup then
-						disable(top, screen)
-					else
-						-- close all popups, one by one
-						while top.popup do
-							stack[#stack] = nil
-							show_out(top, screen, callbacks.track())
-							callbacks.yield_until_done()
-							top = stack[#stack]
-						end
-						-- unload and transition out from top
-						-- wait until we are done if showing the same screen as is already visible
-						local same_screen = top and top.id == screen.id
-						show_out(top, screen, callbacks.track())
-						if same_screen then
-							callbacks.yield_until_done()
-						end
+				local pop = options and options.pop or 0
+				local is_not_popup = not screen.popup
+				local pop_all_popups = is_not_popup -- pop all popups when transitioning screens
+
+				-- keep top popup visible if new screen can be shown on top of a popup
+				if top.popup and screen.popup and screen.popup_on_popup then
+					disable(top, screen)
+				else
+					pop_all_popups = true
+				end
+
+				-- close popups, one by one, either all of them or the number specified by options.pop
+				while top and top.popup do
+					if not pop_all_popups then
+						if pop <= 0 then break end
+						pop = pop - 1
+					end
+					stack[#stack] = nil
+					show_out(top, screen, callbacks.track())
+					callbacks.yield_until_done()
+					top = stack[#stack]
+				end
+
+				-- unload the previous screen and transition out from top
+				-- wait until we are done if showing the same screen as is already visible
+				if top and not top.popup then
+					local same_screen = top and top.id == screen.id
+					show_out(top, screen, callbacks.track())
+					if same_screen or (options and options.sequential) then
+						callbacks.yield_until_done()
 					end
 				end
-			end
 
-			-- if the screen we want to show is in the stack
-			-- already and the clear flag is set then we need
-			-- to remove every screen on the stack up until and
-			-- including the screen itself
-			if options and options.clear then
-				log("show() clearing")
-				while M.in_stack(id) do
-					table.remove(stack)
+				-- if the screen we want to show is in the stack
+				-- already and the clear flag is set then we need
+				-- to remove every screen on the stack up until and
+				-- including the screen itself
+				if options and options.clear then
+					log("show() clearing")
+					while M.in_stack(id) do
+						table.remove(stack)
+					end
+				end
+
+				-- pop screens off the stack
+				if is_not_popup then
+					for i = 1, pop do
+						local stack_top = #stack
+						if stack_top < 1 then break end
+						stack[stack_top] = nil
+					end
 				end
 			end
 
@@ -725,6 +777,20 @@ function M.show(id, options, data, cb)
 end
 
 
+--- Replace the top of the stack with a new screen
+-- @param id (string|hash) - Id of the screen to show
+-- @param options (table) - Table with options when showing the screen (can be nil). Valid values:
+-- 		* clear - Set to true if the stack should be cleared down to an existing instance of the screen
+-- 		* reload - Set to true if screen should be reloaded if it already exists in the stack and is loaded.
+--				   This would be the case if doing a show() from a popup on the screen just below the popup.
+-- 		* no_stack - Set to true to load the screen without adding it to the screen stack.
+-- @param data (*) - Optional data to set on the screen. Can be retrieved by the data() function
+-- @param cb (function) - Optional callback to invoke when screen is shown
+function M.replace(id, options, data, cb)
+	return M.show(id, assign({ pop = 1 }, options), data, cb)
+end
+
+
 -- Hide a screen. The screen must either be at the top of the stack or
 -- visible but not added to the stack (through the no_stack option)
 -- @param id (string|hash) - Id of the screen to show

monarch/transitions/gui.lua

@@ -174,6 +174,7 @@ local function create()
 		if t.in_progress_count == 0 then
 			table.insert(t.urls, msg.url())
 			current_transition = t
+			current_transition.id = transition_id
 			if #t.transitions > 0 then
 				for i=1,#t.transitions do
 					local transition = t.transitions[i]
@@ -206,7 +207,7 @@ local function create()
 					transition.fn(transition.node, transition.node_data, transition.easing, 0, 0)
 				end
 				if current_transition.in_progress_count > 0 then
-					finish_transition(message_id)
+					finish_transition(current_transition.id)
 				end
 			end
 		elseif message_id == monarch.TRANSITION.SHOW_IN

monarch/utils/callback_tracker.lua

@@ -44,7 +44,10 @@ function M.create()
 	function instance.yield_until_done()
 		local co = coroutine.running()
 		callback = function()
-			coroutine.resume(co)
+			local ok, err = coroutine.resume(co)
+			if not ok then
+				print(err)
+			end
 		end
 		invoke_if_done()
 		if not is_done() then

test/msg.lua

@@ -8,9 +8,25 @@ local recipients = {}
 
 local history = {}
 
+local function url_to_key(url)
+	if type(url) == "string" then
+		url = msg.url(url)
+	end
+	local ok, err = pcall(function() return url.socket end)
+	if not ok then
+		return url
+	end
+	if url.socket then
+		return hash_to_hex(url.socket or hash("")) ..  hash_to_hex(url.path or hash("")) ..  hash_to_hex(url.fragment or hash(""))
+	else
+		return url
+	end
+end
+
 local function get_recipient(url)
-	recipients[url] = recipients[url] or {}
-	return recipients[url]
+	local key = url_to_key(url)
+	recipients[key] = recipients[key] or {}
+	return recipients[key]
 end
 
 local function post(url, message_id, message)

test/test.script

@@ -2,11 +2,13 @@ local deftest = require "deftest.deftest"
 
 local test_monarch = require "test.test_monarch"
 local test_callback_tracker = require "test.test_callback_tracker"
+local test_transitions = require "test.test_transitions"
 
 
 function init(self)
 	deftest.add(test_monarch)
 	deftest.add(test_callback_tracker)
+	deftest.add(test_transitions)
 	deftest.run({ 
 		coverage = { enabled = true },
 		pattern = "",

test/test_monarch.lua

@@ -133,6 +133,22 @@ return function()
 			assert_stack({ })
 		end)
 
+		it("should be able to replace screens at the top of the stack", function()
+			monarch.show(SCREEN1_STR)
+			assert(wait_until_shown(SCREEN1), "Screen1 was never shown")
+			assert_stack({ SCREEN1 })
+
+			monarch.show(SCREEN2)
+			assert(wait_until_hidden(SCREEN1), "Screen1 was never hidden")
+			assert(wait_until_shown(SCREEN2), "Screen2 was never shown")
+			assert_stack({ SCREEN1, SCREEN2 })
+
+			monarch.replace(SCREEN1)
+			assert(wait_until_hidden(SCREEN2), "Screen2 was never hidden")
+			assert(wait_until_shown(SCREEN1), "Screen1 was never shown")
+			assert_stack({ SCREEN1, SCREEN1 })
+		end)
+
 		it("should be able to tell if a screen is visible or not", function()
 			assert(not monarch.is_visible(SCREEN1))
 			monarch.show(SCREEN1)
@@ -302,6 +318,59 @@ return function()
 			assert_stack({ SCREEN1, SCREEN2 })
 		end)
 
+		it("should close any open popups when replacing a non-popup", function()
+			monarch.show(SCREEN1)
+			assert(wait_until_shown(SCREEN1), "Screen1 was never shown")
+			assert_stack({ SCREEN1 })
+			monarch.show(POPUP1)
+			assert(wait_until_shown(POPUP1), "Popup1 was never shown")
+			assert_stack({ SCREEN1, POPUP1 })
+			monarch.show(POPUP2)
+			assert(wait_until_shown(POPUP2), "Popup2 was never shown")
+			assert_stack({ SCREEN1, POPUP1, POPUP2 })
+			monarch.replace(SCREEN2)
+			assert(wait_until_shown(SCREEN2), "Screen2 was never shown")
+			assert_stack({ SCREEN2 })
+		end)
+
+		it("should replace a popup", function()
+			monarch.show(SCREEN1)
+			assert(wait_until_shown(SCREEN1), "Screen1 was never shown")
+			assert_stack({ SCREEN1 })
+			monarch.show(POPUP1)
+			assert(wait_until_shown(POPUP1), "Popup1 was never shown")
+			assert_stack({ SCREEN1, POPUP1 })
+			monarch.replace(POPUP2)
+			assert(wait_until_shown(POPUP2), "Popup2 was never shown")
+			assert_stack({ SCREEN1, POPUP2 })
+		end)
+
+		it("should replace a pop-up two levels down", function()
+			monarch.show(SCREEN1)
+			assert(wait_until_shown(SCREEN1), "Screen1 was never shown")
+			assert_stack({ SCREEN1 })
+			monarch.show(POPUP1)
+			assert(wait_until_shown(POPUP1), "Popup1 was never shown")
+			assert_stack({ SCREEN1, POPUP1 })
+			monarch.show(POPUP2)
+			assert(wait_until_shown(POPUP2), "Popup2 was never shown")
+			assert_stack({ SCREEN1, POPUP1, POPUP2 })
+			monarch.show(POPUP2, { pop = 2 })
+			assert(wait_until_shown(POPUP2), "Popup2 was never shown")
+			assert_stack({ SCREEN1, POPUP2 })
+		end)
+
+		it("shouldn't over-pop popups", function()
+			monarch.show(SCREEN1)
+			assert(wait_until_shown(SCREEN1), "Screen1 was never shown")
+			assert_stack({ SCREEN1 })
+			monarch.show(POPUP1)
+			assert(wait_until_shown(POPUP1), "Popup1 was never shown")
+			assert_stack({ SCREEN1, POPUP1 })
+			monarch.show(POPUP2, { pop = 10 })
+			assert(wait_until_shown(POPUP2), "Popup2 was never shown")
+			assert_stack({ SCREEN1, POPUP2 })
+		end)
 
 		it("should be able to get the id of the screen at the top and bottom of the stack", function()
 			assert(monarch.top() == nil)
@@ -503,5 +572,11 @@ return function()
 			local ok, err = monarch.post(POPUP1, "foobar")
 			assert(not ok and err, "Expected monarch.post() to return false plus an error message")
 		end)
+
+
+		it("should be able to check if a screen is is a popup", function()
+			assert(not monarch.is_popup(SCREEN1))
+			assert(monarch.is_popup(POPUP1))
+		end)
 	end)
 end

test/test_transitions.lua

@@ -0,0 +1,46 @@
+local cowait = require "test.cowait"
+local mock_msg = require "test.msg"
+local mock_gui = require "deftest.mock.gui"
+local unload = require "deftest.util.unload"
+local monarch = require "monarch.monarch"
+local transitions = require "monarch.transitions.gui"
+local easing = require "monarch.transitions.easings"
+
+return function()
+
+describe("transitions", function()
+	before(function()
+		mock_msg.mock()
+		mock_gui.mock()
+		transitions = require "monarch.transitions.gui"
+	end)
+
+	after(function()
+		mock_msg.unmock()
+		mock_gui.unmock()
+		unload.unload("monarch%..*")
+	end)
+
+
+	it("should replay and immediately finish on layout change", function()
+		function dummy_transition(node, to, easing, duration, delay, cb)
+			print("dummy transition")
+		end
+
+		local node = gui.new_box_node(vmath.vector3(), vmath.vector3(100, 100, 0))
+		local duration = 2
+		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)
+		.back_in(dummy_transition, easing.OUT, duration, delay or 0)
+		.back_out(dummy_transition, easing.IN, duration, delay or 0)
+
+		t.handle(monarch.TRANSITION.SHOW_IN)
+		t.handle(hash("layout_changed"))
+		local messages = mock_msg.messages(msg.url())
+		assert(#messages == 1, "Expected one message to have been received")
+		assert(messages[1].message_id == monarch.TRANSITION.DONE, "Expected a TRANSITION.DONE message")
+	end)
+end)
+
+end