Base implementation of global transform

make camera and show layer at accept None as a layer
2023-06-23 22:41:27 +02:00 · 2023-06-23 22:38:40 +02:00
2 changed files with 14 additions and 2 deletions
@@ -935,6 +935,9 @@ class SceneLists(renpy.object.Object):
            if i not in self.camera_list:
                self.camera_list[i] = (None, [ ])

+        self.layer_at_list.setdefault(None, (None, [ ]))
+        self.camera_list.setdefault(None, (None, [ ]))
+
    def after_upgrade(self, version):

        if version < 1:
@@ -1050,6 +1053,9 @@ class SceneLists(renpy.object.Object):
            self.music = None
            self.focused = None

+        self.layer_at_list[None] = (None, [ ])
+        self.camera_list[None] = (None, [ ])
+
    def replace_transient(self, prefix="hide"): # type: (str|None) -> None
        """
        Replaces the contents of the transient display list with
@@ -3970,7 +3976,7 @@ class Interface(object):
                old_root.layers[layer] = d
                old_root.add(d)

-            trans = instantiate_transition(None, old_root, layers_root)
+            trans = instantiate_transition(None, old_root, renpy.defaultstore.At(layers_root, *scene_lists.layer_at_list[None][1], *scene_lists.camera_list[None][1]))

            if not isinstance(trans, Displayable):
                raise Exception("Expected transition to return a displayable, not a {!r}".format(trans))
@@ -3996,7 +4002,7 @@ class Interface(object):
                focus_roots.append(pb)

        else:
-            root_widget.add(layers_root)
+            root_widget.add(renpy.defaultstore.At(layers_root, *scene_lists.layer_at_list[None][1], *scene_lists.camera_list[None][1]))

        # Add top_layers to the root_widget.
        for layer in renpy.config.top_layers:
@@ -842,6 +842,9 @@ def show_layer_statement(l, loc):

    layer = l.require(l.name)

+    if layer == "None":
+        layer = None
+
    if l.keyword("at"):
        at_list = parse_simple_expression_list(l)
    else:
@@ -866,6 +869,9 @@ def camera_statement(l, loc):

    layer = l.name() or 'master'

+    if layer == "None":
+        layer = None
+
    if l.keyword("at"):
        at_list = parse_simple_expression_list(l)
    else:
Author	SHA1	Message	Date
Gouvernathor	cf38e9d2c3	Base implementation of global transform	2023-06-23 22:41:27 +02:00
Gouvernathor	24fb0e7f46	make camera and show layer at accept None as a layer	2023-06-23 22:38:40 +02:00