From 1fe19d3e589bbc5d40b74d007d6b1984cfc34925 Mon Sep 17 00:00:00 2001 From: Olivier Gayot Date: Mon, 8 Nov 2021 17:53:17 +0100 Subject: Make controller classes and screen classes inherit from abstract classes Signed-off-by: Olivier Gayot --- pycameltris/screens/InGame.py | 3 ++- pycameltris/screens/Pause.py | 3 ++- pycameltris/screens/Screen.py | 12 ++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 pycameltris/screens/Screen.py (limited to 'pycameltris/screens') diff --git a/pycameltris/screens/InGame.py b/pycameltris/screens/InGame.py index f865c77..aa3e53b 100644 --- a/pycameltris/screens/InGame.py +++ b/pycameltris/screens/InGame.py @@ -5,6 +5,7 @@ import sys import pygame +from .Screen import Screen from ..piece import * from ..controller import Input, KeyboardController, JoystickController from ..misc import Pause @@ -247,7 +248,7 @@ def handle_input_released(instance, players, event): frames_per_gridcell = [48, 43, 38, 33, 28, 23, 18, 13, 8, 6, 5, 5, 5, 4, 4, 4, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1] -class InGame: +class InGame(Screen): def __init__(self, players, screen): self.players = players self.screen = screen diff --git a/pycameltris/screens/Pause.py b/pycameltris/screens/Pause.py index f9f8859..baca5ca 100644 --- a/pycameltris/screens/Pause.py +++ b/pycameltris/screens/Pause.py @@ -3,6 +3,7 @@ import sys import pygame +from .Screen import Screen from ..controller import KeyboardController, JoystickController, Input from ..misc import UnPause @@ -12,7 +13,7 @@ def handle_input_pressed(controller, event): raise UnPause() -class Pause: +class Pause(Screen): def __init__(self, screen): self.event_handler = dict() diff --git a/pycameltris/screens/Screen.py b/pycameltris/screens/Screen.py new file mode 100644 index 0000000..01f80ab --- /dev/null +++ b/pycameltris/screens/Screen.py @@ -0,0 +1,12 @@ +import abc + + +class Screen(abc.ABC): + @abc.abstractmethod + def refresh(self): + pass + + @abc.abstractmethod + def oneframe(self): + pass + -- cgit v1.2.3