Merge branch 'fps' into 'master'

Fps

See merge request !3

fps_counter.py

@@ -0,0 +1,27 @@
+import sys
+import pygame as pg
+
+def main():
+    pg.init()
+    screen = pg.display.set_mode((320, 240))
+    font = pg.font.Font(None, 30)
+    clock = pg.time.Clock()
+    done = False
+
+    while not done:
+        for event in pg.event.get():
+            if event.type == pg.QUIT:
+                done = True
+
+        screen.fill(pg.Color('black'))
+        fps = font.render(str(int(clock.get_fps())), True, pg.Color('white'))
+        screen.blit(fps, (50, 50))
+        pg.display.flip()
+        clock.tick(30)
+
+    pg.quit()
+    sys.exit()
+
+if __name__ == "__main__":
+    main()
+

gametest_rev2.py

@@ -295,6 +295,7 @@ logoff_sound = pygame.mixer.Sound('snd/winxplogoff.wav')
 pygame_font_1 = pygame.font.Font('freesansbold.ttf', 90)
 pygame_font_2 = pygame.font.Font('freesansbold.ttf', 65)
 pygame_font_3 = pygame.font.Font('freesansbold.ttf', 45)
+pygame_font_4 = pygame.font.Font('freesansbold.ttf', 16)
 
 # colors
 pygame_color_green = pygame.Color(42, 217, 13)
@@ -486,7 +487,7 @@ def enter_name():
         highscore_rectangle.topleft = (700, 350)
 
         screen.blit(highscore_surface, highscore_rectangle)
-
+	
         textbox_text_surface = pygame_font_2.render('Enter Name:', True, pygame_font_main_color)
         textbox_text_rectangle = textbox_text_surface.get_rect()
         textbox_text_rectangle.topleft = (700, 500)
@@ -636,17 +637,17 @@ screen = pygame.display.set_mode((screen_size_x, screen_size_y), pygame.FULLSCRE
 
 # define image variables
 img_itlablogo = 'img/itlablogo.png'
-img_itlablogo_image = pygame.image.load(img_itlablogo)
+img_itlablogo_image = pygame.image.load(img_itlablogo).convert_alpha()
 img_itlablogo_imagex = get_image_width(img_itlablogo)
 img_itlablogo_imagey = get_image_height(img_itlablogo)
 
 img_metalliclogo = 'img/metalliclogo.png'
-img_metalliclogo_image  = pygame.image.load(img_metalliclogo)
+img_metalliclogo_image  = pygame.image.load(img_metalliclogo).convert_alpha()
 img_metalliclogo_imagex = get_image_width(img_metalliclogo)
 img_metalliclogo_imagey = get_image_height(img_metalliclogo)
 
 img_background = 'img/bg.jpg'
-img_background_image  = pygame.image.load(img_background)
+img_background_image  = pygame.image.load(img_background).convert()
 img_background_imagex = get_image_width(img_background)
 img_background_imagey = get_image_height(img_background)
 
@@ -718,7 +719,7 @@ while True:
         screen.blit(score1_surface, score1_rectangle)
         screen.blit(score2_surface, score2_rectangle)
         screen.blit(score3_surface, score3_rectangle)
-
+	
         # event handling for if the start button is pushed
         #wait for the user to press start button
         if not GPIO.input(pin_start) and not pin_start_inhibit:
@@ -792,10 +793,11 @@ while True:
         screen.blit(errors_surface, errors_rectangle) #errors
         screen.blit(time_surface, time_rectangle) #time
         screen.blit(header_surface, header_rectangle) #header
-
-        # display everything
-        #pygame.display.flip()
-
+        
+        
+        fps = pygame_font_4.render(str(int(pygame_clock.get_fps())), True, pygame.Color('white'))
+        screen.blit(fps, (50, 50))
+        
         # if another push of start is detected (i.e. the game is ending!)
         if not GPIO.input(pin_stop):
             # change led colour to red