This commit is contained in:
2021-09-02 19:56:28 +02:00
parent 9a1c6d95b8
commit 319b85c552
8 changed files with 244 additions and 5 deletions

View File

@@ -0,0 +1,40 @@
from Objects.Multiscene import Multiscene
from Scenes.BasicScene import BasicScene
from Objects.r_objects import *
from numpy import array as a
from UI.Objects.nr_objects.Line import Line
class BasicMultiscene(Multiscene):
def __init__(self, scene_size):
self.s__size = [600, 400]
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.i = 0
def progress(self):
if self.i == 1:
self.subscenes[0].subscene_size[0] += 1
self.subscenes[1].subscene_size[0] -= 1
self.subscenes[1].position[0] += 1
self.nr_objects[0].a[0] += 1
self.nr_objects[0].b[0] += 1
self.resize_subscenes()
self.i = 0
else:
self.i += 1

View File

@@ -1,10 +1,10 @@
from Objects.Scene import Scene
from Objects.r_objects import *
from numpy import array as a
import numpy as np
from UI.Objects.nr_objects.Ellipse import Ellipse
from UI.Objects.nr_objects.Circle import Circle
from UI.Objects.nr_objects.EquilateralTriangle import EquilateralTriangle
from UI.Objects.nr_objects.Image import Image
from UI.Objects.nr_objects.Line import Line
from UI.Objects.nr_objects.Text import Text
@@ -14,9 +14,9 @@ from UI.Objects.r_objects.Rect import Rect
class BasicScene(Scene):
def __init__(self, scene_size: a, bg=(60, 60, 60)):
s__size = [600, 400]
self.s__size = [600, 400]
super().__init__(s__size[0], s__size[1], scene_size, bg)
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)
@@ -35,3 +35,6 @@ class BasicScene(Scene):
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)

View File

@@ -0,0 +1,42 @@
from Objects.Multiscene import Multiscene
from Scenes.BasicMultiscene import BasicMultiscene
from numpy import array as a
from UI.Objects.nr_objects.Line import Line
class MultisceneInMultiscene(Multiscene):
def __init__(self, scene_size):
self.s__size = [600, 800]
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.i = 0
def progress(self):
self.progress_subscenes()
if self.i == 1:
self.subscenes[0].subscene_size[1] += 1
self.subscenes[1].subscene_size[1] -= 1
self.subscenes[1].position[1] += 1
self.nr_objects[0].a[1] += 1
self.nr_objects[0].b[1] += 1
self.resize_subscenes()
self.i = 0
else:
self.i += 1