basilisk-engine 0.1.2__py3-none-any.whl → 0.1.3__py3-none-any.whl

basilisk/draw/draw.py

@@ -1,101 +1,101 @@
-from ..engine import Engine
-from ..render.image import Image
-
-def rect(engine: Engine, color: tuple, rect: tuple) -> None:
-    """
-    Draws a rectagle to the screen
-    Args:
-        engine: bsk.Engine
-            The destination engine for the rectangle
-        color: tuple(r, g, b) | tuple(r, g, b, a)
-            The color value of the rectangle, with int components in range [0, 255]
-        rect: tuple(x, y, w, h)
-            The screen position and size of the rectangle given in pixels
-    """
-    
-    # Get the draw handler from the engine
-    draw_handler = engine.scene.draw_handler
-    if not draw_handler: return
-
-    # Draw the rect
-    draw_handler.draw_rect(color, rect)
-
-
-def circle(engine: Engine, color: tuple, center: tuple, radius: int, resolution: int=20, outer_color: tuple=None) -> None:
-    """
-    Draws a rect between centered on x, y with width and height
-        Args:
-            color: tuple(r, g, b) | tuple(r, g, b, a)
-                The color value of the circle, with int components in range [0, 255]
-            center: tuple (x: float, y: float)
-                Center of the circle, given in pixels
-            radius: float
-                Radius of the circle, given in pixels
-            resolution: float
-                    The number of triangles used to approximate the circle
-    """
-    
-    # Get the draw handler from the engine
-    draw_handler = engine.scene.draw_handler
-    if not draw_handler: return
-
-    # Draw the circle
-    draw_handler.draw_circle(color, center, radius, resolution, outer_color)
-
-def line(engine: Engine, color: tuple, p1: tuple, p2: tuple, thickness: int=1) -> None:
-    """
-    Draws a line between two points
-        Args:
-            color: tuple=(r, g, b) | tuple=(r, g, b, a)
-                Color of the line
-            p1: tuple=((x1, y1), (x2, y2))
-                Starting point of the line. Given in pixels
-            p1: tuple=((x1, y1), (x2, y2))
-                Starting point of the line. Given in pixels
-            thickness: int
-                Size of the line on either side. pixels
-    """
-    
-    # Get the draw handler from the engine
-    draw_handler = engine.scene.draw_handler
-    if not draw_handler: return
-
-    # Draw the line
-    draw_handler.draw_line(color, p1, p2, thickness)
-
-def blit(engine: Engine, image: Image, rect: tuple):
-    """
-    Blits a basilisk image to the engine screen.
-    Args:
-        image: bsk.Image
-            The image to display on the screen
-        rect: tuple(x, y, w, h)
-            The screen position and size of the image given in pixels
-    """
-
-    # Get the draw handler from the engine
-    draw_handler = engine.scene.draw_handler
-    if not draw_handler: return
-
-    engine.scene.material_handler.image_handler.add(image)
-
-    # Blit the image
-    draw_handler.blit(image, rect)
-
-def text(engine: Engine, text: str, position: tuple, scale: float=1.0):
-    """
-    Renders text do the screen
-    USE SPARINGLY, INEFFICIENT IMPLAMENTATION
-    """
-    
-    font_renderer = engine.scene.draw_handler.font_renderer
-
-    # Render the text if it has not been cached
-    if text not in font_renderer.text_renders:
-        surf = font_renderer.render(text).convert_alpha()
-        text_image = Image(surf)
-        font_renderer.text_renders[text] = (text_image, surf.get_rect())
-    
-    # Blit the text image
-    img, rect = font_renderer.text_renders[text]
+from ..engine import Engine
+from ..render.image import Image
+
+def rect(engine: Engine, color: tuple, rect: tuple) -> None:
+    """
+    Draws a rectagle to the screen
+    Args:
+        engine: bsk.Engine
+            The destination engine for the rectangle
+        color: tuple(r, g, b) | tuple(r, g, b, a)
+            The color value of the rectangle, with int components in range [0, 255]
+        rect: tuple(x, y, w, h)
+            The screen position and size of the rectangle given in pixels
+    """
+    
+    # Get the draw handler from the engine
+    draw_handler = engine.scene.draw_handler
+    if not draw_handler: return
+
+    # Draw the rect
+    draw_handler.draw_rect(color, rect)
+
+
+def circle(engine: Engine, color: tuple, center: tuple, radius: int, resolution: int=20, outer_color: tuple=None) -> None:
+    """
+    Draws a rect between centered on x, y with width and height
+        Args:
+            color: tuple(r, g, b) | tuple(r, g, b, a)
+                The color value of the circle, with int components in range [0, 255]
+            center: tuple (x: float, y: float)
+                Center of the circle, given in pixels
+            radius: float
+                Radius of the circle, given in pixels
+            resolution: float
+                    The number of triangles used to approximate the circle
+    """
+    
+    # Get the draw handler from the engine
+    draw_handler = engine.scene.draw_handler
+    if not draw_handler: return
+
+    # Draw the circle
+    draw_handler.draw_circle(color, center, radius, resolution, outer_color)
+
+def line(engine: Engine, color: tuple, p1: tuple, p2: tuple, thickness: int=1) -> None:
+    """
+    Draws a line between two points
+        Args:
+            color: tuple=(r, g, b) | tuple=(r, g, b, a)
+                Color of the line
+            p1: tuple=((x1, y1), (x2, y2))
+                Starting point of the line. Given in pixels
+            p1: tuple=((x1, y1), (x2, y2))
+                Starting point of the line. Given in pixels
+            thickness: int
+                Size of the line on either side. pixels
+    """
+    
+    # Get the draw handler from the engine
+    draw_handler = engine.scene.draw_handler
+    if not draw_handler: return
+
+    # Draw the line
+    draw_handler.draw_line(color, p1, p2, thickness)
+
+def blit(engine: Engine, image: Image, rect: tuple):
+    """
+    Blits a basilisk image to the engine screen.
+    Args:
+        image: bsk.Image
+            The image to display on the screen
+        rect: tuple(x, y, w, h)
+            The screen position and size of the image given in pixels
+    """
+
+    # Get the draw handler from the engine
+    draw_handler = engine.scene.draw_handler
+    if not draw_handler: return
+
+    engine.scene.material_handler.image_handler.add(image)
+
+    # Blit the image
+    draw_handler.blit(image, rect)
+
+def text(engine: Engine, text: str, position: tuple, scale: float=1.0):
+    """
+    Renders text do the screen
+    USE SPARINGLY, INEFFICIENT IMPLAMENTATION
+    """
+    
+    font_renderer = engine.scene.draw_handler.font_renderer
+
+    # Render the text if it has not been cached
+    if text not in font_renderer.text_renders:
+        surf = font_renderer.render(text).convert_alpha()
+        text_image = Image(surf)
+        font_renderer.text_renders[text] = (text_image, surf.get_rect())
+    
+    # Blit the text image
+    img, rect = font_renderer.text_renders[text]
     blit(engine, img, (position[0] - rect[2] * scale / 2, position[1] - rect[3] * scale / 2, rect[2] * scale, rect[3] * scale))

basilisk/draw/draw_handler.py

@@ -1,210 +1,180 @@
-import moderngl as mgl
-import numpy as np
-import glm
-from math import cos, sin, atan2
-from ..render.image import Image
-from .font_renderer import FontRenderer
-from ..render.shader import Shader
-
-class DrawHandler():
-    engine: ...
-    """Back reference to the parent engine"""
-    scene: ...
-    """Back reference to the parent scene"""
-    ctx: mgl.Context
-    """Back reference to the parent context"""
-    program: mgl.Program
-    """2D draw program"""
-    draw_data: list[float]
-    """Temporary buffer for user draw calls"""
-    vbo: mgl.Buffer=None
-    """Buffer for all 2D draws"""
-    vao: mgl.VertexArray=None
-    """VAO for rendering all 2D draw calls"""
-    
-    def __init__(self, scene) -> None:
-        # Back references
-        self.scene  = scene
-        self.engine = scene.engine
-        self.ctx    = scene.engine.ctx
-
-        # Get the shader
-        root = self.engine.root
-        self.shader = self.scene.shader_handler.add(Shader(self.engine, root + '/shaders/draw.vert', root + '/shaders/draw.frag'))
-
-        # Initialize draw data as blank
-        self.draw_data = []
-        self.vbo = None
-        self.vao = None
-
-        self.font_renderer = FontRenderer(self.engine.root)
-
-    def render(self) -> None:
-        """
-        Renders all draw calls from the user since the last frame
-        """
-        
-        if not self.draw_data: return
-
-        # Reverse the draw order, and convert to C-like array
-        self.draw_data.reverse()
-        data = np.array(self.draw_data, dtype='f4')
-        ratio = np.array([2 / self.engine.win_size[0], 2 / self.engine.win_size[1]])
-        data[:,:2] = data[:,:2] * ratio - 1
-
-        # Create buffer and VAO
-        self.vbo = self.ctx.buffer(data)
-        self.vao = self.ctx.vertex_array(self.shader.program, [(self.vbo, '2f 4f 1i', *['in_position', 'in_color', 'in_uses_image'])], skip_errors=True)
-
-        # Render the VAO
-        self.ctx.enable(mgl.BLEND)
-        self.ctx.blend_equation = mgl.ADDITIVE_BLENDING
-        self.vao.render()
-
-        # Clera the draw data
-        self.vbo.release()
-        self.vao.release()
-        self.vbo = None
-        self.vao = None
-        self.draw_data.clear()
-
-    def draw_rect(self, color: tuple, rect: tuple) -> None:
-        """
-        Draws a rect to the screen
-        """
-
-        color = validate_color(color)
-        rect  = validate_rect(rect)
-
-        p1 = (rect[0]          , rect[1]          )
-        p2 = (rect[0]          , rect[1] + rect[3])
-        p3 = (rect[0] + rect[2], rect[1]          )
-        p4 = (rect[0] + rect[2], rect[1] + rect[3])
-
-        v1 = (*p1, *color, 0)
-        v2 = (*p2, *color, 0)
-        v3 = (*p3, *color, 0)
-        v4 = (*p4, *color, 0)
-
-        self.draw_data.extend([
-            v1, v3, v2,
-            v2, v3, v4
-        ])
-
-    def draw_circle(self, color: tuple, center: tuple, radius: int, resolution: int=20, outer_color: tuple=None) -> None:
-        """
-        Draws a rect between centered on x, y with width and height
-            Args:
-                color: tuple(r, g, b) | tuple(r, g, b, a)
-                    The color value of the circle, with int components in range [0, 255]
-                center: tuple (x: float, y: float)
-                    Center of the circle, given in pixels
-                radius: float
-                    Radius of the circle, given in pixels
-                resolution: float
-                    The number of triangles used to approximate the circle
-        """
-
-        if not outer_color: outer_color = color
-        color  = validate_color(color)
-        outer_color  = validate_color(outer_color)
-        p1 = validate_point(center)
-
-        v1 = (*p1, *color, 0)
-        theta = 0
-        delta_theta = (2 * 3.1415) / resolution
-
-        for triangle in range(resolution):
-            v2 = (center[0] + radius * cos(theta), center[1] + radius * sin(theta), *outer_color, 0)
-            theta += delta_theta
-            v3 = (center[0] + radius * cos(theta), center[1] + radius * sin(theta), *outer_color, 0)
-            self.draw_data.extend([v1, v2, v3])
-
-    def draw_line(self, color: tuple, p1: tuple, p2: tuple, thickness: int=1):
-        """
-        Draws a line between two points
-            Args:
-                color: tuple=(r, g, b) | tuple=(r, g, b, a)
-                    Color of the line
-                p1: tuple=((x1, y1), (x2, y2))
-                    Starting point of the line. Given in pixels
-                p1: tuple=((x1, y1), (x2, y2))
-                    Starting point of the line. Given in pixels
-                thickness: int
-                    Size of the line on either side. pixels
-        """
-        
-        color = validate_color(color)
-
-        p1 = glm.vec2(validate_point(p1))
-        p2 = glm.vec2(validate_point(p2))
-
-        thickness /= 2
-
-        unit = glm.normalize(p1 - p2) * thickness
-        theta = atan2(*unit)
-        perp_vector = glm.vec2(cos(-theta), sin(-theta)) * thickness
-
-        v1 = (*(p1 - perp_vector), *color, 0)
-        v2 = (*(p1 + perp_vector), *color, 0)
-        v3 = (*(p2 - perp_vector), *color, 0)
-        v4 = (*(p2 + perp_vector), *color, 0)
-        
-        self.draw_data.extend([v1, v3, v4, v2, v1, v4])
-
-    def blit(self, image: Image, rect: tuple):
-        rect  = validate_rect(rect)
-
-        p1 = (rect[0]          , rect[1]          )
-        p2 = (rect[0]          , rect[1] + rect[3])
-        p3 = (rect[0] + rect[2], rect[1]          )
-        p4 = (rect[0] + rect[2], rect[1] + rect[3])
-
-        v1 = (*p1, *image.index, 0, 0, 1)
-        v2 = (*p2, *image.index, 0, 1, 1)
-        v3 = (*p3, *image.index, 1, 0, 1)
-        v4 = (*p4, *image.index, 1, 1, 1)
-
-        self.draw_data.extend([
-            v1, v3, v2,
-            v2, v3, v4
-        ])
-
-    def __del__(self) -> None:
-        """
-        Releases any allocated data
-        """
-        
-        if self.vbo: self.vbo.release()
-        if self.vao: self.vao.release()
-
-
-def validate_color(color):
-    if not (isinstance(color, tuple) or isinstance(color, list) or isinstance(color, np.ndarray)):
-        raise TypeError(f'Invalid color type: {type(color)}. Expected a tuple, list, or numpy array')
-    if len(color) == 4:
-        color = (color[0] / 255.0, color[1] / 255.0, color[2] / 255.0, color[3] / 255.0)
-    elif len(color) == 3:
-        color = (color[0] / 255.0, color[1] / 255.0, color[2] / 255.0, 1.0)
-    else:
-        raise TypeError(f'Invalid number of color values. Expected 3 or 4 values, got {len(color)}')
-    return color
-
-def validate_rect(rect):
-    if not (isinstance(rect, tuple) or isinstance(rect, list) or isinstance(rect, np.ndarray)):
-        raise TypeError(f'Invalid rect type: {type(rect)}. Expected a tuple, list, or numpy array')
-    if len(rect) != 4:
-        raise TypeError(f'Invalid number of rect values. Expected 4 values, got {len(rect)}')
-    return list(rect)
-
-def validate_point(point):
-    if not (isinstance(point, tuple) or isinstance(point, list) or isinstance(point, np.ndarray)):
-        raise TypeError(f'Invalid rect type: {type(point)}. Expected a tuple, list, or numpy array')
-    if len(point) != 2:
-        raise TypeError(f'Invalid number of rect values. Expected 2 values, got {len(point)}')
-    return list(point)
-
-def validate_image(image):
-    if not (isinstance(image, Image)):
-        raise TypeError(f'Invalid imgae type: {type(image)}. Expected a bask.Image.')
-    return image
+import moderngl as mgl
+import numpy as np
+import glm
+from math import cos, sin, atan2
+from ..render.image import Image
+from .font_renderer import FontRenderer
+from ..render.shader import Shader
+from ..generic.input_validation import validate_color, validate_rect, validate_point
+
+class DrawHandler():
+    engine: ...
+    """Back reference to the parent engine"""
+    scene: ...
+    """Back reference to the parent scene"""
+    ctx: mgl.Context
+    """Back reference to the parent context"""
+    program: mgl.Program
+    """2D draw program"""
+    draw_data: list[float]
+    """Temporary buffer for user draw calls"""
+    vbo: mgl.Buffer=None
+    """Buffer for all 2D draws"""
+    vao: mgl.VertexArray=None
+    """VAO for rendering all 2D draw calls"""
+    
+    def __init__(self, scene) -> None:
+        # Back references
+        self.scene  = scene
+        self.engine = scene.engine
+        self.ctx    = scene.engine.ctx
+
+        # Get the shader
+        root = self.engine.root
+        self.shader = self.scene.shader_handler.add(Shader(self.engine, root + '/shaders/draw.vert', root + '/shaders/draw.frag'))
+
+        # Initialize draw data as blank
+        self.draw_data = []
+        self.vbo = None
+        self.vao = None
+
+        self.font_renderer = FontRenderer(self.engine.root)
+
+    def render(self) -> None:
+        """
+        Renders all draw calls from the user since the last frame
+        """
+        
+        if not self.draw_data: return
+
+        # Reverse the draw order, and convert to C-like array
+        self.draw_data.reverse()
+        data = np.array(self.draw_data, dtype='f4')
+        ratio = np.array([2 / self.engine.win_size[0], 2 / self.engine.win_size[1]])
+        data[:,:2] = data[:,:2] * ratio - 1
+
+        # Create buffer and VAO
+        self.vbo = self.ctx.buffer(data)
+        self.vao = self.ctx.vertex_array(self.shader.program, [(self.vbo, '2f 4f 1i', *['in_position', 'in_color', 'in_uses_image'])], skip_errors=True)
+
+        # Render the VAO
+        self.ctx.enable(mgl.BLEND)
+        self.ctx.blend_equation = mgl.ADDITIVE_BLENDING
+        self.vao.render()
+
+        # Clera the draw data
+        self.vbo.release()
+        self.vao.release()
+        self.vbo = None
+        self.vao = None
+        self.draw_data.clear()
+
+    def draw_rect(self, color: tuple, rect: tuple) -> None:
+        """
+        Draws a rect to the screen
+        """
+
+        color = validate_color('draw', 'color', color)
+        rect  = validate_rect(rect)
+
+        p1 = (rect[0]          , rect[1]          )
+        p2 = (rect[0]          , rect[1] + rect[3])
+        p3 = (rect[0] + rect[2], rect[1]          )
+        p4 = (rect[0] + rect[2], rect[1] + rect[3])
+
+        v1 = (*p1, *color, 0)
+        v2 = (*p2, *color, 0)
+        v3 = (*p3, *color, 0)
+        v4 = (*p4, *color, 0)
+
+        self.draw_data.extend([
+            v1, v3, v2,
+            v2, v3, v4
+        ])
+
+    def draw_circle(self, color: tuple, center: tuple, radius: int, resolution: int=20, outer_color: tuple=None) -> None:
+        """
+        Draws a rect between centered on x, y with width and height
+            Args:
+                color: tuple(r, g, b) | tuple(r, g, b, a)
+                    The color value of the circle, with int components in range [0, 255]
+                center: tuple (x: float, y: float)
+                    Center of the circle, given in pixels
+                radius: float
+                    Radius of the circle, given in pixels
+                resolution: float
+                    The number of triangles used to approximate the circle
+        """
+
+        if not outer_color: outer_color = color
+        color  = validate_color('draw', 'color', color)
+        outer_color  = validate_color('draw', 'color', outer_color)
+        p1 = validate_point(center)
+
+        v1 = (*p1, *color, 0)
+        theta = 0
+        delta_theta = (2 * 3.1415) / resolution
+
+        for triangle in range(resolution):
+            v2 = (center[0] + radius * cos(theta), center[1] + radius * sin(theta), *outer_color, 0)
+            theta += delta_theta
+            v3 = (center[0] + radius * cos(theta), center[1] + radius * sin(theta), *outer_color, 0)
+            self.draw_data.extend([v1, v2, v3])
+
+    def draw_line(self, color: tuple, p1: tuple, p2: tuple, thickness: int=1):
+        """
+        Draws a line between two points
+            Args:
+                color: tuple=(r, g, b) | tuple=(r, g, b, a)
+                    Color of the line
+                p1: tuple=((x1, y1), (x2, y2))
+                    Starting point of the line. Given in pixels
+                p1: tuple=((x1, y1), (x2, y2))
+                    Starting point of the line. Given in pixels
+                thickness: int
+                    Size of the line on either side. pixels
+        """
+        
+        color = validate_color('draw', 'color', color)
+
+        p1 = glm.vec2(validate_point(p1))
+        p2 = glm.vec2(validate_point(p2))
+
+        thickness /= 2
+
+        unit = glm.normalize(p1 - p2) * thickness
+        theta = atan2(*unit)
+        perp_vector = glm.vec2(cos(-theta), sin(-theta)) * thickness
+
+        v1 = (*(p1 - perp_vector), *color, 0)
+        v2 = (*(p1 + perp_vector), *color, 0)
+        v3 = (*(p2 - perp_vector), *color, 0)
+        v4 = (*(p2 + perp_vector), *color, 0)
+        
+        self.draw_data.extend([v1, v3, v4, v2, v1, v4])
+
+    def blit(self, image: Image, rect: tuple):
+        rect  = validate_rect(rect)
+
+        p1 = (rect[0]          , rect[1]          )
+        p2 = (rect[0]          , rect[1] + rect[3])
+        p3 = (rect[0] + rect[2], rect[1]          )
+        p4 = (rect[0] + rect[2], rect[1] + rect[3])
+
+        v1 = (*p1, *image.index, 0, 0, 1)
+        v2 = (*p2, *image.index, 0, 1, 1)
+        v3 = (*p3, *image.index, 1, 0, 1)
+        v4 = (*p4, *image.index, 1, 1, 1)
+
+        self.draw_data.extend([
+            v1, v3, v2,
+            v2, v3, v4
+        ])
+
+    def __del__(self) -> None:
+        """
+        Releases any allocated data
+        """
+        
+        if self.vbo: self.vbo.release()
+        if self.vao: self.vao.release()

basilisk/draw/font_renderer.py

@@ -1,28 +1,28 @@
-import pygame as pg
-
-class FontRenderer():
-    def __init__(self, root):
-        pg.font.init()
-        self.font = pg.font.Font(root + '/bsk_assets/Roboto-Regular.ttf', 48)
-        self.text_renders = {}
-
-    def render(self, text, color=(255, 255, 255), bold=False, underline=False, italic=False):
-        '''
-        Renders any font which has been loaded to the class instance.
-        Args:
-            text::str
-                Text to be rendered
-            color::(int, int, int) =(255, 255, 255)
-                The RGB value of the text
-            bold::bool (=False)
-                Specifies if the text should be rendered in bolded font
-            underline::bool (=False)
-                Specifies if the text should be underlined in bolded font
-            italic::bool (=False)
-                Specifies if the text should be rendered in italicized font
-        '''
-        self.font.set_bold(bold)
-        self.font.set_underline(underline)
-        self.font.set_italic(italic)
-
-        return self.font.render(text, True, color, (0, 0, 0, 0))
+import pygame as pg
+
+class FontRenderer():
+    def __init__(self, root):
+        pg.font.init()
+        self.font = pg.font.Font(root + '/bsk_assets/Roboto-Regular.ttf', 48)
+        self.text_renders = {}
+
+    def render(self, text, color=(255, 255, 255), bold=False, underline=False, italic=False):
+        '''
+        Renders any font which has been loaded to the class instance.
+        Args:
+            text::str
+                Text to be rendered
+            color::(int, int, int) =(255, 255, 255)
+                The RGB value of the text
+            bold::bool (=False)
+                Specifies if the text should be rendered in bolded font
+            underline::bool (=False)
+                Specifies if the text should be underlined in bolded font
+            italic::bool (=False)
+                Specifies if the text should be rendered in italicized font
+        '''
+        self.font.set_bold(bold)
+        self.font.set_underline(underline)
+        self.font.set_italic(italic)
+
+        return self.font.render(text, True, color, (0, 0, 0, 0))