Improve project structure

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])
+        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])

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()
+        self.buttons.update()

engine/UI/UIManager.py

@@ -21,4 +21,4 @@ def isActive(self):
         return self.active
 
     def reorganizeAll(self):
-        self.mainmenu.reOrganizeAll()
+        self.mainmenu.reOrganizeAll()

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
+        self.rect.center = pos

engine/camera.py

@@ -33,4 +33,4 @@ def update(self):
         elif self.wspeed<self.speed:
             self.speed-=0.005
             if self.wspeed>self.speed:
-                self.speed=round(self.speed)
+                self.speed=round(self.speed)

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)
+

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]
+            return [100,100]

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)
+            self.client.send(ypos)

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
+        pass

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()
+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()

mapEditor/engine/camera.py

@@ -23,4 +23,4 @@ def decreaseSpeed(self):
         self.speed-=1
 
     def update(self):
-        self.x = self.x + self.speed
+        self.x = self.x + self.speed

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):
 
 
 
+

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]
+            return [100,100]

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
+        self.route+=self.speed

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()
+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()