basilisk-engine 0.1.28__py3-none-any.whl → 0.1.29__py3-none-any.whl

basilisk/generic/input_validation.py

@@ -3,6 +3,14 @@ import glm
 from ..render.image import Image
 
 
+def validate_int(module: str, name: str, value: int | float | glm.int32) -> float:
+    if isinstance(value, int) or isinstance(value, float):
+        return int(round(value))
+    elif isinstance(value, glm.int32):
+        return int(value.value)
+    else:
+        raise TypeError(f"{module}: Invalid {name} value type {type(value)}. Expected float.")
+
 def validate_float(module: str, name: str, value: float | int | glm.float32) -> float:
     if isinstance(value, float) or isinstance(value, int):
         return float(value)
@@ -10,7 +18,7 @@ def validate_float(module: str, name: str, value: float | int | glm.float32) ->
         return float(value.value)
     else:
         raise TypeError(f"{module}: Invalid {name} value type {type(value)}. Expected float.")
-    
+
 def validate_glm_vec3(module: str, name: str, value: tuple | list | glm.vec3 | np.ndarray) -> glm.vec3:
     if isinstance(value, tuple) or isinstance(value, list) or isinstance(value, np.ndarray):
         if len(value) != 3: raise ValueError(f"{module}: Invalid number of values for {name}. Expected 3 values, got {len(value)} values")

basilisk/render/framebuffer.py

@@ -2,6 +2,7 @@ import numpy as np
 import moderngl as mgl
 from PIL import Image
 from ..render.shader import Shader
+from ..generic.input_validation import validate_int
 
 
 class Framebuffer:
@@ -36,7 +37,7 @@ class Framebuffer:
         self._size          = size
         self.scale          = scale
         self.texture_filter = (mgl.LINEAR, mgl.LINEAR) if linear_filter else (mgl.NEAREST, mgl.NEAREST)
-        self.n_attachments    = n_color_attachments
+        self.n_attachments  = n_color_attachments
 
         self.load_pipeline()
         self.generate_fbo()
@@ -59,6 +60,10 @@ class Framebuffer:
         # Create the internal fbo
         self.fbo = self.ctx.framebuffer(self._color_attachments, self._depth_attachment)
 
+        # Set the show attachment to default
+        self._show = -1
+        self.show = 0
+
     def resize(self, new_size: tuple[int]=None) -> None:
         """
         Update set size framebuffers with the given size.
@@ -86,13 +91,18 @@ class Framebuffer:
         self.vbo = self.ctx.buffer(np.array([[-1, -1, 0, 0, 0], [1, -1, 0, 1, 0], [1, 1, 0, 1, 1], [-1, 1, 0, 0, 1], [-1, -1, 0, 0, 0], [1, 1, 0, 1, 1]], dtype='f4'))
         self.vao = self.ctx.vertex_array(self.shader.program, [(self.vbo, '3f 2f', 'in_position', 'in_uv')], skip_errors=True)
 
-    def render(self, render_target=None) -> None:
+    def render(self, render_target=None, show: int=None) -> None:
+        """
+        Render the fbo to the screen
+        If the fbo has multiple attachments, show will specifiy which is shown
+        Depth is considered the last show element
+        """
 
-        target = render_target if render_target else self.engine.frame
+        if not isinstance(show, type(None)): self.show = show
 
+        target = render_target if render_target else self.engine.frame
         target.use()
-        self.shader.program['screenTexture'] = 0
-        self.texture.use(location=0)
+
         self.vao.render()
 
     def use(self) -> None:
@@ -143,13 +153,23 @@ class Framebuffer:
     def data(self) -> bytes:
         """Reads the data from the fbo"""
         return self.fbo.read()
-    
+    @property
+    def show(self) -> int:
+        return self._show
 
     @size.setter
     def size(self, value: tuple[int]=None) -> tuple[int]:
         self.resize(value)
         return self.size
     
+    @show.setter
+    def show(self, value: int) -> None:
+        value = validate_int("Framebuffer", "show", value)
+        if value == self._show: return
+        self._show = value
+        self.shader.program['screenTexture'] = value+1
+        self.color_attachments[value].use(location=value+1)
+
     def __repr__(self) -> str:
         return f'<bsk.Framebuffer | size: {self.size}>' 
 

basilisk/render/image.py

@@ -19,6 +19,8 @@ class Image():
     """Array of the texture data"""
     size: int
     """The width and height in pixels of the image"""
+    texture: mgl.Texture | None=None
+    """Texture of the image. Only created and retrived if needed by other module"""
 
     def __init__(self, path: str | os.PathLike | pg.Surface | mgl.Texture) -> None:
         """
@@ -81,8 +83,39 @@ class Image():
         """
         ...
 
+    def build_texture(self, ctx: mgl.Context) -> mgl.Texture:
+        """
+        Builds a texture from the image data
+        """
+
+        # Release existing memory
+        if self.texture: self.texture.release()
+
+        # Make the texture from image data
+        self.texture = ctx.texture((self.size, self.size), components=4, data=self.data)
+        # Texture formatting
+        self.texture.build_mipmaps()
+        self.texture.filter = (mgl.LINEAR_MIPMAP_LINEAR, mgl.LINEAR)
+        self.texture.anisotropy = 32.0
+        
+        return self.texture
+
+    def use(self, slot: int) -> None:
+        """
+        Use the image at the given slot
+        """
+        
+        if not self.texture:
+            raise LookupError("bsk.Image: cannot use an image without a texture. Use texture.build_texture() before texture.use()")
+
+        # Bind to the given slot
+        self.texture.use(location=slot)
+
     def __repr__(self) -> str:
         """
         Returns a string representation of the object
         """
-        return f'<Basilisk Image | {self.name}, ({self.size}x{self.size}), {sys.getsizeof(self.data) / 1024 / 1024:.2} mb>'
+        return f'<Basilisk Image | {self.name}, ({self.size}x{self.size}), {sys.getsizeof(self.data) / 1024 / 1024:.2} mb>'
+    
+    def __del__(self) -> None:
+        if self.texture: self.texture.release()

basilisk/render/material.py

@@ -152,7 +152,9 @@ class Material():
     @texture.setter
     def texture(self, value: Image | None):
         self._texture = validate_image("Material", "texture", value)
-        if self.material_handler: self.material_handler.write(regenerate=True)
+        if not self.material_handler: return
+        self.material_handler.image_handler.add(value)
+        self.material_handler.write(regenerate=True)
         
     @normal.setter
     def normal(self, value: Image | None):

basilisk/render/material_handler.py

@@ -13,6 +13,8 @@ class MaterialHandler():
     """List containing all the materials in the engine"""
     data_texture: mgl.Texture
     """ModernGL texture containing all the material data for materials in the engine"""
+    image_handler: ImageHandler=None
+    """Handler for all images in the game"""
   
     def __init__(self, engine) -> None:
         """

basilisk/render/shader.py

@@ -1,5 +1,5 @@
 import moderngl as mgl
-import random
+from .image import Image
 
 attribute_mappings = {
     'in_position'  : [0, 1, 2],
@@ -48,6 +48,7 @@ class Shader:
         self.attribute_indices = []
         self.fmt               = ''
         self.attributes        = []
+        self.bindings = 1
 
         # Default vertex and fragment shaders
         if vert == None: vert = self.engine.root + '/shaders/batch.vert'
@@ -112,6 +113,21 @@ class Shader:
         
         self.program[name].write(value)
     
+    def bind(self, sampler: mgl.Texture | mgl.TextureArray | mgl.TextureCube | Image, name: str, slot: int=None) -> None:
+        """
+        Binds the given sampler to the next availible slot
+        """
+
+        # Use the next slot if no slot is given
+        if not slot: slot = self.bindings; self.bindings+=1
+
+        if isinstance(sampler, Image,): sampler = sampler.build_texture(self.ctx)
+
+        # Use the sampler
+        self.program[name] = slot
+        sampler.use(location=slot)
+        
+
     def __del__(self) -> int:
         if self.program: self.program.release()
 

{basilisk_engine-0.1.28.dist-info → basilisk_engine-0.1.29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: basilisk-engine
-Version: 0.1.28
+Version: 0.1.29
 Summary: Python 3D Framework
 Home-page: https://basilisk-website.vercel.app/
 Author: Name

{basilisk_engine-0.1.28.dist-info → basilisk_engine-0.1.29.dist-info}/RECORD

@@ -33,7 +33,7 @@ basilisk/generic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 basilisk/generic/abstract_bvh.py,sha256=BZv9mgkUpNu3bcqmn9I60VqMZocebeyUOoER2Wdky3g,368
 basilisk/generic/abstract_custom.py,sha256=wwtQUu7JkCKEt7zgGDrjBlsB5DdYHkMhq4yv3Wlpv9k,4406
 basilisk/generic/collisions.py,sha256=lMhZJkbFuoQTXCF-sQmV5f7_3SaEn_nvhwXNU5YaecM,2562
-basilisk/generic/input_validation.py,sha256=r6lqqTzB92KOiIBptcimkVkrJn_rnDO1unHXQOOnhu4,3511
+basilisk/generic/input_validation.py,sha256=bsI-4pzF9LFkmxvlLOCHQ0-dqKJrTRBZd1tIX4rzYaQ,3859
 basilisk/generic/math.py,sha256=1vIX7VMD-qatd1QcC1w52uP9VKGmD6jdcA7_syUoMWI,170
 basilisk/generic/matrices.py,sha256=N21nL_B2jsZ2Oxsw9jpY03qIHaElAZcj_hnWs85K0t8,1288
 basilisk/generic/meshes.py,sha256=Rijhvr1NWx0HU2WTaROsspWfyd9FZU27sdkpxGl9xvk,2567
@@ -41,9 +41,6 @@ basilisk/generic/quat.py,sha256=gEqvQvNwx5K7e0zqY0TFTAFtNFSkOatleoP9HQQ-xyk,5102
 basilisk/generic/quat_methods.py,sha256=SO18ush7pfeGUmncPy4i5nsab1e_zkQkY6zT1bAsSDY,234
 basilisk/generic/raycast_result.py,sha256=waVmS9fYhLoz_G_DU2Mj7896rF0Xy_59JVGALq-kD7g,783
 basilisk/generic/vec3.py,sha256=AtPSz2S1ZqAm-sZUz4phB09hgFxMIsJnQdU1wmxiOBw,5137
-basilisk/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-basilisk/input/mouse.py,sha256=waXJLIyka4IVe3W2WH5SNNxiOQRouYo3NxafP3fg0qg,1937
-basilisk/input/path.py,sha256=GpFYe3Uu6VZAuKh9Q2nQM1H8immiCp_snznLG9FKcvU,441
 basilisk/input_output/IO_handler.py,sha256=DDQEjmIHzWo99rk1riT_QJKGQ5F8-lOilmchRXeQuYI,2822
 basilisk/input_output/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/input_output/clock.py,sha256=GHTagpPyPlLjWyonaHV8M-nPCcdHcHL4JobbuUOxYf0,1462
@@ -75,15 +72,15 @@ basilisk/render/camera.py,sha256=pOM5sVSHl_joHwsBLd8Y7CzLUL-16XBBQfgsnM8jc6Q,964
 basilisk/render/chunk.py,sha256=Yyyh6jEEG_JQIk02hEDs1L-UbmKDZQcAHtGV4pxSJ7U,2715
 basilisk/render/chunk_handler.py,sha256=PJNGWv3DURm8rYKb3WlGVx6CJ5arbaIiMwA1UN-G480,6332
 basilisk/render/frame.py,sha256=v7EuQ7FRXzxyeS7QFlqyz-jzveAkQkglxhHVjv6zAFY,2917
-basilisk/render/framebuffer.py,sha256=XZBBw4WwX6XgbtlacwLUVhSSXCDIQjQAqGwWKkakLN4,5537
-basilisk/render/image.py,sha256=HotYV1bUCJ71bJLfdertz2AKKh0q5k268Ph_tbzP9ss,2873
+basilisk/render/framebuffer.py,sha256=28_oqR_eLNytyTS_2kNIHIY30T5ICoOK80jRnTZdtQ8,6222
+basilisk/render/image.py,sha256=d-5RGr-TlsGqvI-GQ8_pV-FNdmTzD0mlk2K3K4XNuwQ,3984
 basilisk/render/image_handler.py,sha256=DNb-AiouziLVQu3NkoG1F90YZTHHWyhFYhaWJ9uiUOU,4175
 basilisk/render/light.py,sha256=SOOh5zAGUCgQdJjWb5MlJgtvdxkEV8AWqQ4P93bJj2g,3783
 basilisk/render/light_handler.py,sha256=gvg4OhDMy8dZg5XNcOZB4_1G2uE1gBFRxlBeoG3l3vM,2104
-basilisk/render/material.py,sha256=RdZDy-pqxlpBW8n8JOsxETmd5XjXu6cxrCd5_6_DOww,9436
-basilisk/render/material_handler.py,sha256=CG_a_cV4V_1iYdhCjn7etFxIbAXyRgVicR135rim0oA,3983
+basilisk/render/material.py,sha256=MYcNbhNyVJ3DeAB8cq-aMYRPJfWxBA1c1xpODXJqbsY,9510
+basilisk/render/material_handler.py,sha256=b5K-Y3uzCqb1G9WMyvbonuh4GAOQnu5IkeNCq09PKBs,4065
 basilisk/render/post_process.py,sha256=iDQ05SUXUUmVcCq4m6c16m0yfWxQjM3NB9vciorJnV0,4959
-basilisk/render/shader.py,sha256=PQ0XwE4ZtekQBdVUKwLsXbbTlsI_yuUVsJM1Iy4MPsc,4259
+basilisk/render/shader.py,sha256=q5eSvWTEP55oNoM7kepEizSOQyjDkDLV2RrFiySaKOI,4799
 basilisk/render/shader_handler.py,sha256=w1bGwVXm61_dDVlX9WgU8CKOMdqTjcooNlMsdN9lVnc,2738
 basilisk/render/sky.py,sha256=orTtgkU35AHZTUGk9IevSXwVs6tktoDP52yEUM5Rg0E,4768
 basilisk/shaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -103,7 +100,7 @@ basilisk/shaders/particle.frag,sha256=JXhPDvgd7JDw0-PCZtCOjHTTw2DMeeSaBvTr5fHuIy
 basilisk/shaders/particle.vert,sha256=bJv3hsWjWYb-g0mgdCV9eH-TVRwpCzhA3wsgSUI3WEM,2943
 basilisk/shaders/sky.frag,sha256=KG8ablNdaJ5E2Gf1ZpfP3ih252fY8ZNjign_fwjN6V4,169
 basilisk/shaders/sky.vert,sha256=oAnrknEgsd9MawE_zx8P0u9nUSFEBYBg5ykBmWpqZ_g,332
-basilisk_engine-0.1.28.dist-info/METADATA,sha256=OQkE12NPZNgg5fQbjFOxafRJ_V7PQzOf5k6SCm9kPE0,1261
-basilisk_engine-0.1.28.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-basilisk_engine-0.1.28.dist-info/top_level.txt,sha256=enlSYSf7CUyAly1jmUCNNGInTbaFUjGk4SKwyckZQkw,9
-basilisk_engine-0.1.28.dist-info/RECORD,,
+basilisk_engine-0.1.29.dist-info/METADATA,sha256=DM9gt-GfjI8qpzUT8wYD_OFbyd5kcYaPIq9e7UuwvQ4,1261
+basilisk_engine-0.1.29.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+basilisk_engine-0.1.29.dist-info/top_level.txt,sha256=enlSYSf7CUyAly1jmUCNNGInTbaFUjGk4SKwyckZQkw,9
+basilisk_engine-0.1.29.dist-info/RECORD,,

basilisk/input/mouse.py

@@ -1,62 +0,0 @@
-import pygame as pg
-
-
-class Mouse():
-    def __init__(self, grab=True):
-        self.x, self.y = pg.mouse.get_pos()
-        self.buttons = pg.mouse.get_pressed()
-        self.previous_buttons = pg.mouse.get_pressed()
-        self.grab = grab
-
-    def update(self, events):
-        """
-        Updates all mouse state variables.
-        Checks for mouse-related events.
-        """
-        
-        self.x, self.y = pg.mouse.get_pos()
-        self.previous_buttons = self.buttons
-        self.buttons = pg.mouse.get_pressed()
-
-        for event in events:
-            if event.type == pg.KEYUP:
-                if event.key == pg.K_ESCAPE and self.grab:
-                    # Unlock mouse
-                    pg.event.set_grab(False)
-                    pg.mouse.set_visible(True)
-            if event.type == pg.MOUSEBUTTONUP and self.grab:
-                # Lock mouse
-                pg.event.set_grab(True)
-                pg.mouse.set_visible(False)
-
-    def set_pos(self, x, y):
-        """Set the mouse position"""
-        pg.mouse.set_pos(x, y)
-
-    @property
-    def click(self): return self.buttons[0] and not self.previous_buttons[0]
-    @property
-    def left_click(self): return self.buttons[0] and not self.previous_buttons[0]
-    @property
-    def middle_click(self): return self.buttons[1] and not self.previous_buttons[1]
-    @property
-    def right_click(self): return self.buttons[2] and not self.previous_buttons[2]
-    @property
-    def left_down(self): return self.buttons[0]
-    @property
-    def middle_down(self): return self.buttons[1]
-    @property
-    def right_down(self): return self.buttons[2]
-
-    @property
-    def grab(self): return self._grab
-
-    @grab.setter
-    def grab(self, value):
-        self._grab = value
-        if self._grab:
-            pg.event.set_grab(True)
-            pg.mouse.set_visible(False)
-        else:
-            pg.event.set_grab(False)
-            pg.mouse.set_visible(True)

basilisk/input/path.py

@@ -1,14 +0,0 @@
-import os
-import sys
-
-
-# Credit for function: https://stackoverflow.com/questions/7674790/bundling-data-files-with-pyinstaller-onefile
-def get_root():
-    """ Get absolute path to resource, works for dev and for PyInstaller """
-    try:
-        # PyInstaller creates a temp folder and stores path in _MEIPASS
-        base_path = sys._MEIPASS
-    except Exception:
-        base_path = os.path.abspath(".")
-
-    return base_path + '/basilisk'