_

UI/Scenes/BasicMultiscene.py

@@ -13,14 +13,13 @@ class BasicMultiscene(Multiscene):
         super().__init__(self.s__size[0], self.s__size[1], scene_size)
 
         s0 = BasicScene([200, 400])
-        self.subscenes.append(s0)
 
         s1 = BasicScene([400, 400])
         s1.position = a([200, 0])
-        self.subscenes.append(s1)
 
         l0 = Line(a([200, 0]), a([200, 400]), 10, (255, 100, 100), self)
-        self.nr_objects.append(l0)
+
+        self.sort_objects(s0, s1, l0)
 
         self.i = 0
 

UI/Scenes/BasicScene.py

@@ -18,22 +18,17 @@ class BasicScene(Scene):
         super().__init__(self.s__size[0], self.s__size[1], scene_size, bg)
 
         r0 = Rect(a([0, 0]), a([200, 200]), (160, 160, 160), self)
-        self.r_objects.append(r0)
 
         l0 = Line(a([100, 300]), a([500, 100]), 3, (255, 100, 100), self)
-        self.nr_objects.append(l0)
 
         c0 = Circle(a([400, 200]), 40, (100, 100, 255), self)
-        self.nr_objects.append(c0)
 
         e0 = Ellipse(a([150, 360]), 60, 20, (100, 255, 100), self)
-        self.nr_objects.append(e0)
 
         t0 = Text(a([100, 50]), "hello world!", 26, (200, 200, 200), self)
-        self.nr_objects.append(t0)
 
         i0 = Image(a([200, 0]), 0.8, "test.png", self)
-        self.nr_objects.append(i0)
 
-        t0 = EquilateralTriangle(a([500, 300]), 30, 1, (250, 250, 150), self)
-        self.nr_objects.append(t0)
+        triangle0 = EquilateralTriangle(a([500, 300]), 30, 1, (250, 250, 150), self)
+
+        self.sort_objects(r0, l0, c0, e0, t0, i0, triangle0)

UI/Scenes/MultisceneInMultiscene.py

@@ -12,14 +12,13 @@ class MultisceneInMultiscene(Multiscene):
         super().__init__(self.s__size[0], self.s__size[1], scene_size)
 
         ms0 = BasicMultiscene([600, 400])
-        self.subscenes.append(ms0)
 
         ms1 = BasicMultiscene([600, 400])
         ms1.position = a([0, 400])
-        self.subscenes.append(ms1)
 
         l0 = Line(a([0, 400]), a([600, 400]), 12, (100, 100, 255), self)
-        self.nr_objects.append(l0)
+
+        self.sort_objects(ms0, ms1, l0)
 
         self.i = 0
 

UI/Scenes/RopeMultiscene.py

@@ -14,18 +14,17 @@ class RopeMultiscene(Multiscene):
         super().__init__(self.s__size[0], self.s__size[1], scene_size)
 
         s0 = RopeScene([200, 400])
-        self.subscenes.append(s0)
 
         s1 = RopeScene([600, 400])
         s1.position = a([200, 0])
-        self.subscenes.append(s1)
 
         l0 = Line(a([200, 0]), a([200, 400]), 10, (255, 100, 100), self)
-        self.nr_objects.append(l0)
 
         rd0 = RopeInteractiveDot(a([0, 0]), 10, (100, 255, 100), 20, 100, self)
         #self.nrc_objects.append(rd0)
 
+        self.sort_objects(s0, s1, l0)
+
         self.i = 0
 
     def progress(self):

UI/Scenes/RopeScene.py

@@ -14,10 +14,9 @@ class RopeScene(Scene):
         super().__init__(self.s__size[0], self.s__size[1], scene_size, bg)
 
         r0 = Rope(a([300, 50]), 200, 20, 2, 2, self)
-        self.nrd_objects.append(r0)
-        self.i_objects.append(r0)
 
         rd0 = RopeInteractiveDot(a([0, 0]), 10, (100, 255, 100), 20, 100, self)
-        self.nrc_objects.append(rd0)
+
+        self.sort_objects(r0, rd0)
 
         pygame.mouse.set_visible(False)