From f38f624a3b3b2f49aa185809419cd94c4fc5d587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ritzl?= Date: Fri, 11 Jan 2019 06:52:57 +0100 Subject: [PATCH] Moved the popup inside the menu to test how nested screens work --- example/example.collection | 107 +++++-------------------------------- example/menu.collection | 78 +++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 95 deletions(-) diff --git a/example/example.collection b/example/example.collection index c8b4ff7..e0f85b7 100644 --- a/example/example.collection +++ b/example/example.collection @@ -3,8 +3,8 @@ scale_along_z: 0 embedded_instances { id: "menu" data: "components {\n" - " id: \"screen\"\n" - " component: \"/monarch/screen_proxy.script\"\n" + " id: \"screen_factory\"\n" + " component: \"/monarch/screen_factory.script\"\n" " position {\n" " x: 0.0\n" " y: 0.0\n" @@ -22,26 +22,21 @@ embedded_instances { " type: PROPERTY_TYPE_HASH\n" " }\n" " properties {\n" - " id: \"timestep_below_popup\"\n" - " value: \"0.0\"\n" - " type: PROPERTY_TYPE_NUMBER\n" + " id: \"transition_id\"\n" + " value: \"/go\"\n" + " type: PROPERTY_TYPE_HASH\n" " }\n" " properties {\n" - " id: \"transition_url\"\n" - " value: \"menu:/go#menu\"\n" - " type: PROPERTY_TYPE_URL\n" - " }\n" - " properties {\n" - " id: \"focus_url\"\n" - " value: \"menu:/go#menu\"\n" - " type: PROPERTY_TYPE_URL\n" + " id: \"focus_id\"\n" + " value: \"/go\"\n" + " type: PROPERTY_TYPE_HASH\n" " }\n" "}\n" "embedded_components {\n" - " id: \"collectionproxy\"\n" - " type: \"collectionproxy\"\n" - " data: \"collection: \\\"/example/menu.collection\\\"\\n" - "exclude: false\\n" + " id: \"collectionfactory\"\n" + " type: \"collectionfactory\"\n" + " data: \"prototype: \\\"/example/menu.collection\\\"\\n" + "load_dynamically: true\\n" "\"\n" " position {\n" " x: 0.0\n" @@ -249,84 +244,6 @@ embedded_instances { z: 1.0 } } -embedded_instances { - id: "popup" - data: "components {\n" - " id: \"screen\"\n" - " component: \"/monarch/screen_factory.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" - " properties {\n" - " id: \"screen_id\"\n" - " value: \"popup\"\n" - " type: PROPERTY_TYPE_HASH\n" - " }\n" - " properties {\n" - " id: \"popup\"\n" - " value: \"true\"\n" - " type: PROPERTY_TYPE_BOOLEAN\n" - " }\n" - " properties {\n" - " id: \"popup_on_popup\"\n" - " value: \"true\"\n" - " type: PROPERTY_TYPE_BOOLEAN\n" - " }\n" - " properties {\n" - " id: \"transition_id\"\n" - " value: \"/go\"\n" - " type: PROPERTY_TYPE_HASH\n" - " }\n" - " properties {\n" - " id: \"focus_id\"\n" - " value: \"/go\"\n" - " type: PROPERTY_TYPE_HASH\n" - " }\n" - "}\n" - "embedded_components {\n" - " id: \"collectionfactory\"\n" - " type: \"collectionfactory\"\n" - " data: \"prototype: \\\"/example/popup.collection\\\"\\n" - "load_dynamically: false\\n" - "\"\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 - } -} embedded_instances { id: "about" data: "components {\n" diff --git a/example/menu.collection b/example/menu.collection index fe2aa46..5dac0e8 100644 --- a/example/menu.collection +++ b/example/menu.collection @@ -35,3 +35,81 @@ embedded_instances { z: 1.0 } } +embedded_instances { + id: "popup" + data: "components {\n" + " id: \"screen\"\n" + " component: \"/monarch/screen_factory.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" + " properties {\n" + " id: \"screen_id\"\n" + " value: \"popup\"\n" + " type: PROPERTY_TYPE_HASH\n" + " }\n" + " properties {\n" + " id: \"popup\"\n" + " value: \"true\"\n" + " type: PROPERTY_TYPE_BOOLEAN\n" + " }\n" + " properties {\n" + " id: \"popup_on_popup\"\n" + " value: \"true\"\n" + " type: PROPERTY_TYPE_BOOLEAN\n" + " }\n" + " properties {\n" + " id: \"transition_id\"\n" + " value: \"/go\"\n" + " type: PROPERTY_TYPE_HASH\n" + " }\n" + " properties {\n" + " id: \"focus_id\"\n" + " value: \"/go\"\n" + " type: PROPERTY_TYPE_HASH\n" + " }\n" + "}\n" + "embedded_components {\n" + " id: \"collectionfactory\"\n" + " type: \"collectionfactory\"\n" + " data: \"prototype: \\\"/example/popup.collection\\\"\\n" + "load_dynamically: false\\n" + "\"\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 + } +}