From 404a11ea75bad23b2fbc047beaf6747eaa1cf494 Mon Sep 17 00:00:00 2001 From: Flavio Calva Date: Thu, 9 Jun 2022 09:01:44 +0200 Subject: [PATCH] Revert "entities component" This reverts commit 78589fb12fc2650dcb4f1b3c5094e5d263d61574. --- {entities => game}/__init__.py | 0 {entities => game}/app.py | 24 +++++++++---------- {entities => game}/items/__init__.py | 0 {entities => game}/items/background.py | 0 {entities => game}/items/basketball.py | 2 +- {entities => game}/items/box.py | 2 +- {entities => game}/items/domino.py | 2 +- {entities => game}/items/item.py | 0 {entities => game}/items/shelf.py | 2 +- {entities => game}/items/teetertooter.py | 2 +- {entities => game}/menu.py | 2 +- {entities => game}/music.py | 0 {entities => game}/scene.py | 4 ++-- {entities => game}/scenes/__init__.py | 0 {entities => game}/scenes/scene_basketball.py | 12 +++++----- {entities => game}/scenes/scene_box.py | 12 +++++----- {entities => game}/scenes/scene_domino.py | 12 +++++----- {entities => game}/scenes/scene_domino_box.py | 12 +++++----- .../scenes/scene_domino_box_basketball.py | 12 +++++----- .../scene_teeter_domino_box_basketball.py | 12 +++++----- .../scenes/scene_teeter_tooter.py | 12 +++++----- {entities => game}/sidepanel.py | 0 main/main.py | 2 +- setup.py | 2 +- ya2/build/screenshots.py | 2 +- 25 files changed, 65 insertions(+), 65 deletions(-) rename {entities => game}/__init__.py (100%) rename {entities => game}/app.py (93%) rename {entities => game}/items/__init__.py (100%) rename {entities => game}/items/background.py (100%) rename {entities => game}/items/basketball.py (93%) rename {entities => game}/items/box.py (96%) rename {entities => game}/items/domino.py (95%) rename {entities => game}/items/item.py (100%) rename {entities => game}/items/shelf.py (93%) rename {entities => game}/items/teetertooter.py (96%) rename {entities => game}/menu.py (99%) rename {entities => game}/music.py (100%) rename {entities => game}/scene.py (99%) rename {entities => game}/scenes/__init__.py (100%) rename {entities => game}/scenes/scene_basketball.py (94%) rename {entities => game}/scenes/scene_box.py (91%) rename {entities => game}/scenes/scene_domino.py (90%) rename {entities => game}/scenes/scene_domino_box.py (93%) rename {entities => game}/scenes/scene_domino_box_basketball.py (91%) rename {entities => game}/scenes/scene_teeter_domino_box_basketball.py (94%) rename {entities => game}/scenes/scene_teeter_tooter.py (92%) rename {entities => game}/sidepanel.py (100%) diff --git a/entities/__init__.py b/game/__init__.py similarity index 100% rename from entities/__init__.py rename to game/__init__.py diff --git a/entities/app.py b/game/app.py similarity index 93% rename from entities/app.py rename to game/app.py index a01e558..ac75b5c 100755 --- a/entities/app.py +++ b/game/app.py @@ -14,17 +14,17 @@ from panda3d.bullet import BulletWorld, BulletDebugNode from direct.showbase.ShowBase import ShowBase from direct.gui.OnscreenText import OnscreenText from direct.fsm.FSM import FSM -from entities.music import MusicMgr -from entities.items.background import Background -from entities.menu import Menu -from entities.scene import Scene -from entities.scenes.scene_basketball import SceneBasketBall -from entities.scenes.scene_box import SceneBox -from entities.scenes.scene_domino_box_basketball import SceneDominoBoxBasketball -from entities.scenes.scene_domino_box import SceneDominoBox -from entities.scenes.scene_domino import SceneDomino -from entities.scenes.scene_teeter_domino_box_basketball import SceneTeeterDominoBoxBasketball -from entities.scenes.scene_teeter_tooter import SceneTeeterTooter +from game.music import MusicMgr +from game.items.background import Background +from game.menu import Menu +from game.scene import Scene +from game.scenes.scene_basketball import SceneBasketBall +from game.scenes.scene_box import SceneBox +from game.scenes.scene_domino_box_basketball import SceneDominoBoxBasketball +from game.scenes.scene_domino_box import SceneDominoBox +from game.scenes.scene_domino import SceneDomino +from game.scenes.scene_teeter_domino_box_basketball import SceneTeeterDominoBoxBasketball +from game.scenes.scene_teeter_tooter import SceneTeeterTooter from ya2.dictfile import DctFile from ya2.lib.p3d.p3d import LibP3d from ya2.engine.lang import LangMgr @@ -89,7 +89,7 @@ class PmachinesApp: scene.destroy() exit() elif self._options['development']['auto_start']: - mod_name = 'entities.scenes.scene_' + self._options['development']['auto_start'] + mod_name = 'game.scenes.scene_' + self._options['development']['auto_start'] for member in import_module(mod_name).__dict__.values(): if isclass(member) and issubclass(member, Scene) and \ member != Scene: diff --git a/entities/items/__init__.py b/game/items/__init__.py similarity index 100% rename from entities/items/__init__.py rename to game/items/__init__.py diff --git a/entities/items/background.py b/game/items/background.py similarity index 100% rename from entities/items/background.py rename to game/items/background.py diff --git a/entities/items/basketball.py b/game/items/basketball.py similarity index 93% rename from entities/items/basketball.py rename to game/items/basketball.py index 81e5586..b27130a 100644 --- a/entities/items/basketball.py +++ b/game/items/basketball.py @@ -1,5 +1,5 @@ from panda3d.bullet import BulletSphereShape, BulletRigidBodyNode, BulletGhostNode -from entities.items.item import Item +from game.items.item import Item class Basketball(Item): diff --git a/entities/items/box.py b/game/items/box.py similarity index 96% rename from entities/items/box.py rename to game/items/box.py index 832ed2f..0687b56 100644 --- a/entities/items/box.py +++ b/game/items/box.py @@ -1,5 +1,5 @@ from panda3d.bullet import BulletBoxShape, BulletRigidBodyNode, BulletGhostNode -from entities.items.item import Item +from game.items.item import Item class Box(Item): diff --git a/entities/items/domino.py b/game/items/domino.py similarity index 95% rename from entities/items/domino.py rename to game/items/domino.py index c698dc8..7586953 100644 --- a/entities/items/domino.py +++ b/game/items/domino.py @@ -1,5 +1,5 @@ from panda3d.bullet import BulletBoxShape, BulletRigidBodyNode, BulletGhostNode -from entities.items.item import Item, StillStrategy +from game.items.item import Item, StillStrategy class Domino(Item): diff --git a/entities/items/item.py b/game/items/item.py similarity index 100% rename from entities/items/item.py rename to game/items/item.py diff --git a/entities/items/shelf.py b/game/items/shelf.py similarity index 93% rename from entities/items/shelf.py rename to game/items/shelf.py index 0e0fb8a..dd39e83 100644 --- a/entities/items/shelf.py +++ b/game/items/shelf.py @@ -1,5 +1,5 @@ from panda3d.bullet import BulletBoxShape, BulletRigidBodyNode, BulletGhostNode -from entities.items.item import Item +from game.items.item import Item class Shelf(Item): diff --git a/entities/items/teetertooter.py b/game/items/teetertooter.py similarity index 96% rename from entities/items/teetertooter.py rename to game/items/teetertooter.py index 2e3a068..6fd01f2 100644 --- a/entities/items/teetertooter.py +++ b/game/items/teetertooter.py @@ -1,6 +1,6 @@ from panda3d.core import TransformState from panda3d.bullet import BulletCylinderShape, BulletRigidBodyNode, BulletGhostNode, YUp, ZUp -from entities.items.item import Item +from game.items.item import Item class TeeterTooter(Item): diff --git a/entities/menu.py b/game/menu.py similarity index 99% rename from entities/menu.py rename to game/menu.py index 384e5ae..b20889a 100644 --- a/entities/menu.py +++ b/game/menu.py @@ -13,7 +13,7 @@ from direct.gui.DirectGuiGlobals import FLAT from direct.gui.OnscreenText import OnscreenText from direct.showbase.DirectObject import DirectObject from ya2.engine.gui.cursor import MouseCursor -from entities.scene import Scene +from game.scene import Scene from panda3d.bullet import BulletWorld diff --git a/entities/music.py b/game/music.py similarity index 100% rename from entities/music.py rename to game/music.py diff --git a/entities/scene.py b/game/scene.py similarity index 99% rename from entities/scene.py rename to game/scene.py index 36c9226..6cdf9f9 100644 --- a/entities/scene.py +++ b/game/scene.py @@ -12,8 +12,8 @@ from direct.gui.OnscreenText import OnscreenText from direct.gui.DirectGui import DirectButton, DirectFrame from direct.gui.DirectGuiGlobals import FLAT, DISABLED, NORMAL from direct.showbase.DirectObject import DirectObject -from entities.items.background import Background -from entities.sidepanel import SidePanel +from game.items.background import Background +from game.sidepanel import SidePanel from ya2.engine.gui.cursor import MouseCursor from ya2.lib.p3d.gfx import P3dGfxMgr diff --git a/entities/scenes/__init__.py b/game/scenes/__init__.py similarity index 100% rename from entities/scenes/__init__.py rename to game/scenes/__init__.py diff --git a/entities/scenes/scene_basketball.py b/game/scenes/scene_basketball.py similarity index 94% rename from entities/scenes/scene_basketball.py rename to game/scenes/scene_basketball.py index cba2972..d57adf7 100644 --- a/entities/scenes/scene_basketball.py +++ b/game/scenes/scene_basketball.py @@ -1,9 +1,9 @@ -from entities.scene import Scene -from entities.items.box import Box -from entities.items.shelf import Shelf -from entities.items.domino import Domino, UpStrategy, DownStrategy -from entities.items.basketball import Basketball -from entities.items.teetertooter import TeeterTooter +from game.scene import Scene +from game.items.box import Box +from game.items.shelf import Shelf +from game.items.domino import Domino, UpStrategy, DownStrategy +from game.items.basketball import Basketball +from game.items.teetertooter import TeeterTooter class SceneBasketBall(Scene): diff --git a/entities/scenes/scene_box.py b/game/scenes/scene_box.py similarity index 91% rename from entities/scenes/scene_box.py rename to game/scenes/scene_box.py index 0617659..c0eee15 100644 --- a/entities/scenes/scene_box.py +++ b/game/scenes/scene_box.py @@ -1,9 +1,9 @@ -from entities.scene import Scene -from entities.items.box import Box, HitStrategy -from entities.items.shelf import Shelf -from entities.items.domino import Domino -from entities.items.basketball import Basketball -from entities.items.teetertooter import TeeterTooter +from game.scene import Scene +from game.items.box import Box, HitStrategy +from game.items.shelf import Shelf +from game.items.domino import Domino +from game.items.basketball import Basketball +from game.items.teetertooter import TeeterTooter class SceneBox(Scene): diff --git a/entities/scenes/scene_domino.py b/game/scenes/scene_domino.py similarity index 90% rename from entities/scenes/scene_domino.py rename to game/scenes/scene_domino.py index 1d5dec9..d3edad2 100644 --- a/entities/scenes/scene_domino.py +++ b/game/scenes/scene_domino.py @@ -1,9 +1,9 @@ -from entities.scene import Scene -from entities.items.box import Box -from entities.items.shelf import Shelf -from entities.items.domino import Domino, DownStrategy -from entities.items.basketball import Basketball -from entities.items.teetertooter import TeeterTooter +from game.scene import Scene +from game.items.box import Box +from game.items.shelf import Shelf +from game.items.domino import Domino, DownStrategy +from game.items.basketball import Basketball +from game.items.teetertooter import TeeterTooter class SceneDomino(Scene): diff --git a/entities/scenes/scene_domino_box.py b/game/scenes/scene_domino_box.py similarity index 93% rename from entities/scenes/scene_domino_box.py rename to game/scenes/scene_domino_box.py index 915a309..629047c 100644 --- a/entities/scenes/scene_domino_box.py +++ b/game/scenes/scene_domino_box.py @@ -1,9 +1,9 @@ -from entities.scene import Scene -from entities.items.box import Box -from entities.items.shelf import Shelf -from entities.items.domino import Domino, UpStrategy, DownStrategy -from entities.items.basketball import Basketball -from entities.items.teetertooter import TeeterTooter +from game.scene import Scene +from game.items.box import Box +from game.items.shelf import Shelf +from game.items.domino import Domino, UpStrategy, DownStrategy +from game.items.basketball import Basketball +from game.items.teetertooter import TeeterTooter class SceneDominoBox(Scene): diff --git a/entities/scenes/scene_domino_box_basketball.py b/game/scenes/scene_domino_box_basketball.py similarity index 91% rename from entities/scenes/scene_domino_box_basketball.py rename to game/scenes/scene_domino_box_basketball.py index ccd0e46..84b5129 100644 --- a/entities/scenes/scene_domino_box_basketball.py +++ b/game/scenes/scene_domino_box_basketball.py @@ -1,9 +1,9 @@ -from entities.scene import Scene -from entities.items.box import Box -from entities.items.shelf import Shelf -from entities.items.domino import Domino, UpStrategy, DownStrategy -from entities.items.basketball import Basketball -from entities.items.teetertooter import TeeterTooter +from game.scene import Scene +from game.items.box import Box +from game.items.shelf import Shelf +from game.items.domino import Domino, UpStrategy, DownStrategy +from game.items.basketball import Basketball +from game.items.teetertooter import TeeterTooter class SceneDominoBoxBasketball(Scene): diff --git a/entities/scenes/scene_teeter_domino_box_basketball.py b/game/scenes/scene_teeter_domino_box_basketball.py similarity index 94% rename from entities/scenes/scene_teeter_domino_box_basketball.py rename to game/scenes/scene_teeter_domino_box_basketball.py index 34194af..b433106 100644 --- a/entities/scenes/scene_teeter_domino_box_basketball.py +++ b/game/scenes/scene_teeter_domino_box_basketball.py @@ -1,9 +1,9 @@ -from entities.scene import Scene -from entities.items.box import Box -from entities.items.shelf import Shelf -from entities.items.domino import Domino, UpStrategy, DownStrategy -from entities.items.basketball import Basketball -from entities.items.teetertooter import TeeterTooter +from game.scene import Scene +from game.items.box import Box +from game.items.shelf import Shelf +from game.items.domino import Domino, UpStrategy, DownStrategy +from game.items.basketball import Basketball +from game.items.teetertooter import TeeterTooter class SceneTeeterDominoBoxBasketball(Scene): diff --git a/entities/scenes/scene_teeter_tooter.py b/game/scenes/scene_teeter_tooter.py similarity index 92% rename from entities/scenes/scene_teeter_tooter.py rename to game/scenes/scene_teeter_tooter.py index 0784be2..51c5eb3 100644 --- a/entities/scenes/scene_teeter_tooter.py +++ b/game/scenes/scene_teeter_tooter.py @@ -1,9 +1,9 @@ -from entities.scene import Scene -from entities.items.box import Box -from entities.items.shelf import Shelf -from entities.items.domino import Domino, UpStrategy, DownStrategy -from entities.items.basketball import Basketball -from entities.items.teetertooter import TeeterTooter +from game.scene import Scene +from game.items.box import Box +from game.items.shelf import Shelf +from game.items.domino import Domino, UpStrategy, DownStrategy +from game.items.basketball import Basketball +from game.items.teetertooter import TeeterTooter class SceneTeeterTooter(Scene): diff --git a/entities/sidepanel.py b/game/sidepanel.py similarity index 100% rename from entities/sidepanel.py rename to game/sidepanel.py diff --git a/main/main.py b/main/main.py index 08e6487..83c8adb 100644 --- a/main/main.py +++ b/main/main.py @@ -5,7 +5,7 @@ if '--version' in argv: load_prc_file_data('', 'window-type none') from os.path import exists from traceback import print_exc -from entities.app import PmachinesApp +from game.app import PmachinesApp from p3d_appimage import AppImageBuilder diff --git a/setup.py b/setup.py index 3dfd6b5..3e23b38 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ from ya2.build.lang import LanguageBuilder from p3d_appimage import AppImageBuilder from p3d_flatpak import FlatpakBuilder import ya2.engine.log # so logging's info/debug are logged -from entities.app import PmachinesApp +from game.app import PmachinesApp appname = longname = 'pmachines' diff --git a/ya2/build/screenshots.py b/ya2/build/screenshots.py index f1a16b9..0eb1261 100644 --- a/ya2/build/screenshots.py +++ b/ya2/build/screenshots.py @@ -3,7 +3,7 @@ from glob import glob from importlib import import_module from inspect import isclass from multiprocessing import Pool -from entities.scene import Scene +from game.scene import Scene def do_screenshot(cls): -- 2.30.2