Merge pull request #1 from willmexe/Input-fix

Fixed input to work on mac

src/scripts/game_manager.py

···
 from .modules.fonts import font_handler
 from .modules.debug import Debug
 
-from .screens.screen_main_menu import screen_main_menu
-from .screens.screen_game import screen_game
-from .screens.screen_settings import screen_settins
-from .screens.screen_lose import screen_lose
-from .screens.screen_win import screen_win
+from .screens.screen_main import screen_main
 from .screens.gui_test import gui_test
 
 class Game_Manager:
···
         self.change_title(self.properties["id"])
         self.input.input_state = "general"
 
-        game_screen = screen_game(self)
-        main_menu_screen = screen_main_menu(self)
+        main_screen = screen_main(self)
         screen_gui_test = gui_test(self)
-        settings_screen = screen_settins(self)
-        lose_screen = screen_lose(self)
-        win_screen = screen_win(self)
         self.renderer.load_screen(screen_gui_test, 'gui_test')
-        self.renderer.load_screen(game_screen, 'game')
-        self.renderer.load_screen(main_menu_screen, 'main_menu')
-        self.renderer.load_screen(settings_screen, 'settings')
-        self.renderer.load_screen(lose_screen, 'lose')
-        self.renderer.load_screen(win_screen, 'win')
-        self.renderer.switch_screen('main_menu')
+        self.renderer.load_screen(main_screen, 'main')
+        self.renderer.switch_screen('main')
 
     def update(self):
         # Calculate Delta Time
···
         self.previous_time = now
 
         self.input.any_key_pressed = False
+        for i, item in enumerate(self.input.pressed_keys):
+            self.input.pressed_keys[i] = False
+
+        keys = pygame.key.get_pressed()
         for event in pygame.event.get():
             if event.type == pygame.QUIT:
                 self.stop()
             if event.type == pygame.KEYDOWN:
                 self.input.any_key_pressed = True
-
+                for i, key in enumerate(self.input.record_keys):
+                    key_signature = 0
+                    exec("key_signature = pygame.K_" + key)
+                    self.input.pressed_keys[i] = keys[key_signature]
+                        
         # Screens
         self.renderer.update()
 

src/scripts/modules/debug.py

···
 
         self.fps = 0
 
+        self.render_hud = False
+
     def send_stats(self, update_time, render_time):
         self.update_time = update_time * 1000
         self.render_time = render_time * 1000
···
         self.latest_readings += self.frame_ms
         if self.fps_end_time - self.fps_start_time > 1:
             self.fps_start_time = time.time()
-            print(self.latest_readings)
             self.latest_readings = 0
 
     def render(self):
-        self.debug_gui.render()
+        if self.render_hud:
+            self.debug_gui.render()

src/scripts/modules/input.py

···
 from re import L
-import pygame, keyboard
+import pygame
 
 class Input:
 
     input_state = "main"
 
+    key_signature = False
+
     record_keys = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z",
                    "1", "2", "3", "4", "5", "6", "7", "8", "9", "0",
                    "UP", "DOWN", "LEFT", "RIGHT", 
-                   "SPACE", "CTRL", "SHIFT", "ALT", "RETURN", "ESCAPE", "TAB", "BACKSPACE",
-                   "period", "subtract", "'"]
+                   "SPACE", "LCTRL", "LSHIFT", "LALT", "RETURN", "ESCAPE", "TAB", "BACKSPACE",
+                   "PERIOD", "MINUS"]
 
     def set_input_state(self, state):
         self.input_state = state
···
         self.any_key_pressed = False
         
         self.last_frame_keys = []
+        self.pressed_keys = []
         for i in self.record_keys:
+            self.pressed_keys.append(False)
             self.last_frame_keys.append(False)
 
         self.mouse_button_last_frame = False
 
     def is_pressed(self, key, input_state=""):
+        keys = pygame.key.get_pressed()
+        code = "self.key_signature = pygame.K_" + key
+        exec(code)
         if input_state != "":
-            return bool(keyboard.is_pressed(key) and pygame.mouse.get_focused() and input_state == self.input_state)
+            return bool(keys[self.key_signature] and pygame.mouse.get_focused() and input_state == self.input_state)
         else:
-            return bool(keyboard.is_pressed(key) and pygame.mouse.get_focused())
+            return bool(keys[self.key_signature] and pygame.mouse.get_focused())
 
     def check_keys(self):
         for i, key in enumerate(self.record_keys):
             self.last_frame_keys[i] = self.is_pressed(key)
 
     def is_just_pressed(self, key, input_state=""):
+        keys = pygame.key.get_pressed()
+        key_signature = False
+        exec("key_signature = pygame.K_" + key)
         if input_state != "":
-            return bool(keyboard.is_pressed(key) and not self.last_frame_keys[self.record_keys.index(key)] and pygame.mouse.get_focused() and input_state == self.input_state)
+            return bool(keys[key_signature] and not self.last_frame_keys[self.record_keys.index(key)] and pygame.mouse.get_focused() and input_state == self.input_state)
         else:
-            return bool(keyboard.is_pressed(key) and not self.last_frame_keys[self.record_keys.index(key)] and pygame.mouse.get_focused())
+            return bool(keys[key_signature] and not self.last_frame_keys[self.record_keys.index(key)] and pygame.mouse.get_focused())
 
     def is_any_key_pressed(self):
         return self.any_key_pressed

src/scripts/screens/screen_main.py

···
+from src.scripts.modules.renderer import Screen
+from src.scripts.modules.gui import *
+import os
+
+class screen_main(Screen):
+    def __init__(self, game):
+        self.game = game
+
+    def update(self):
+        pass
+
+    def render(self):
+        self.game.renderer.screen.fill(self.game.color_handler.get_rgb('main_menu.background'))