Add missing type hints

arcade/context.py

@@ -43,7 +43,7 @@ class ArcadeContext(Context):
 
     atlas_size = 512, 512
 
-    def __init__(self, window: pyglet.window.Window, gc_mode: str = "context_gc", gl_api: str = "gl"):
+    def __init__(self, window: pyglet.window.Window, gc_mode: str = "context_gc", gl_api: str = "gl") -> None:
 
         super().__init__(window, gc_mode=gc_mode, gl_api=gl_api)
 

arcade/draw_commands.py

@@ -67,7 +67,7 @@ def draw_arc_filled(center_x: float, center_y: float,
                     color: RGBA255,
                     start_angle: float, end_angle: float,
                     tilt_angle: float = 0,
-                    num_segments: int = 128):
+                    num_segments: int = 128) -> None:
     """
     Draw a filled in arc. Useful for drawing pie-wedges, or Pac-Man.
 
@@ -109,7 +109,7 @@ def draw_arc_outline(center_x: float, center_y: float, width: float,
                      height: float, color: RGBA255,
                      start_angle: float, end_angle: float,
                      border_width: float = 1, tilt_angle: float = 0,
-                     num_segments: int = 128):
+                     num_segments: int = 128) -> None:
     """
     Draw the outside edge of an arc. Useful for drawing curved lines.
 
@@ -165,7 +165,7 @@ def draw_arc_outline(center_x: float, center_y: float, width: float,
 
 def draw_parabola_filled(start_x: float, start_y: float, end_x: float,
                          height: float, color: RGBA255,
-                         tilt_angle: float = 0):
+                         tilt_angle: float = 0) -> None:
     """
     Draws a filled in parabola.
 
@@ -188,7 +188,7 @@ def draw_parabola_filled(start_x: float, start_y: float, end_x: float,
 
 def draw_parabola_outline(start_x: float, start_y: float, end_x: float,
                           height: float, color: RGBA255,
-                          border_width: float = 1, tilt_angle: float = 0):
+                          border_width: float = 1, tilt_angle: float = 0) -> None:
     """
     Draws the outline of a parabola.
 
@@ -216,9 +216,8 @@ def draw_parabola_outline(start_x: float, start_y: float, end_x: float,
 # --- BEGIN CIRCLE FUNCTIONS # # #
 
 def draw_circle_filled(center_x: float, center_y: float, radius: float,
-                       color: RGBA255,
-                       tilt_angle: float = 0,
-                       num_segments: int = -1):
+                       color: RGBA255, tilt_angle: float = 0,
+                       num_segments: int = -1) -> None:
     """
     Draw a filled-in circle.
 
@@ -240,8 +239,7 @@ def draw_circle_filled(center_x: float, center_y: float, radius: float,
 
 def draw_circle_outline(center_x: float, center_y: float, radius: float,
                         color: RGBA255, border_width: float = 1,
-                        tilt_angle: float = 0,
-                        num_segments: int = -1):
+                        tilt_angle: float = 0, num_segments: int = -1) -> None:
     """
     Draw the outline of a circle.
 
@@ -272,7 +270,7 @@ def draw_circle_outline(center_x: float, center_y: float, radius: float,
 
 def draw_ellipse_filled(center_x: float, center_y: float,
                         width: float, height: float, color: RGBA255,
-                        tilt_angle: float = 0, num_segments: int = -1):
+                        tilt_angle: float = 0, num_segments: int = -1) -> None:
     """
     Draw a filled in ellipse.
 
@@ -315,11 +313,9 @@ def draw_ellipse_filled(center_x: float, center_y: float,
 
 
 def draw_ellipse_outline(center_x: float, center_y: float,
-                         width: float,
-                         height: float, color: RGBA255,
-                         border_width: float = 1,
-                         tilt_angle: float = 0,
-                         num_segments: int = -1):
+                         width: float, height: float, color: RGBA255,
+                         border_width: float = 1, tilt_angle: float = 0,
+                         num_segments: int = -1) -> None:
     """
     Draw the outline of an ellipse.
 
@@ -366,9 +362,8 @@ def draw_ellipse_outline(center_x: float, center_y: float,
 # --- BEGIN LINE FUNCTIONS # # #
 
 
-def _generic_draw_line_strip(point_list: PointList,
-                             color: RGBA255,
-                             mode: int = gl.GL_LINE_STRIP):
+def _generic_draw_line_strip(point_list: PointList, color: RGBA255,
+                             mode: int = gl.GL_LINE_STRIP) -> None:
     """
     Draw a line strip. A line strip is a set of continuously connected
     line segments.
@@ -404,8 +399,8 @@ def _generic_draw_line_strip(point_list: PointList,
     geometry.render(program, mode=mode)
 
 
-def draw_line_strip(point_list: PointList,
-                    color: RGBA255, line_width: float = 1):
+def draw_line_strip(point_list: PointList, color: RGBA255,
+                    line_width: float = 1) -> None:
     """
     Draw a multi-point line.
 
@@ -430,7 +425,7 @@ def draw_line_strip(point_list: PointList,
 
 
 def draw_line(start_x: float, start_y: float, end_x: float, end_y: float,
-              color: RGBA255, line_width: float = 1):
+              color: RGBA255, line_width: float = 1) -> None:
     """
     Draw a line.
 
@@ -463,9 +458,8 @@ def draw_line(start_x: float, start_y: float, end_x: float, end_y: float,
     geometry.render(program, mode=gl.GL_LINES, vertices=2)
 
 
-def draw_lines(point_list: PointList,
-               color: RGBA255,
-               line_width: float = 1):
+def draw_lines(point_list: PointList, color: RGBA255,
+               line_width: float = 1) -> None:
     """
     Draw a set of lines.
 
@@ -505,7 +499,7 @@ def draw_lines(point_list: PointList,
 # --- BEGIN POINT FUNCTIONS # # #
 
 
-def draw_point(x: float, y: float, color: RGBA255, size: float):
+def draw_point(x: float, y: float, color: RGBA255, size: float) -> None:
     """
     Draw a point.
 
@@ -518,7 +512,7 @@ def draw_point(x: float, y: float, color: RGBA255, size: float):
     draw_rectangle_filled(x, y, size, size, color)
 
 
-def draw_points(point_list: PointList, color: RGBA255, size: float = 1):
+def draw_points(point_list: PointList, color: RGBA255, size: float = 1) -> None:
     """
     Draw a set of points.
 
@@ -558,8 +552,7 @@ def draw_points(point_list: PointList, color: RGBA255, size: float = 1):
 # --- BEGIN POLYGON FUNCTIONS # # #
 
 
-def draw_polygon_filled(point_list: PointList,
-                        color: RGBA255):
+def draw_polygon_filled(point_list: PointList, color: RGBA255) -> None:
     """
     Draw a polygon that is filled in.
 
@@ -571,9 +564,8 @@ def draw_polygon_filled(point_list: PointList,
     flattened_list = tuple(i for g in triangle_points for i in g)
     _generic_draw_line_strip(flattened_list, color, gl.GL_TRIANGLES)
 
-
-def draw_polygon_outline(point_list: PointList,
-                         color: RGBA255, line_width: float = 1):
+def draw_polygon_outline(point_list: PointList, color: RGBA255,
+                         line_width: float = 1) -> None:
     """
     Draw a polygon outline. Also known as a "line loop."
 
@@ -587,24 +579,25 @@ def draw_polygon_outline(point_list: PointList,
     new_point_list.append(point_list[0])
 
     triangle_point_list = []
-    # This needs a lot of improvement
-    last_point = None
-    for point in new_point_list:
-        if last_point is not None:
-            points = get_points_for_thick_line(last_point[0], last_point[1], point[0], point[1], line_width)
-            reordered_points = points[1], points[0], points[2], points[3]
-            triangle_point_list.extend(reordered_points)
-        last_point = point
-
-    points = get_points_for_thick_line(new_point_list[0][0], new_point_list[0][1], new_point_list[1][0],
-                                       new_point_list[1][1], line_width)
-    triangle_point_list.append(points[1])
+    for i in range(len(point_list) - 1):
+        point1 = point_list[i]
+        point2 = point_list[i + 1]
+
+        points = get_points_for_thick_line(point1[0], point1[1], point2[0], point2[1], line_width)
+        triangle_point_list.extend([points[1], points[0], points[2], points[3]])
+
+    # Handle the last segment (connecting back to the start)
+    point1 = point_list[-1]
+    point2 = point_list[0]
+    points = get_points_for_thick_line(point1[0], point1[1], point2[0], point2[1], line_width)
+    triangle_point_list.extend([points[1], points[0], points[2], points[3]])
     _generic_draw_line_strip(triangle_point_list, color, gl.GL_TRIANGLE_STRIP)
 
 
 def draw_triangle_filled(x1: float, y1: float,
                          x2: float, y2: float,
-                         x3: float, y3: float, color: RGBA255):
+                         x3: float, y3: float,
+                         color: RGBA255) -> None:
     """
     Draw a filled in triangle.
 
@@ -629,7 +622,7 @@ def draw_triangle_outline(x1: float, y1: float,
                           x2: float, y2: float,
                           x3: float, y3: float,
                           color: RGBA255,
-                          border_width: float = 1):
+                          border_width: float = 1) -> None:
     """
     Draw a the outline of a triangle.
 
@@ -663,7 +656,7 @@ def draw_triangle_outline(x1: float, y1: float,
 )
 def draw_lrtb_rectangle_outline(left: float, right: float, top: float,
                                 bottom: float, color: RGBA255,
-                                border_width: float = 1):
+                                border_width: float = 1) -> None:
     """
     Draw a rectangle by specifying left, right, top and bottom edges.
 
@@ -697,7 +690,7 @@ def draw_lrtb_rectangle_outline(left: float, right: float, top: float,
 
 
 def draw_lrbt_rectangle_outline(left: float, right: float, bottom: float, top: float, color: RGBA255,
-                                border_width: float = 1):
+                                border_width: float = 1) -> None:
     """
     Draw a rectangle by specifying left, right, bottom and top edges.
 
@@ -729,7 +722,7 @@ def draw_lrbt_rectangle_outline(left: float, right: float, bottom: float, top: f
 def draw_xywh_rectangle_outline(bottom_left_x: float, bottom_left_y: float,
                                 width: float, height: float,
                                 color: RGBA255,
-                                border_width: float = 1):
+                                border_width: float = 1) -> None:
     """
     Draw a rectangle extending from bottom left to top right
 
@@ -749,7 +742,7 @@ def draw_xywh_rectangle_outline(bottom_left_x: float, bottom_left_y: float,
 
 def draw_rectangle_outline(center_x: float, center_y: float, width: float,
                            height: float, color: RGBA255,
-                           border_width: float = 1, tilt_angle: float = 0):
+                           border_width: float = 1, tilt_angle: float = 0) -> None:
     """
     Draw a rectangle outline.
 
@@ -789,7 +782,7 @@ def draw_rectangle_outline(center_x: float, center_y: float, width: float,
     new_name="draw_lrbt_rectangle_filled"
 )
 def draw_lrtb_rectangle_filled(left: float, right: float, top: float,
-                               bottom: float, color: RGBA255):
+                               bottom: float, color: RGBA255) -> None:
     """
     Draw a rectangle by specifying left, right, top and bottom edges.
 
@@ -817,7 +810,7 @@ def draw_lrtb_rectangle_filled(left: float, right: float, top: float,
     draw_rectangle_filled(center_x, center_y, width, height, color)
 
 
-def draw_lrbt_rectangle_filled(left: float, right: float, bottom: float, top: float, color: RGBA255):
+def draw_lrbt_rectangle_filled(left: float, right: float, bottom: float, top: float, color: RGBA255) -> None:
     """
     Draw a rectangle by specifying left, right, bottom and top edges.
 
@@ -843,7 +836,7 @@ def draw_lrbt_rectangle_filled(left: float, right: float, bottom: float, top: fl
 
 def draw_xywh_rectangle_filled(bottom_left_x: float, bottom_left_y: float,
                                width: float, height: float,
-                               color: RGBA255):
+                               color: RGBA255) -> None:
     """
     Draw a filled rectangle extending from bottom left to top right
 
@@ -861,7 +854,7 @@ def draw_xywh_rectangle_filled(bottom_left_x: float, bottom_left_y: float,
 
 def draw_rectangle_filled(center_x: float, center_y: float, width: float,
                           height: float, color: RGBA255,
-                          tilt_angle: float = 0):
+                          tilt_angle: float = 0) -> None:
     """
     Draw a filled-in rectangle.
 
@@ -898,7 +891,7 @@ def draw_scaled_texture_rectangle(center_x: float, center_y: float,
                                   texture: Texture,
                                   scale: float = 1.0,
                                   angle: float = 0,
-                                  alpha: int = 255):
+                                  alpha: int = 255) -> None:
     """
     Draw a textured rectangle on-screen.
 
@@ -933,7 +926,7 @@ def draw_texture_rectangle(center_x: float, center_y: float,
                            height: float,
                            texture: Texture,
                            angle: float = 0,
-                           alpha: int = 255):
+                           alpha: int = 255) -> None:
     """
     Draw a textured rectangle on-screen.
 
@@ -948,11 +941,13 @@ def draw_texture_rectangle(center_x: float, center_y: float,
     texture.draw_sized(center_x, center_y, width, height, angle, alpha)
 
 
-def draw_lrwh_rectangle_textured(bottom_left_x: float, bottom_left_y: float,
+def draw_lrwh_rectangle_textured(bottom_left_x: float,
+                                 bottom_left_y: float,
                                  width: float,
                                  height: float,
-                                 texture: Texture, angle: float = 0,
-                                 alpha: int = 255):
+                                 texture: Texture,
+                                 angle: float = 0,
+                                 alpha: int = 255) -> None:
     """
     Draw a texture extending from bottom left to top right.