From 441ba58521d1970af977247d848a122fabaa46ea Mon Sep 17 00:00:00 2001 From: Edgar Sanou Date: Tue, 20 May 2025 07:44:08 +0200 Subject: [PATCH] Add package initialization and restructure main --- engine/UI/Button.py | 2 +- engine/UI/MainMenu.py | 4 ++-- engine/UI/UIManager.py | 2 +- engine/UI/__init__.py | 0 engine/UI/image.py | 2 +- engine/__init__.py | 0 engine/camera.py | 2 +- engine/game_engine.py | 3 ++- engine/map_load.py | 2 +- engine/multiplayer/__init__.py | 0 engine/multiplayer/connection.py | 2 +- engine/train.py | 2 +- main.py | 41 +++++++++++++++++++------------- mapEditor/engine/__init__.py | 0 mapEditor/engine/camera.py | 2 +- mapEditor/engine/game_engine.py | 3 ++- mapEditor/engine/map_system.py | 2 +- mapEditor/engine/train.py | 2 +- mapEditor/main.py | 41 +++++++++++++++++++------------- 19 files changed, 64 insertions(+), 48 deletions(-) create mode 100644 engine/UI/__init__.py create mode 100644 engine/__init__.py create mode 100644 engine/multiplayer/__init__.py create mode 100644 mapEditor/engine/__init__.py diff --git a/engine/UI/Button.py b/engine/UI/Button.py index 51eadaa..790f71d 100644 --- a/engine/UI/Button.py +++ b/engine/UI/Button.py @@ -23,4 +23,4 @@ def getScale(self): return self.image.get_size() def update(self): - self.rect.center = (round(pg.display.get_window_size()[0]/2)+self.coords[0],round(pg.display.get_window_size()[1]/2)+self.coords[1]) \ No newline at end of file + self.rect.center = (round(pg.display.get_window_size()[0]/2)+self.coords[0],round(pg.display.get_window_size()[1]/2)+self.coords[1]) diff --git a/engine/UI/MainMenu.py b/engine/UI/MainMenu.py index 1b84c29..ee52d79 100644 --- a/engine/UI/MainMenu.py +++ b/engine/UI/MainMenu.py @@ -39,10 +39,10 @@ def buttonFunc(self): if funcID==1: self.active=False if funcID==2: - game_engine.gameEngine.running=False + game_engine.GameEngine.running = False def reOrganizeAll(self): self.background=pg.image.load(os.path.join("engine","UI","UISprites","Images","menuBackground.png")).convert_alpha() self.background=pg.transform.scale(self.background, (pg.display.get_window_size()[0],pg.display.get_window_size()[1])) self.images.update(((pg.display.get_window_size()[0]/2,(pg.display.get_window_size()[1]/2)-150))) - self.buttons.update() \ No newline at end of file + self.buttons.update() diff --git a/engine/UI/UIManager.py b/engine/UI/UIManager.py index b6743bd..52c5dbd 100644 --- a/engine/UI/UIManager.py +++ b/engine/UI/UIManager.py @@ -21,4 +21,4 @@ def isActive(self): return self.active def reorganizeAll(self): - self.mainmenu.reOrganizeAll() \ No newline at end of file + self.mainmenu.reOrganizeAll() diff --git a/engine/UI/__init__.py b/engine/UI/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/engine/UI/image.py b/engine/UI/image.py index fed4e5c..b3dbec0 100644 --- a/engine/UI/image.py +++ b/engine/UI/image.py @@ -12,4 +12,4 @@ def __init__(self,sprite_dir,funcID,coords=(0,0),scale=(100,100)): self.rect.center = coords def update(self,pos): - self.rect.center = pos \ No newline at end of file + self.rect.center = pos diff --git a/engine/__init__.py b/engine/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/engine/camera.py b/engine/camera.py index 0d9e24c..6f61e7f 100644 --- a/engine/camera.py +++ b/engine/camera.py @@ -33,4 +33,4 @@ def update(self): elif self.wspeedself.speed: - self.speed=round(self.speed) \ No newline at end of file + self.speed=round(self.speed) diff --git a/engine/game_engine.py b/engine/game_engine.py index 77f3c35..5711e4c 100644 --- a/engine/game_engine.py +++ b/engine/game_engine.py @@ -8,7 +8,7 @@ colliders=[] -class gameEngine(): +class GameEngine: running=True def __init__(self,debug): @@ -136,3 +136,4 @@ def keyEventsCheck(self): self.gameObjs[1].add(i) for i in self.map.getMapObjects(self.section+1): self.gameObjs[2].add(i) + diff --git a/engine/map_load.py b/engine/map_load.py index 9e5a13b..805bfeb 100644 --- a/engine/map_load.py +++ b/engine/map_load.py @@ -57,4 +57,4 @@ def getScale(self,name): if (name in self.mapDefs): return self.mapDefs[name][1] else: - return [100,100] \ No newline at end of file + return [100,100] diff --git a/engine/multiplayer/__init__.py b/engine/multiplayer/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/engine/multiplayer/connection.py b/engine/multiplayer/connection.py index 0d83a19..a904f02 100644 --- a/engine/multiplayer/connection.py +++ b/engine/multiplayer/connection.py @@ -66,4 +66,4 @@ def sendCords(self): xpos= xpos.encode(FORMAT) self.client.send(xpos) ypos = str("654321").encode(FORMAT) - self.client.send(ypos) \ No newline at end of file + self.client.send(ypos) diff --git a/engine/train.py b/engine/train.py index d2789b7..f2b11e0 100644 --- a/engine/train.py +++ b/engine/train.py @@ -41,4 +41,4 @@ def update(self): #self.rect.x = self.rect.x + self.speed #self.route+=self.speed self.rect.y = pg.display.get_window_size()[1]-self.y - pass \ No newline at end of file + pass diff --git a/main.py b/main.py index 7da722b..350cd91 100644 --- a/main.py +++ b/main.py @@ -1,19 +1,26 @@ import pygame as pg -from engine.game_engine import gameEngine +from engine.game_engine import GameEngine -pg.init() -clock = pg.time.Clock() -# Set up the drawing window with name and res -screen = pg.display.set_mode([500, 500], pg.RESIZABLE) -pg.display.set_caption("TrainSim") -# Engine setup -g_engine=gameEngine(False) -while g_engine.isRunning(): - g_engine.keyEventsCheck() - # Screen print - screen.fill((220, 236, 251)) - g_engine.renderObjects(screen,clock.get_fps()) - # Flip the display - pg.display.flip() - clock.tick(60) -pg.quit() \ No newline at end of file +def main(): + pg.init() + clock = pg.time.Clock() + # Set up the drawing window with name and res + screen = pg.display.set_mode([500, 500], pg.RESIZABLE) + pg.display.set_caption("TrainSim") + + # Engine setup + engine = GameEngine(False) + while engine.isRunning(): + engine.keyEventsCheck() + # Screen print + screen.fill((220, 236, 251)) + engine.renderObjects(screen, clock.get_fps()) + # Flip the display + pg.display.flip() + clock.tick(60) + + pg.quit() + + +if __name__ == "__main__": + main() diff --git a/mapEditor/engine/__init__.py b/mapEditor/engine/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/mapEditor/engine/camera.py b/mapEditor/engine/camera.py index cc79c0c..0dad229 100644 --- a/mapEditor/engine/camera.py +++ b/mapEditor/engine/camera.py @@ -23,4 +23,4 @@ def decreaseSpeed(self): self.speed-=1 def update(self): - self.x = self.x + self.speed \ No newline at end of file + self.x = self.x + self.speed diff --git a/mapEditor/engine/game_engine.py b/mapEditor/engine/game_engine.py index 5b8bbc7..f4013df 100644 --- a/mapEditor/engine/game_engine.py +++ b/mapEditor/engine/game_engine.py @@ -5,7 +5,7 @@ colliders=[] -class gameEngine(): +class GameEngine: def __init__(self,debug): self.camera = engine.camera.Camera() self.train = engine.train.TrainObject("Train",["objects","complete_train.png"],1000,450) @@ -132,3 +132,4 @@ def keyEventsCheck(self): + diff --git a/mapEditor/engine/map_system.py b/mapEditor/engine/map_system.py index 9578c59..58b502e 100644 --- a/mapEditor/engine/map_system.py +++ b/mapEditor/engine/map_system.py @@ -64,4 +64,4 @@ def getScale(self,name): if (name in self.mapDefs): return self.mapDefs[name][1] else: - return [100,100] \ No newline at end of file + return [100,100] diff --git a/mapEditor/engine/train.py b/mapEditor/engine/train.py index f99a20a..df04af4 100644 --- a/mapEditor/engine/train.py +++ b/mapEditor/engine/train.py @@ -31,4 +31,4 @@ def decreaseSpeed(self): def update(self): #self.rect.x = self.rect.x + self.speed - self.route+=self.speed \ No newline at end of file + self.route+=self.speed diff --git a/mapEditor/main.py b/mapEditor/main.py index a6ae792..5583314 100644 --- a/mapEditor/main.py +++ b/mapEditor/main.py @@ -1,20 +1,27 @@ import pygame as pg from engine import * -from engine.game_engine import gameEngine +from engine.game_engine import GameEngine -pg.init() -clock = pg.time.Clock() -# Set up the drawing window with name and res -screen = pg.display.set_mode([500, 500], pg.RESIZABLE) -pg.display.set_caption("Train Driver") -# Engine setup -g_engine=gameEngine(True) -while g_engine.isRunning(): - g_engine.keyEventsCheck() - # Screen print - screen.fill((220, 236, 251)) - g_engine.renderObjects(screen,clock.get_fps()) - # Flip the display - pg.display.flip() - clock.tick(60) -pg.quit() \ No newline at end of file +def main(): + pg.init() + clock = pg.time.Clock() + # Set up the drawing window with name and res + screen = pg.display.set_mode([500, 500], pg.RESIZABLE) + pg.display.set_caption("Train Driver") + + # Engine setup + engine = GameEngine(True) + while engine.isRunning(): + engine.keyEventsCheck() + # Screen print + screen.fill((220, 236, 251)) + engine.renderObjects(screen, clock.get_fps()) + # Flip the display + pg.display.flip() + clock.tick(60) + + pg.quit() + + +if __name__ == "__main__": + main()