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

basilisk/engine.py

@@ -163,8 +163,4 @@ class Engine():
 
 
     @property
-    def shader(self): return self._shader
-    @shader.setter
-    def shader(self, value):
-        self._shader = value
-        value.set_main()
+    def shader(self): return self._shader

basilisk/input/mouse.py

@@ -0,0 +1,62 @@
+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

@@ -0,0 +1,14 @@
+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'

basilisk/nodes/node.py

@@ -19,11 +19,11 @@ class Node():
     """The scale of the node in meters in each direction"""
     rotation: Quat
     """The rotation of the node"""
-    position_relative: bool
+    relative_position: bool
     """The position of this node relative to the parent node"""
-    scale_relative: bool
+    relative_scale: bool
     """The scale of this node relative to the parent node"""
-    rotation_relative: bool
+    relative_rotation: bool
     """The rotation of this node relative to the parent node"""
     forward: glm.vec3
     """The forward facing vector of the node"""
@@ -239,9 +239,9 @@ class Node():
         if self.relative_scale:    transform  = glm.scale(transform, self.parent.scale.data)
         
         # set this node's transforms based on the parent
-        self.position = transform * self.relative_position
-        self.scale = self.relative_scale * self.parent.scale.data
-        self.rotation = self.relative_rotation * self.parent.rotation.data
+        if self.relative_position: self.position = transform * self.relative_position
+        if self.relative_scale:    self.scale = self.relative_scale * self.parent.scale.data
+        if self.relative_rotation: self.rotation = self.relative_rotation * self.parent.rotation.data
         
         for child in self.children: child.sync_data()
         
@@ -287,12 +287,22 @@ class Node():
         """
         Adopts a node as a child. Relative transforms can be changed, if left bank they will not be chnaged from the current child nodes settings.
         """
-        if child in self.children: return
+        if child in self.children or child is self: return
+        assert isinstance(child, Node), 'Nodes can only accept other Nodes as children.'
+        
+        relative = glm.inverse(self.model_matrix) * child.model_matrix
+        position = glm.vec3(relative[3])
+        scale = glm.vec3([glm.length(relative[i]) for i in range(3)])
+        rotation = glm.quat_cast(glm.mat3x3(*[glm.vec3(relative[i]) / scale[i] for i in range(3)])) # TODO ensure that these are the correct calculations
         
         # compute relative transformations
-        if relative_position or (relative_position is None and child.relative_position): child.relative_position = child.position.data - self.position.data
-        if relative_scale    or (relative_scale    is None and child.relative_scale):    child.relative_scale    = child.scale.data / self.scale.data
-        if relative_rotation or (relative_rotation is None and child.relative_rotation): child.relative_rotation = child.rotation.data * glm.inverse(self.rotation.data)
+        if relative_position or (relative_position is None and child.relative_position): child.relative_position = position
+        if relative_scale    or (relative_scale    is None and child.relative_scale):    child.relative_scale    = scale
+        if relative_rotation or (relative_rotation is None and child.relative_rotation): child.relative_rotation = rotation
+        
+        print(child.relative_position)
+        print(child.relative_scale)
+        print(child.relative_rotation)
         
         # add as a child to by synchronized and controlled
         if self.node_handler: self.node_handler.add(child)

basilisk/render/chunk.py

@@ -87,7 +87,7 @@ class Chunk():
         shader = self.shader
 
         if shader: return shader
-        return self.chunk_handler.engine.shader
+        return self.chunk_handler.scene.shader
 
     def swap_shader(self, shader):
         """

basilisk/render/framebuffer.py

@@ -166,9 +166,18 @@ class Framebuffer:
     def show(self, value: int) -> None:
         value = validate_int("Framebuffer", "show", value)
         if value == self._show: return
+
+        # Verify the range
+        if value < 0 or value > len(self.color_attachments): raise ValueError(f'Framebuffer.show: invalid color attachement to show, {value} is out of range')
+        elif value == len(self.color_attachments): src = self.depth
+        else: src = self.color_attachments[value]
+
+        # Update value
         self._show = value
+
+        # Bind the correct texture
         self.shader.program['screenTexture'] = value+1
-        self.color_attachments[value].use(location=value+1)
+        src.use(location=value+1)
 
     def __repr__(self) -> str:
         return f'<bsk.Framebuffer | size: {self.size}>' 

basilisk/render/shader.py

@@ -98,13 +98,13 @@ class Shader:
         # Create a program with shaders
         self.program = self.ctx.program(vertex_shader=self.vertex_shader, fragment_shader=self.fragment_shader)
 
-    def set_main(self):
+    def set_main(self, scene):
         """
         Selects a shader for use
         """
         
         self.engine.shader_handler.add(self)
-        self.engine.scene.node_handler.chunk_handler.swap_default(self)
+        if scene.node_handler: scene.node_handler.chunk_handler.swap_default(self)
 
     def write(self, name: str, value) -> None:
         """

basilisk/render/shader_handler.py

@@ -28,7 +28,7 @@ class ShaderHandler:
         self.shaders = set()
 
         # Load a default shader
-        self.default_shader = Shader(self, self.engine.root + '/shaders/batch.vert', self.engine.root + '/shaders/batch.frag')
+        self.default_shader = Shader(self.engine, self.engine.root + '/shaders/batch.vert', self.engine.root + '/shaders/batch.frag')
         self.default_shader.hash = self.default_shader.hash + hash('engine_shader')
         self.add(self.default_shader)
         setattr(self.engine, "_shader", self.default_shader)

basilisk/scene.py

@@ -4,8 +4,7 @@ import pygame as pg
 
 from .mesh.mesh import Mesh
 from .render.material import Material
-from .render.shader_handler import ShaderHandler
-from .render.material_handler import MaterialHandler
+from .render.shader import Shader
 from .render.light_handler import LightHandler
 from .render.camera import Camera, FreeCamera
 from .nodes.node_handler import NodeHandler
@@ -34,13 +33,14 @@ class Scene():
     node_handler: NodeHandler=None
     """"""
 
-    def __init__(self, engine: ...) -> None:
+    def __init__(self, engine: ..., shader: Shader=None) -> None:
         """
         Basilisk scene object. Contains all nodes for the scene
         """
 
         self.engine = engine
         self.ctx    = engine.ctx
+        self.shader = shader if shader else engine.shader
         self.camera           = FreeCamera()
         self.light_handler    = LightHandler(self)
         self.physics_engine   = PhysicsEngine()
@@ -69,7 +69,11 @@ class Scene():
             self.collider_handler.resolve_collisions()
 
         # Render by default to the engine frame
-        if render: self.render()
+        if not render: return
+
+        # Check if the user is giving a destination
+        if not isinstance(render, bool): self.render(renders)
+        else: self.render()
 
     def render(self, render_target: Framebuffer|Frame=None) -> None:
         """
@@ -92,7 +96,6 @@ class Scene():
         if self.engine.headless or not show: return
 
 
-    
     def add(self, *objects: Node | None) -> None | Node | list:
         """
         Adds the given object(s) to the scene. Can pass in any scene objects:
@@ -263,6 +266,8 @@ class Scene():
     def sky(self): return self._sky
     @property
     def nodes(self): return self.node_handler.nodes
+    @property
+    def shader(self): return self._shader
 
     @camera.setter
     def camera(self, value: Camera):
@@ -277,4 +282,9 @@ class Scene():
         if not isinstance(value, Sky) and not isinstance(value, type(None)):
             raise TypeError(f'Scene: Invalid sky type: {type(value)}. Expected type bsk.Sky or None')
         self._sky = value
-        if value: self._sky.write()
+        if value: self._sky.write()
+
+    @shader.setter
+    def shader(self, value):
+        self._shader = value
+        value.set_main(self)

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

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

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

@@ -1,7 +1,7 @@
 basilisk/__init__.py,sha256=JclirSjufIEfEPaQhOhf5NzWoUkO60Ay4dacNeUSGRw,600
 basilisk/config.py,sha256=FC0tTQy8jcSZSlriro1SFN2sLw-KLfYQM63Jq6YPHjk,109
-basilisk/engine.py,sha256=rrMrQutN_mJEJyzG_w86TUTEYbE8cu9kncMjXMZjiLo,5820
-basilisk/scene.py,sha256=FVKm6MDmGYxf5OElbDlMMqagsGTnLDbj5UHrdcGtuW4,11888
+basilisk/engine.py,sha256=1YERzyCkVJTgntZQPDbJ1_qy6CZEaov6Y9rojHpm_O0,5718
+basilisk/scene.py,sha256=51nrk6pnorHQgyiY2veW90uXsPfdHQyDKbJNtXx44w4,12197
 basilisk/audio/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/audio/sound.py,sha256=h2dQ3IKb_SRKNZqNuk-fdNg_Xfz0P7sqEXA33qiBXG4,692
 basilisk/bsk_assets/Roboto-Regular.ttf,sha256=kqYnZjMRQMpbyLulIChCLSdgYa1XF8GsUIoRi2Gcauw,168260
@@ -41,6 +41,9 @@ 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
@@ -57,7 +60,7 @@ basilisk/mesh/narrow_bvh.py,sha256=29VLfEKa6BE6UDY1HJWlcM5TMR7ayg4loZ6S61PpLJM,4
 basilisk/mesh/narrow_primative.py,sha256=Dlw0jnFewPwAvT0Ap9IxAh05tgjZAdjAyuiRy1DXOm4,930
 basilisk/nodes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/nodes/helper.py,sha256=GZ2-TY_4PDEfxBGp7ddktYoDDMOogPMbDeRPqsrPu1A,2069
-basilisk/nodes/node.py,sha256=6RoDC0YxBJiOolfRdOad3VpnTxTIelv_wTZweu8kJMI,32168
+basilisk/nodes/node.py,sha256=Hs-x7jpSpl1lKmGFs4UJnh72E2S1cDOyuTctSytIRDU,32717
 basilisk/nodes/node_handler.py,sha256=IFEcEefVzlMbYR0O6OtM2qPcoZFrLYugiwAqEQMoTqo,4106
 basilisk/particles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/particles/particle_handler.py,sha256=PtWn8-qwfkD0r8CXcATvDEFstrKG86KVBH0j1ybEv58,2928
@@ -69,10 +72,10 @@ basilisk/physics/physics_engine.py,sha256=C30oGb8rODdXORJJWjOWBPwlScnTHrp6CTPHSN
 basilisk/render/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/render/batch.py,sha256=1ULXwzcs7v9ze1IDZDJXcaydRjwdgHH9TkyXxcadNiM,3396
 basilisk/render/camera.py,sha256=pOM5sVSHl_joHwsBLd8Y7CzLUL-16XBBQfgsnM8jc6Q,9649
-basilisk/render/chunk.py,sha256=Yyyh6jEEG_JQIk02hEDs1L-UbmKDZQcAHtGV4pxSJ7U,2715
+basilisk/render/chunk.py,sha256=yE7P48cqpF-Ucdqip41SsfBuotHMBj1L6I49HiWuUjc,2714
 basilisk/render/chunk_handler.py,sha256=PJNGWv3DURm8rYKb3WlGVx6CJ5arbaIiMwA1UN-G480,6332
 basilisk/render/frame.py,sha256=v7EuQ7FRXzxyeS7QFlqyz-jzveAkQkglxhHVjv6zAFY,2917
-basilisk/render/framebuffer.py,sha256=28_oqR_eLNytyTS_2kNIHIY30T5ICoOK80jRnTZdtQ8,6222
+basilisk/render/framebuffer.py,sha256=i1lRzAActlu_qIPDDUmTbFrTd_EzM1YMLT5vMbARz78,6561
 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
@@ -80,8 +83,8 @@ basilisk/render/light_handler.py,sha256=gvg4OhDMy8dZg5XNcOZB4_1G2uE1gBFRxlBeoG3l
 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=q5eSvWTEP55oNoM7kepEizSOQyjDkDLV2RrFiySaKOI,4799
-basilisk/render/shader_handler.py,sha256=w1bGwVXm61_dDVlX9WgU8CKOMdqTjcooNlMsdN9lVnc,2738
+basilisk/render/shader.py,sha256=lQv2crDrD9hpqF6pbynBXeWLX1fNKat59udOx95mZsM,4817
+basilisk/render/shader_handler.py,sha256=WkP5krze4EDV4smc1Rnx4rw5KojZvw_nSMuRDvhuI2E,2745
 basilisk/render/sky.py,sha256=orTtgkU35AHZTUGk9IevSXwVs6tktoDP52yEUM5Rg0E,4768
 basilisk/shaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/shaders/batch.frag,sha256=L1NuzZxq7xcjoKgW70p_tUG8g_GuQndWtmxbKMUwe3s,9063
@@ -100,7 +103,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.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_engine-0.1.31.dist-info/METADATA,sha256=3wnyvwda50LHbVl5j7qEnHI41KdwgRM12U96Iz01uGM,1261
+basilisk_engine-0.1.31.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+basilisk_engine-0.1.31.dist-info/top_level.txt,sha256=enlSYSf7CUyAly1jmUCNNGInTbaFUjGk4SKwyckZQkw,9
+basilisk_engine-0.1.31.dist-info/RECORD,,