Slightly cleaned up arraw draw

game.py

@@ -9,9 +9,8 @@ import NoPELib
 import numpy as np
 import pygame
 
-# TODO: Add the ability to re-draw the wheel to hightlight the selected item
 # TODO: Prevent another animation from starting when the wheel's spinning
-# TODO: Convery fade in / out time to be random
+# TODO: Convert fade in / out time to be random
 # TODO: Make random finer (to prevent a range of 4-5 only having two possible speeds)
 
 def translate(value, aMin, aMax, bMin, bMax):
@@ -46,7 +45,36 @@ def rotateDeg(surface: pygame.Surface, degrees: float) -> pygame.Surface:
     rotSurface = gameUtils.centre(rotSurface, surface.size)
     return rotSurface
 
+class WCfg:
+    """
+    Holds all the Wheel Configurations.
+    """
+
+    # The background colour of the wheel
+    bgColour = (25, 25, 25)
+    # The colour of the dividing lines
+    divColour = (75, 75, 75)
+    # The colour of the text
+    txtColour = (255, 255, 255)
+    # How much space is between the wheel and the screen
+    margin = 50
+    # The minimum and maximum time it takes (in seconds)
+    # for the wheel to get to full speed.
+    spinFadeInTimes = [0.25, 0.25]
+    # The minimum and maximum time it takes (in seconds)
+    # for the wheel to get to go back to being stationary.
+    spinFadeOutTimes = [3, 4]
+    # The minimum and maximum speeds of the wheel in deg/s
+    spinSpeedRange = [360, 1000]
+    # How many pixels away from the outer side of the
+    # circle the text should be
+    textMargin = 10
+    # The font to use for drawing the item text
+    font = pygame.font.SysFont('', 32)
+
 class WheelItem:
+    # TODO: Add integration with NoPE-Lib
+    # TODO: Allow this to modify game attributes so it can hide the wheel and respin
     def __init__(self, text):
         self.text = text
 
@@ -64,16 +92,14 @@ class Game(gameUtils.Game):
         # Don't remove this. It does important things. :3
         super().__init__(*args, **kwargs)
 
-        self.wheelSurf = pygame.Surface([min(self.size)]*2) # Don't ask.
+        self.wheelSurf = pygame.Surface([min(self.size)-WCfg.margin*2]*2) # Don't ask.
         self.wheelRotation = 0
-        # How long (in seconds) it takes for the wheel to get to full speed
-        self.WHEEL_SPIN_FADE_IN = 0.25
-        # How long (in seconds) it takes for the wheel to go back to stationary
-        self.WHEEL_SPIN_FADE_OUT = 3
-        # The minimum and maximum speeds of the wheel
-        self.WHEEL_SPEED_RANGE = [360, 1000]
         # Holds the decided speed of the wheel
         self.wheelSpinSpeed = 0
+        # Holds the decided fade in time
+        self.animFadeIn = 0
+        # Holds the decided fade out time
+        self.animFadeOut = 0
         # When the wheel started its spin animation
         self.wheelAnimStart = 0
         # The ticker sound effect
@@ -83,8 +109,6 @@ class Game(gameUtils.Game):
         # The last index the ticker ticked on
         self.lastTickItem = -1
 
-        font = pygame.font.SysFont('', 32)
-
         self.items = []
         self.items.append(WheelItem('Drink 1 shot'))
         self.items.append(WheelItem('Drink 2 shots'))
@@ -92,14 +116,17 @@ class Game(gameUtils.Game):
         self.items.append(WheelItem('Get shocked at 100%'))
         self.items.append(WheelItem('Get slapped by\neveryone in the room'))
         self.items.append(WheelItem('Respin, wheel hidden'))
-        # How many pixels away from the outer side of the
-        # circle the text should be
-        textMargin = 5
+        random.shuffle(self.items)
+
+        self.font = pygame.font.SysFont('', 50)
+        self.drawWheel()
+    
+    def drawWheel(self):
         # Calculate circle radius
         circleR = self.wheelSurf.size[0] / 2
 
         # Draw the base circle
-        pygame.draw.circle(self.wheelSurf, (25, 25, 25), (circleR, circleR), circleR)
+        pygame.draw.circle(self.wheelSurf, WCfg.bgColour, (circleR, circleR), circleR)
         # Calculate the gap, in radians, between each item
         gap = maths.pi * 2 / len(self.items)
 
@@ -113,25 +140,24 @@ class Game(gameUtils.Game):
             # Calculate the end position of a line based on the vector
             endPos = np.add(np.multiply(vector, circleR), circleR)
             # Draw the dividing line
-            pygame.draw.line(self.wheelSurf, (128, 128, 128), (circleR, circleR), endPos)
+            pygame.draw.line(self.wheelSurf, WCfg.divColour, (circleR, circleR), endPos)
 
             # Create a surface that our text will be rendered onto
             textSurf = pygame.Surface(self.wheelSurf.size, pygame.SRCALPHA)
             # Render the item text
-            text = font.render(item.text, True, (255, 255, 255))
+            text = WCfg.font.render(item.text, True, WCfg.txtColour)
             # Draw the item text onto the text surface, centred to the right
-            textSurf.blit(text, (textSurf.size[0]-text.get_width()-textMargin, self.size[1]//2 - text.get_height()//2))
+            textSurf.blit(text, (textSurf.size[0]-text.get_width()-WCfg.textMargin, textSurf.size[1]//2 - text.get_height()//2))
             # Draw debug lines
-            #pygame.draw.rect(textSurf, (0, 128, 255), (0, 0, textSurf.size[0], textSurf.size[1]), 1)
-            #pygame.draw.line(textSurf, (255, 0, 0), (circleR, circleR), (textSurf.size[0], circleR))
-            #pygame.draw.line(textSurf, (0, 255, 0), (circleR, circleR), (circleR, textSurf.size[1]))
+            #if idx < 1:
+            #    pygame.draw.rect(textSurf, (0, 128, 255), (0, 0, textSurf.size[0], textSurf.size[1]), 1)
+            #    pygame.draw.line(textSurf, (255, 0, 0), (circleR, circleR), (textSurf.size[0], circleR))
+            #    pygame.draw.line(textSurf, (0, 255, 0), (circleR, circleR), (circleR, textSurf.size[1]))
             # Rotate the text surface
             textSurf = rotateRad(textSurf, -rad)
             # Blit the text surface to the wheel surface
             self.wheelSurf.blit(textSurf, (0, 0))
 
-        self.font = pygame.font.SysFont('', 50)
-
     def spinnerTick(self):
         # If there's a tick already playing
         if time.perf_counter() - self.lastTickTime < self.tickSfx.get_length():
@@ -149,7 +175,7 @@ class Game(gameUtils.Game):
         """
         if event.type == pygame.KEYDOWN:
             if event.key == pygame.K_SPACE:
-                self.wheelSpinSpeed = random.randint(*self.WHEEL_SPEED_RANGE)
+                self.wheelSpinSpeed = random.randint(*WCfg.spinSpeedRange)
                 self.wheelAnimStart = time.perf_counter()
     
     def update(self):
@@ -159,13 +185,18 @@ class Game(gameUtils.Game):
         """
         self.surf.fill((0, 0, 0))
         self.surf.blit(rotateDeg(gameUtils.centre(self.wheelSurf, self.size), self.wheelRotation), (0, 0))
+        arrowX = (self.size[0] - self.wheelSurf.size[0]) // 2 + self.wheelSurf.size[0]
+        arrowY = self.size[1] // 2
+        arrowSize = 20
+        arrowPollys = ((arrowX, arrowY), (arrowX+arrowSize, arrowY-arrowSize//2), (arrowX+arrowSize, arrowY+arrowSize//2))
+        pygame.draw.polygon(self.surf, (255, 255, 255), arrowPollys)
 
         animTime = time.perf_counter() - self.wheelAnimStart
-        if animTime < self.WHEEL_SPIN_FADE_IN + self.WHEEL_SPIN_FADE_OUT:
-            if animTime < self.WHEEL_SPIN_FADE_IN:
-                speed = translate(animTime, 0, self.WHEEL_SPIN_FADE_IN, 0, self.wheelSpinSpeed)
+        if animTime < WCfg.spinFadeInTimes[0] + WCfg.spinFadeOutTimes[0]:
+            if animTime < WCfg.spinFadeInTimes[0]:
+                speed = translate(animTime, 0, WCfg.spinFadeInTimes[0], 0, self.wheelSpinSpeed)
             else:
-                speed = translate(animTime, self.WHEEL_SPIN_FADE_IN, self.WHEEL_SPIN_FADE_IN+self.WHEEL_SPIN_FADE_OUT, self.wheelSpinSpeed, 0)
+                speed = translate(animTime, WCfg.spinFadeInTimes[0], WCfg.spinFadeInTimes[0]+WCfg.spinFadeOutTimes[0], self.wheelSpinSpeed, 0)
 
             self.wheelRotation += speed * self.timeDelta
             self.wheelRotation %= 360