diff --git a/.gitignore b/.gitignore index 17172a7..2a4bc99 100644 --- a/.gitignore +++ b/.gitignore @@ -129,4 +129,4 @@ dmypy.json # Pyre type checker .pyre/ -UI/Render \ No newline at end of file +GUI/Render \ No newline at end of file diff --git a/UI/App.py b/App.py similarity index 100% rename from UI/App.py rename to App.py diff --git a/UI/Objects/Multiscene.py b/GUI/Objects/Multiscene.py similarity index 98% rename from UI/Objects/Multiscene.py rename to GUI/Objects/Multiscene.py index d964a76..b334749 100644 --- a/UI/Objects/Multiscene.py +++ b/GUI/Objects/Multiscene.py @@ -2,7 +2,7 @@ import copy import math import pygame from numpy import array as a -from UI.Objects.Scene import Scene +from GUI.Objects.Scene import Scene class Multiscene(Scene): diff --git a/UI/Objects/Scene.py b/GUI/Objects/Scene.py similarity index 98% rename from UI/Objects/Scene.py rename to GUI/Objects/Scene.py index 7104c2e..2d3e10c 100644 --- a/UI/Objects/Scene.py +++ b/GUI/Objects/Scene.py @@ -1,5 +1,5 @@ import pygame.transform -from UI.Objects.Screen import Screen +from GUI.Objects.Screen import Screen from numpy import array as a import numpy as np diff --git a/UI/Objects/Screen.py b/GUI/Objects/Screen.py similarity index 100% rename from UI/Objects/Screen.py rename to GUI/Objects/Screen.py diff --git a/UI/Objects/nr_objects/Circle.py b/GUI/Objects/nr_objects/Circle.py similarity index 100% rename from UI/Objects/nr_objects/Circle.py rename to GUI/Objects/nr_objects/Circle.py diff --git a/UI/Objects/nr_objects/Ellipse.py b/GUI/Objects/nr_objects/Ellipse.py similarity index 100% rename from UI/Objects/nr_objects/Ellipse.py rename to GUI/Objects/nr_objects/Ellipse.py diff --git a/UI/Objects/nr_objects/EquilateralTriangle.py b/GUI/Objects/nr_objects/EquilateralTriangle.py similarity index 100% rename from UI/Objects/nr_objects/EquilateralTriangle.py rename to GUI/Objects/nr_objects/EquilateralTriangle.py diff --git a/UI/Objects/nr_objects/Image.py b/GUI/Objects/nr_objects/Image.py similarity index 100% rename from UI/Objects/nr_objects/Image.py rename to GUI/Objects/nr_objects/Image.py diff --git a/UI/Objects/nr_objects/Line.py b/GUI/Objects/nr_objects/Line.py similarity index 100% rename from UI/Objects/nr_objects/Line.py rename to GUI/Objects/nr_objects/Line.py diff --git a/UI/Objects/nr_objects/Text.py b/GUI/Objects/nr_objects/Text.py similarity index 100% rename from UI/Objects/nr_objects/Text.py rename to GUI/Objects/nr_objects/Text.py diff --git a/UI/Objects/nr_objects/controllable_objects/RopeInteractiveDot.py b/GUI/Objects/nr_objects/controllable_objects/RopeInteractiveDot.py similarity index 100% rename from UI/Objects/nr_objects/controllable_objects/RopeInteractiveDot.py rename to GUI/Objects/nr_objects/controllable_objects/RopeInteractiveDot.py diff --git a/UI/Objects/nr_objects/dynamic_objects/Rope.py b/GUI/Objects/nr_objects/dynamic_objects/Rope.py similarity index 100% rename from UI/Objects/nr_objects/dynamic_objects/Rope.py rename to GUI/Objects/nr_objects/dynamic_objects/Rope.py diff --git a/UI/Objects/nr_objects/light_objects/LuminousCircleEffect.py b/GUI/Objects/nr_objects/light_objects/LuminousCircleEffect.py similarity index 100% rename from UI/Objects/nr_objects/light_objects/LuminousCircleEffect.py rename to GUI/Objects/nr_objects/light_objects/LuminousCircleEffect.py diff --git a/UI/Objects/r_objects/Rect.py b/GUI/Objects/r_objects/Rect.py similarity index 100% rename from UI/Objects/r_objects/Rect.py rename to GUI/Objects/r_objects/Rect.py diff --git a/UI/Scenes/Sample_Scenes/BasicMultiscene.py b/GUI/Sample_Scenes/BasicMultiscene.py similarity index 84% rename from UI/Scenes/Sample_Scenes/BasicMultiscene.py rename to GUI/Sample_Scenes/BasicMultiscene.py index 0952bb0..74b7211 100644 --- a/UI/Scenes/Sample_Scenes/BasicMultiscene.py +++ b/GUI/Sample_Scenes/BasicMultiscene.py @@ -1,8 +1,8 @@ -from UI.Objects.Multiscene import Multiscene -from UI.Scenes.Sample_Scenes.BasicScene import BasicScene +from GUI.Objects.Multiscene import Multiscene +from GUI.Sample_Scenes.BasicScene import BasicScene from numpy import array as a -from UI.Objects.nr_objects.Line import Line +from GUI.Objects.nr_objects.Line import Line class BasicMultiscene(Multiscene): diff --git a/UI/Scenes/Sample_Scenes/BasicScene.py b/GUI/Sample_Scenes/BasicScene.py similarity index 61% rename from UI/Scenes/Sample_Scenes/BasicScene.py rename to GUI/Sample_Scenes/BasicScene.py index 8367a85..28b637b 100644 --- a/UI/Scenes/Sample_Scenes/BasicScene.py +++ b/GUI/Sample_Scenes/BasicScene.py @@ -1,13 +1,13 @@ -from UI.Objects.Scene import Scene +from GUI.Objects.Scene import Scene from numpy import array as a -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 -from UI.Objects.r_objects.Rect import Rect +from GUI.Objects.nr_objects.Ellipse import Ellipse +from GUI.Objects.nr_objects.Circle import Circle +from GUI.Objects.nr_objects.EquilateralTriangle import EquilateralTriangle +from GUI.Objects.nr_objects.Image import Image +from GUI.Objects.nr_objects.Line import Line +from GUI.Objects.nr_objects.Text import Text +from GUI.Objects.r_objects.Rect import Rect class BasicScene(Scene): @@ -27,7 +27,7 @@ class BasicScene(Scene): t0 = Text(a([100, 50]), "hello world!", 26, (200, 200, 200), self) - i0 = Image(a([200, 0]), 0.8, "test.png", self) + i0 = Image(a([200, 0]), 0.8, "sample_image.png", self) triangle0 = EquilateralTriangle(a([500, 300]), 30, 1, (250, 250, 150), self) diff --git a/UI/Scenes/Sample_Scenes/LuminousCircleEffectMultiscene.py b/GUI/Sample_Scenes/LuminousCircleEffectMultiscene.py similarity index 79% rename from UI/Scenes/Sample_Scenes/LuminousCircleEffectMultiscene.py rename to GUI/Sample_Scenes/LuminousCircleEffectMultiscene.py index 8b85798..15c66ae 100644 --- a/UI/Scenes/Sample_Scenes/LuminousCircleEffectMultiscene.py +++ b/GUI/Sample_Scenes/LuminousCircleEffectMultiscene.py @@ -1,9 +1,9 @@ -from UI.Objects.Multiscene import Multiscene -from UI.Objects.nr_objects.light_objects.LuminousCircleEffect import LuminousCircleEffect -from UI.Scenes.Sample_Scenes.LuminousCircleEffectScene import LuminousCircleEffectScene +from GUI.Objects.Multiscene import Multiscene +from GUI.Objects.nr_objects.light_objects.LuminousCircleEffect import LuminousCircleEffect +from GUI.Sample_Scenes.LuminousCircleEffectScene import LuminousCircleEffectScene from numpy import array as a -from UI.Objects.nr_objects.Line import Line +from GUI.Objects.nr_objects.Line import Line class LuminousCircleEffectMultiscene(Multiscene): diff --git a/UI/Scenes/Sample_Scenes/LuminousCircleEffectScene.py b/GUI/Sample_Scenes/LuminousCircleEffectScene.py similarity index 72% rename from UI/Scenes/Sample_Scenes/LuminousCircleEffectScene.py rename to GUI/Sample_Scenes/LuminousCircleEffectScene.py index 77f9fcb..4565b7a 100644 --- a/UI/Scenes/Sample_Scenes/LuminousCircleEffectScene.py +++ b/GUI/Sample_Scenes/LuminousCircleEffectScene.py @@ -1,7 +1,7 @@ -from UI.Objects.Scene import Scene +from GUI.Objects.Scene import Scene from numpy import array as a -from UI.Objects.nr_objects.light_objects.LuminousCircleEffect import LuminousCircleEffect +from GUI.Objects.nr_objects.light_objects.LuminousCircleEffect import LuminousCircleEffect class LuminousCircleEffectScene(Scene): diff --git a/UI/Scenes/Sample_Scenes/MultisceneInMultiscene.py b/GUI/Sample_Scenes/MultisceneInMultiscene.py similarity index 85% rename from UI/Scenes/Sample_Scenes/MultisceneInMultiscene.py rename to GUI/Sample_Scenes/MultisceneInMultiscene.py index f74c3bb..9d8f22f 100644 --- a/UI/Scenes/Sample_Scenes/MultisceneInMultiscene.py +++ b/GUI/Sample_Scenes/MultisceneInMultiscene.py @@ -1,8 +1,8 @@ -from UI.Objects.Multiscene import Multiscene -from UI.Scenes.Sample_Scenes.BasicMultiscene import BasicMultiscene +from GUI.Objects.Multiscene import Multiscene +from GUI.Sample_Scenes.BasicMultiscene import BasicMultiscene from numpy import array as a -from UI.Objects.nr_objects.Line import Line +from GUI.Objects.nr_objects.Line import Line class MultisceneInMultiscene(Multiscene): diff --git a/UI/Scenes/Sample_Scenes/RopeMultiscene.py b/GUI/Sample_Scenes/RopeMultiscene.py similarity index 85% rename from UI/Scenes/Sample_Scenes/RopeMultiscene.py rename to GUI/Sample_Scenes/RopeMultiscene.py index af7c552..1a3aba9 100644 --- a/UI/Scenes/Sample_Scenes/RopeMultiscene.py +++ b/GUI/Sample_Scenes/RopeMultiscene.py @@ -1,8 +1,8 @@ from numpy import array as a -from UI.Objects.Multiscene import Multiscene -from UI.Objects.nr_objects.Line import Line -from UI.Scenes.Sample_Scenes.RopeScene import RopeScene +from GUI.Objects.Multiscene import Multiscene +from GUI.Objects.nr_objects.Line import Line +from GUI.Sample_Scenes.RopeScene import RopeScene class RopeMultiscene(Multiscene): diff --git a/UI/Scenes/Sample_Scenes/RopeScene.py b/GUI/Sample_Scenes/RopeScene.py similarity index 70% rename from UI/Scenes/Sample_Scenes/RopeScene.py rename to GUI/Sample_Scenes/RopeScene.py index 09e547a..a00ecc2 100644 --- a/UI/Scenes/Sample_Scenes/RopeScene.py +++ b/GUI/Sample_Scenes/RopeScene.py @@ -1,9 +1,9 @@ -from UI.Objects.Scene import Scene +from GUI.Objects.Scene import Scene from numpy import array as a import pygame -from UI.Objects.nr_objects.dynamic_objects.Rope import Rope -from UI.Objects.nr_objects.controllable_objects.RopeInteractiveDot import RopeInteractiveDot +from GUI.Objects.nr_objects.dynamic_objects.Rope import Rope +from GUI.Objects.nr_objects.controllable_objects.RopeInteractiveDot import RopeInteractiveDot class RopeScene(Scene): diff --git a/UI/light_update_sample.py b/GUI/light_update_sample.py similarity index 53% rename from UI/light_update_sample.py rename to GUI/light_update_sample.py index 8085c68..b0215e9 100644 --- a/UI/light_update_sample.py +++ b/GUI/light_update_sample.py @@ -1,9 +1,7 @@ from numpy import array as a import time -from UI.Scenes.Sample_Scenes.LuminousCircleEffectMultiscene import LuminousCircleEffectMultiscene -from UI.Scenes.Sample_Scenes.LuminousCircleEffectScene import LuminousCircleEffectScene - +from GUI.Sample_Scenes.LuminousCircleEffectMultiscene import LuminousCircleEffectMultiscene screen_size = a([1000, 800]) scene = LuminousCircleEffectMultiscene(screen_size) diff --git a/UI/main.py b/GUI/main.py similarity index 53% rename from UI/main.py rename to GUI/main.py index 6661561..461c074 100644 --- a/UI/main.py +++ b/GUI/main.py @@ -1,15 +1,12 @@ import pygame.mouse -from UI.Scenes.Sample_Scenes.BasicMultiscene import BasicMultiscene -from UI.Scenes.Sample_Scenes.BasicScene import BasicScene -from UI.Scenes.Sample_Scenes.LuminousCircleEffectMultiscene import LuminousCircleEffectMultiscene -from UI.Scenes.Sample_Scenes.LuminousCircleEffectScene import LuminousCircleEffectScene - from numpy import array as a import time +from GUI.Sample_Scenes.BasicScene import BasicScene + screen_size = a([200, 500]) -scene = LuminousCircleEffectMultiscene(screen_size) +scene = BasicScene(screen_size) mouse_pos = [0, 0] clicked = False @@ -19,7 +16,6 @@ for i in range(400): scene.update() scene.update_mouse_events(pygame.mouse.get_pos(), pygame.mouse.get_pressed(3)[0]) scene.progress() - #scene.save(f"Render/{i}.png", [800, 800]) if i < 150: screen_size[0] += 3 diff --git a/GUI/sample_image.png b/GUI/sample_image.png new file mode 100644 index 0000000..729adda Binary files /dev/null and b/GUI/sample_image.png differ diff --git a/UI/test.png b/GUI/test.png~ similarity index 100% rename from UI/test.png rename to GUI/test.png~