basilisk-engine 0.1.22__py3-none-any.whl → 0.1.24__py3-none-any.whl

basilisk/scene.py

@@ -1,5 +1,6 @@
 import moderngl as mgl
 import glm
+import pygame as pg
 
 from .mesh.mesh import Mesh
 from .render.material import Material
@@ -10,7 +11,6 @@ from .render.camera import Camera, FreeCamera
 from .nodes.node_handler import NodeHandler
 from .physics.physics_engine import PhysicsEngine
 from .collisions.collider_handler import ColliderHandler
-from .draw.draw_handler import DrawHandler
 from .render.sky import Sky
 from .render.frame import Frame
 from .particles.particle_handler import ParticleHandler
@@ -21,40 +21,56 @@ from .render.post_process import PostProcess
 from .render.framebuffer import Framebuffer
 
 class Scene():
-    engine: any
+    engine: ...=None
     """Parent engine of the scene"""
     ctx: mgl.Context
     """Reference to the engine context"""
+    camera: Camera=None
+    """"""
+    light_handler: LightHandler=None
+    """"""
+    physics_engine: PhysicsEngine=None
+    """"""
+    node_handler: NodeHandler=None
+    """"""
 
-    def __init__(self) -> None:
+    def __init__(self, engine: ...) -> None:
         """
         Basilisk scene object. Contains all nodes for the scene
         """
 
-        self.engine = None
-        self.ctx    = None
+        self.engine = engine
+        self.ctx    = engine.ctx
+        self.camera           = FreeCamera()
+        self.light_handler    = LightHandler(self)
+        self.physics_engine   = PhysicsEngine()
+        self.node_handler     = NodeHandler(self)
+        self.particle         = ParticleHandler(self)
+        self.collider_handler = ColliderHandler(self)
+        self.sky              = Sky(self.engine)
 
-        self.camera           = None
-        self.shader_handler   = None
-        self.node_handler     = None
-        self.material_handler = None
-        self.light_handler    = None
-        self.draw_handler     = None
-        self.sky              = None
-        self.frame            = None
 
-    def update(self) -> None:
+    def update(self, render: bool=True, nodes: bool=True, particles: bool=True, collisions: bool=True) -> None:
         """
         Updates the physics and in the scene
         """
-        self.particle.update()
-        self.camera.update()
         
+        # Check that the engine is still running
+        self.engine._update()
+        if not self.engine.running: return
+
+        # Update based on the given parameters
+        if nodes: self.node_handler.update()
+        if particles: self.particle.update()
+        if self.engine.event_resize: self.camera.use()
+        self.camera.update()
         
-        self.node_handler.update()
-        if self.engine.delta_time < 0.5: # TODO this will cause physics to slow down when on low frame rate, this is probabl;y acceptable
+        if collisions and self.engine.delta_time < 0.5: # TODO this will cause physics to slow down when on low frame rate, this is probabl;y acceptable
             self.collider_handler.resolve_collisions()
 
+        # Render by default to the engine frame
+        if render: self.render()
+
     def render(self, render_target: Framebuffer|Frame=None) -> None:
         """
         Renders all the nodes with meshes in the scene
@@ -63,19 +79,19 @@ class Scene():
         if render_target:
             show = False
         else:
-            render_target = self.frame
+            render_target = self.engine.frame
             show = True
 
         render_target.use()
-        render_target.clear()
-        self.shader_handler.write()
+        self.engine.shader_handler.write(self)
         if self.sky: self.sky.render()
         self.node_handler.render()
         self.particle.render()
-        self.draw_handler.render()
+
 
         if self.engine.headless or not show: return
-        self.frame.render()
+
+
     
     def add(self, *objects: Node | None) -> None | Node | list:
         """
@@ -100,7 +116,7 @@ class Scene():
             
             # Add a node to the scene
             elif isinstance(bsk_object, PostProcess):
-                returns.append(self.frame.add_post_process(bsk_object)); continue
+                returns.append(self.engine.frame.add_post_process(bsk_object)); continue
             
             
             # Recived incompatable type
@@ -140,19 +156,6 @@ class Scene():
         if len(returns) == 1: return returns[0]
         return returns
 
-    def init_handlers(self) -> None:
-        self.camera           = FreeCamera()
-        self.shader_handler   = ShaderHandler(self)
-        self.material_handler = MaterialHandler(self)
-        self.light_handler    = LightHandler(self)
-        self.physics_engine   = PhysicsEngine()
-        self.node_handler     = NodeHandler(self)
-        self.particle         = ParticleHandler(self)
-        self.collider_handler = ColliderHandler(self)
-        self.draw_handler     = DrawHandler(self)
-        self.frame            = Frame(self)
-        self.sky              = Sky(self.engine)
-
     def set_engine(self, engine: any) -> None:
         """
         Sets the back references to the engine and creates handlers with the context

{basilisk_engine-0.1.22.dist-info → basilisk_engine-0.1.24.dist-info}/METADATA

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

{basilisk_engine-0.1.22.dist-info → basilisk_engine-0.1.24.dist-info}/RECORD

@@ -1,7 +1,7 @@
-basilisk/__init__.py,sha256=nltSEm5HK3aeg1VSkYBEBGLj7DcFzUwt4yZUmEJQ8EM,602
-basilisk/config.py,sha256=ynTRlX633DGoEtZOeAK8KNJF6offV3k3XFD7cia3Keg,61
-basilisk/engine.py,sha256=qfyUk_o0gVrVc-3sCp2qbBNCEx0MsfHI5VbTAVZ9PsE,7441
-basilisk/scene.py,sha256=sa8UIV1MH-4OEmlc4geaSHBmzSPRNFS8g5MsO-XjwNA,12153
+basilisk/__init__.py,sha256=gP1qcygI7m5Re8MlZZfNuBJK_uHu_CxhA6refXVN7nU,615
+basilisk/config.py,sha256=ipG9uxCd7lcyRIzS6O9PbyINmo8h8Whj_j9ZmpU1wv4,112
+basilisk/engine.py,sha256=eSt72slr2Xt6Bg4lUpqETk0E7ymmVhocigSExOjkrQY,5989
+basilisk/scene.py,sha256=7u1scIJbQVxO0LWFXzKMGai-CtAgaSy8gVi-dWtJOlU,12167
 basilisk/audio/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/audio/sound.py,sha256=BjqaPv_07iD_-NDRy1cc0TS4PJzAnQc4hfsW9ntNjGQ,719
 basilisk/bsk_assets/Roboto-Regular.ttf,sha256=kqYnZjMRQMpbyLulIChCLSdgYa1XF8GsUIoRi2Gcauw,168260
@@ -26,8 +26,8 @@ basilisk/collisions/narrow/helper.py,sha256=aUdLdHkbAimnMnh_TWIanCTOJi2ZTY-cXLMh
 basilisk/collisions/narrow/line_intersections.py,sha256=CGtttZ6n51u4l8JtQXzkClgZ_uvgx9IyrrGqli6JDbI,4629
 basilisk/collisions/narrow/sutherland_hodgman.py,sha256=SUjSU5y7AuzIDiljMcTXxlGuFHT5IwtrOJ_k5HS1S2Y,3140
 basilisk/draw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-basilisk/draw/draw.py,sha256=rNmHLhLpPZ2IkT5kx4yE265Q41Db_7GiazY5LdLvlek,3656
-basilisk/draw/draw_handler.py,sha256=MwUOMSXgo7Hf8UX4GbEjh0HRtf8w7XN9QsAgDfksNH4,6394
+basilisk/draw/draw.py,sha256=j6vMAww5RqU_4VM4UcgxXl7FASBPbxy1Dqr-2eLx2pY,3620
+basilisk/draw/draw_handler.py,sha256=O8PXvyDigDv_GBHARzLl7nbuu-gS18WP2-8vrg3a0Ds,6246
 basilisk/draw/font_renderer.py,sha256=gyI59fW3DUswIcSg5VJLLcJti3OLTMdXNQrYJaw18dE,1092
 basilisk/generic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/generic/abstract_bvh.py,sha256=iQ6HjcI8Msw34dZ3YuDAhWSqEc4NTBHAaGqAZZAoLL8,383
@@ -41,9 +41,12 @@ basilisk/generic/quat.py,sha256=4uVMo_ZyB9a0yX89JCKrLUb7pqu2DbLn1cNByGb9Z-k,5244
 basilisk/generic/quat_methods.py,sha256=FFqS2Iy1OLH6oJf1elhH9RbWiE_KMXe5eO95ayrEhbc,241
 basilisk/generic/raycast_result.py,sha256=S0eRDWk8Qi0AW1xkqp9PzFJRUD8iJ365SOaldWi9xU4,809
 basilisk/generic/vec3.py,sha256=n_OAVVFtzH-ctqU8Pqhs2426MQ0WOgBbq2Lfo3Nt498,5280
-basilisk/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-basilisk/input/mouse.py,sha256=K2An-VI3r3VZLEx9bChKp2U2jHfSdxrvHtmyBu4yzCE,1998
-basilisk/input/path.py,sha256=GiO1OS1UGujnl3KdIB7fGzI5BgIg7RHyI8LxsGWskcs,455
+basilisk/input_output/IO_handler.py,sha256=jlBQTu7TlDICKcauJrTDtGrdY_U4yJUYSFu2WFGh6ys,2913
+basilisk/input_output/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+basilisk/input_output/clock.py,sha256=cFnWDBItD5pWw3Gu1xld771hYpYR_G6Z53DvJiZj5jg,1511
+basilisk/input_output/keys.py,sha256=hTZqrR4EVLOXLq093yBBqBbpJJoasQV85BuBG5eW5aw,1411
+basilisk/input_output/mouse.py,sha256=ZuSd7JJ1TBER3x_r6h8owsXV616eWbRwGl5h1FpbJOE,2988
+basilisk/input_output/path.py,sha256=GiO1OS1UGujnl3KdIB7fGzI5BgIg7RHyI8LxsGWskcs,455
 basilisk/mesh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/mesh/cube.py,sha256=UAwjEmaoWfUdtSKjxATU6vUbksDYj7_bBIr1k1xDsYc,1077
 basilisk/mesh/mesh.py,sha256=vujJ0VxwCvvIKBAScPzo8nWWAouyRzE97M4-JVpqco0,9782
@@ -54,32 +57,32 @@ basilisk/mesh/narrow_bvh.py,sha256=jLQhmUNi6mFyU2wVwB_SOf4PIaOAygBTtcnQIyaMOGg,4
 basilisk/mesh/narrow_primative.py,sha256=vWpIeo8I9le-EAvcr9rFUQlbl9mi6eYroqCSMK-m9eY,953
 basilisk/nodes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/nodes/helper.py,sha256=VdlGuEaMtLa992_8yNOB-QIgz4Izr5wNMSm8H6KftKE,2097
-basilisk/nodes/node.py,sha256=M8VWCuAM7JSpIloH8QSwwidrw4xCHibyswrhwObPyKY,32573
-basilisk/nodes/node_handler.py,sha256=Bz9sf3VwYd68fY8LyR6j0H52-ZjZ8fe-_gBEuhE6T5A,4164
+basilisk/nodes/node.py,sha256=yC5eDkLa-fXyX2oBd4VpSTdW3sGbpLs8bm7j95q-p9U,32637
+basilisk/nodes/node_handler.py,sha256=V8OYMuI7WkULuoprE8_mN2bCrkml_no8fJN2sNcXPGQ,4203
 basilisk/particles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-basilisk/particles/particle_handler.py,sha256=R3FC7XWUSvQV1gMtJku68kYl_jyhez9kg54lIk5nEKM,2985
-basilisk/particles/particle_renderer.py,sha256=bRbeaEv3ZZu3c4f9lFXRhWHpnsdZri3J-KS-77R_v7o,3785
+basilisk/particles/particle_handler.py,sha256=fFvvwtT-dw-Tst7Y6xLyjl2ljiP9u6T0ccNPZo3xy-8,2992
+basilisk/particles/particle_renderer.py,sha256=PEJ5qKCEPbPG__NSQcv2NKjTHtKviK5LqfCJS1vDbP8,3792
 basilisk/physics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/physics/impulse.py,sha256=zv6MoGTSlu8qVbsbe2QxERGeyQZYbtzR_WVSqVLsmhw,5873
 basilisk/physics/physics_body.py,sha256=_mi-AVMgQqUsC3bQIca5tgk2xWXTIUw0D_uC4DcQqqs,1508
 basilisk/physics/physics_engine.py,sha256=IPMshr4j5TII5JdcRqiULc6BfkeCLPxdICKqQeZGAtY,1735
 basilisk/render/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/render/batch.py,sha256=VvcKXNmiPxdQ92jzoARPGhLujUGomm6nQX7f7rkoyAQ,3775
-basilisk/render/camera.py,sha256=V9LU0-MMhGPnbYa65wUCeOFLmEJDoZfV5sbMjkJcb5o,8046
+basilisk/render/camera.py,sha256=EaIQ2pKFSN6K51JcRzJhXO4ck_7tQrbTKc8i8tImoy4,9668
 basilisk/render/chunk.py,sha256=R6Jlugxisnl_jkxp0KYkwTt9lzmz-IFCOgdSqGMBf1c,2824
 basilisk/render/chunk_handler.py,sha256=KY-AqnydAc4ae2yKUsLrjs1GdvjoGdZbyXmSSnTtOFY,6497
-basilisk/render/frame.py,sha256=cYeuEAyiMwXUQZgHfNPGEH43zZfrmNXyOpCjxtz2Ji8,3292
-basilisk/render/framebuffer.py,sha256=wuYKIzKxkzuYnCxo2ufIdN8FceoZcb4pgVB0Xz6LGO8,4430
+basilisk/render/frame.py,sha256=DPZhjuhyamREGN1yhl2__9bEyeVbX91i_zXilEFp1yc,3012
+basilisk/render/framebuffer.py,sha256=7Fl31Ww8MRysHvUpHCJ7qG-92po981r8xJRUfDKITik,10173
 basilisk/render/image.py,sha256=p7bSFbD_Nv5TeiVCEdQ_X84Nfrs1YuwqJKKNzrgGkkM,2960
-basilisk/render/image_handler.py,sha256=6limLZvLznUK_l1UdEBsQ3XEPnnrCLzmBzSyifbV81M,4351
+basilisk/render/image_handler.py,sha256=CJyel7POIserAoLQ8YCc3SY24zia2ry6P3wMNK0-Vms,4295
 basilisk/render/light.py,sha256=hFqODv9iK4GEDZeDyBHxOWwwd4v8Pm089_xoScBMjVY,3879
-basilisk/render/light_handler.py,sha256=Le5InqqjgglSXUu7MwkVVsb7WbNJeRkRKldYDQGr6kg,2161
+basilisk/render/light_handler.py,sha256=baJ1p0ob_5OK2Dyd5zZYcldAGWUyVlF21dp_Yfopyd8,2162
 basilisk/render/material.py,sha256=JmmwCxSYkPLHw73bH-7SzPo5ewzbU3QPTIvI_2pInXQ,9655
-basilisk/render/material_handler.py,sha256=dbfQs0u7qkEan0e0FsnqPpxbmkSNAQmH2B9jv4vx-bs,4242
+basilisk/render/material_handler.py,sha256=o-OlDCMj0ZbRF5b-a9u6O5pDKMV0f-dsfURUC5RbwAk,4114
 basilisk/render/post_process.py,sha256=w71zgvnc1VyQAK7xTAyEe1FsUBDzch_6TrkhxZ27MgA,5098
-basilisk/render/shader.py,sha256=C4LtkAqC_QE1I9ftiFBTsCNM9uv811gOAyriXuqGRKk,3988
-basilisk/render/shader_handler.py,sha256=G3cQ_tTIC_GUa68MP_l_VycMxqfZq2IyZqJQeipmUZk,2579
-basilisk/render/sky.py,sha256=TwLJ_6dYWCOAb06HZocrRdBzlbR6mQ0ojmmJgCC6im4,4910
+basilisk/render/shader.py,sha256=sXxtACU9c8i3f6y2RZPF1NZXYJGrfrA0HEyl1AZSv_U,3913
+basilisk/render/shader_handler.py,sha256=bSthLrbDpd7xWxdqku5XkAmULf1a28DAQRFlDlTMUTU,2821
+basilisk/render/sky.py,sha256=tu4ldzQpGjhS8SgooGo9lQZFNbog6-M43ju7vV95iE8,4888
 basilisk/shaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/shaders/batch.frag,sha256=658z5GLegHDarroeqUpoiWDCCT2FHMr0ZHnYJ21qMhQ,9339
 basilisk/shaders/batch.vert,sha256=nUZKd5uBTFJm1aOG0auQRxE2ElhcAGf1YmepyzWeG8g,5403
@@ -97,7 +100,7 @@ basilisk/shaders/particle.frag,sha256=Cv8cWQpVVQvhZeWj3NqL0D5nLtSO3EWV0VzOU-ZVL4
 basilisk/shaders/particle.vert,sha256=ElXzT7ywiZ0SjrFcUistVDBi4wOobQ7_J5O7XVxrsVs,3027
 basilisk/shaders/sky.frag,sha256=vTmZ1Xsd601_gmeBRfLYodHuBoBDI-M_1IybRt0ZDFk,178
 basilisk/shaders/sky.vert,sha256=v_BSdnMiljSJGPqno-J_apAiom38IrBzbDoxM7pIgwI,345
-basilisk_engine-0.1.22.dist-info/METADATA,sha256=dCFBegbwaCFFRnZnUwmFQq-pK6sgZ3buKRDtLziFL5k,1147
-basilisk_engine-0.1.22.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-basilisk_engine-0.1.22.dist-info/top_level.txt,sha256=enlSYSf7CUyAly1jmUCNNGInTbaFUjGk4SKwyckZQkw,9
-basilisk_engine-0.1.22.dist-info/RECORD,,
+basilisk_engine-0.1.24.dist-info/METADATA,sha256=vJFy9ubTtVw-jeX3Mci3SZvbBIuctfQOfIx_U4GkwEk,1147
+basilisk_engine-0.1.24.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+basilisk_engine-0.1.24.dist-info/top_level.txt,sha256=enlSYSf7CUyAly1jmUCNNGInTbaFUjGk4SKwyckZQkw,9
+basilisk_engine-0.1.24.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)