basilisk-engine 0.1.37__py3-none-any.whl → 0.1.38__py3-none-any.whl

basilisk/render/frame.py

@@ -52,14 +52,15 @@ class Frame:
 
         if self.engine.event_resize: self.bloom.generate_bloom_buffers()
 
+        self.bloom.render()
+        
         for process in self.post_processes:
-            self.ping_pong_buffer = process.apply(self.framebuffer, self.ping_pong_buffer)
+            self.ping_pong_buffer = process.apply([('screenTexture', self.framebuffer)], self.ping_pong_buffer)
             
             temp = self.framebuffer
             self.framebuffer = self.ping_pong_buffer
             self.ping_pong_buffer = temp
         
-        self.bloom.render()
         self.ctx.screen.use()
         self.shader.bind(self.framebuffer.texture, 'screenTexture', 0)
         self.shader.bind(self.bloom.texture, 'bloomTexture', 1)

basilisk/render/post_process.py

@@ -35,7 +35,7 @@ class PostProcess:
 
         # Load Shaders
         self.shader = Shader(self.engine, self.engine.root + f'/shaders/frame.vert', frag)
-        self.engine.scene.shader_handler.add(self.shader)
+        self.engine.shader_handler.add(self.shader)
 
         # Load VAO
         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'))
@@ -49,15 +49,15 @@ class PostProcess:
         self.fbo.texture.filter = self.filter
 
 
-    def apply(self, source: mgl.Texture | Image | Framebuffer, destination: mgl.Texture | Image | Framebuffer=None) -> mgl.Texture | Image | Framebuffer:
+    def apply(self, source: list[tuple[str, mgl.Texture]] | list[tuple[str, Image]] | list[tuple[str, Framebuffer]], destination: mgl.Texture | Image | Framebuffer=None) -> mgl.Texture | Image | Framebuffer:
         """
         Applies a post process shader to a texture source.
         Returns the modified texture or renders to the destination if given
         """
 
-        if isinstance(source, Framebuffer):   return self._apply_to_framebuffer(source, destination)
-        elif isinstance(source, mgl.Texture): return self._apply_to_texture(source, destination)
-        elif isinstance(source, Image):       return self._apply_to_image(source, destination)
+        if   isinstance(source[0][1], Framebuffer): return self._apply_to_framebuffer(source, destination)
+        elif isinstance(source[0][1], mgl.Texture): return self._apply_to_texture(source, destination)
+        elif isinstance(source[0][1], Image):       return self._apply_to_image(source, destination)
         
         raise ValueError(f'PostProces.apply: Invalid postprocess source type {type(source)}')
 
@@ -74,8 +74,9 @@ class PostProcess:
         self.fbo.clear()
 
         # Load the source texture to the shader
-        self.shader.program['screenTexture'] = 0
-        source.use(location=0)
+        for i, src in enumerate(source):
+            self.shader.program[src[0]] = i
+            src[1].use(location=i)
 
         # Apply the post process
         self.vao.render()
@@ -93,12 +94,13 @@ class PostProcess:
             fbo.texture.filter = self.filter
         else:
             fbo = detination
-            old_filter = fbo.filter
+            old_filter = fbo.texture_filter
             fbo.texture.filter = self.filter
 
         # Load the source texture to the shader
-        self.shader.program['screenTexture'] = 0
-        source.texture.use(location=0)
+        for i, src in enumerate(source):
+            self.shader.program[src[0]] = i
+            src[1].texture.use(location=i)
 
         fbo.use()
         fbo.clear()
@@ -137,4 +139,9 @@ class PostProcess:
 
         # Make an image from the texture
         image = Image()
-        return image
+        return image
+    
+    def __del__(self):
+        if self.vao: self.vao.release()
+        if self.vbo: self.vbo.release()
+        if self.fbo: self.fbo.release()

basilisk/render/tempCodeRunnerFile.py

@@ -0,0 +1 @@
+source[0][

{basilisk_engine-0.1.37.dist-info → basilisk_engine-0.1.38.dist-info}/METADATA

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

{basilisk_engine-0.1.37.dist-info → basilisk_engine-0.1.38.dist-info}/RECORD

@@ -72,7 +72,7 @@ basilisk/render/bloom.py,sha256=VX-8k1ySGNX8OCo-29ph4MPWPXYZuSPLrKwa3seaK98,4184
 basilisk/render/camera.py,sha256=Bzyqp1ESNqjTR03hZIhil7pU1In5JDz-7sCj1Pter-M,9909
 basilisk/render/chunk.py,sha256=yFAflMaiOKH3Fl7cBIm4RGtOhXwYyVIFTO4_UgBX9x8,2866
 basilisk/render/chunk_handler.py,sha256=zJPYv3vw6_mtYQ0fW46j87dGrZENMBcRuHFzFOxqY-Q,6572
-basilisk/render/frame.py,sha256=YQl_73PPgWmwhPSe9HHdh-1Kve9_I2w800aDtz4dMAA,3525
+basilisk/render/frame.py,sha256=_8G1nUlK7QmUoOHUrEAGp5qbXvN5Jot2osgUXJ15jpc,3556
 basilisk/render/framebuffer.py,sha256=3A7k9vhtInMNwrhY3l3DydjGhivLz9hH_DwNNFSpKOM,7209
 basilisk/render/image.py,sha256=r-khPFJkZS8D0n_I4HeKk72lzbHeEYEM0Cp-KuR22Jk,4104
 basilisk/render/image_handler.py,sha256=CJyel7POIserAoLQ8YCc3SY24zia2ry6P3wMNK0-Vms,4295
@@ -80,10 +80,11 @@ basilisk/render/light.py,sha256=hFqODv9iK4GEDZeDyBHxOWwwd4v8Pm089_xoScBMjVY,3879
 basilisk/render/light_handler.py,sha256=baJ1p0ob_5OK2Dyd5zZYcldAGWUyVlF21dp_Yfopyd8,2162
 basilisk/render/material.py,sha256=umGdE-wI8CEXTArPzZc5rmyHKendsQWkOkpb0l5B6m8,10304
 basilisk/render/material_handler.py,sha256=dXdJeH4h9m6dJRrAsm-aGDtNzlvDcAtdX3pEgKg4wzA,4198
-basilisk/render/post_process.py,sha256=w71zgvnc1VyQAK7xTAyEe1FsUBDzch_6TrkhxZ27MgA,5098
+basilisk/render/post_process.py,sha256=RQCk8E0Xr4QUGDDYH-OfNQCDnjy6VTs_7YoniGGxIWU,5407
 basilisk/render/shader.py,sha256=jgVuFe4TjV6IMtEnVknYQ78RdKq8ZybDIFP9usNjgeY,4954
 basilisk/render/shader_handler.py,sha256=k3pbbBBUxDlgwD0c_dhtn2bOXQMMAKzeRiZxDvychgc,2931
 basilisk/render/sky.py,sha256=tu4ldzQpGjhS8SgooGo9lQZFNbog6-M43ju7vV95iE8,4888
+basilisk/render/tempCodeRunnerFile.py,sha256=ep1eVZzUd30SDCNE5l3OJsqp2fW2LEXrjYGW31AMWgw,10
 basilisk/shaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/shaders/batch.frag,sha256=Iz0FugHCv8yjTZdTXBVTNqaSv1-YXB02Un2h1EMu2xA,9830
 basilisk/shaders/batch.vert,sha256=xh-9DWRVi5ySMl23vqSEueGDdz1K_2RT9CKMtlY-xmA,5672
@@ -104,7 +105,7 @@ basilisk/shaders/particle.frag,sha256=XZurKUl0oK9sfXXTa1-6rsGS7qBsuQSKajKN4tbMFa
 basilisk/shaders/particle.vert,sha256=NbA_WKpxx1IAQt5wso5dZAZRqwVlejPjNdFg_GeJXEE,3313
 basilisk/shaders/sky.frag,sha256=Fr9SQHPKPV9a1mgSeprSiOaFjPrQX9qqZu3Uc_fQT0c,579
 basilisk/shaders/sky.vert,sha256=v_BSdnMiljSJGPqno-J_apAiom38IrBzbDoxM7pIgwI,345
-basilisk_engine-0.1.37.dist-info/METADATA,sha256=Jp9eDTsE97VPyajGxujwXUWp4I6mT3guZQZoPxDpVmg,3882
-basilisk_engine-0.1.37.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-basilisk_engine-0.1.37.dist-info/top_level.txt,sha256=enlSYSf7CUyAly1jmUCNNGInTbaFUjGk4SKwyckZQkw,9
-basilisk_engine-0.1.37.dist-info/RECORD,,
+basilisk_engine-0.1.38.dist-info/METADATA,sha256=irGGvAh5prOpzl05k8k0_ScC3LpkrK-6xqF_EzOGhW4,3882
+basilisk_engine-0.1.38.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+basilisk_engine-0.1.38.dist-info/top_level.txt,sha256=enlSYSf7CUyAly1jmUCNNGInTbaFUjGk4SKwyckZQkw,9
+basilisk_engine-0.1.38.dist-info/RECORD,,