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

basilisk/draw/draw_handler.py

@@ -43,6 +43,9 @@ class DrawHandler():
         
         if not self.draw_data: return
 
+        self.ctx.enable(mgl.BLEND)
+        self.ctx.blend_func = mgl.ADDITIVE_BLENDING
+
         # Reverse the draw order, and convert to C-like array
         self.draw_data.reverse()
         data = np.array(self.draw_data, dtype='f4')
@@ -54,8 +57,6 @@ class DrawHandler():
         self.vao = self.ctx.vertex_array(self.shader.program, [(self.vbo, '2f 4f 1i 1f', *['in_position', 'in_color', 'in_uses_image', 'in_alpha'])], 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
@@ -65,6 +66,8 @@ class DrawHandler():
         self.vao = None
         self.draw_data.clear()
 
+        self.ctx.disable(mgl.BLEND)
+
     def draw_rect(self, color: tuple, rect: tuple) -> None:
         """
         Draws a rect to the screen

basilisk/particles/particle_handler.py

@@ -42,7 +42,7 @@ class ParticleHandler:
 
         # Get material ID
         if material == None: material_index = 0
-        elif isinstance(material, Material): 
+        elif isinstance(material, Material):
             self.scene.engine.material_handler.add(material)
             material_index = material.index
         else: raise ValueError(f'particle_handler.add: Invalid particle material type: {type(material)}')

basilisk/particles/particle_renderer.py

@@ -31,6 +31,7 @@ class ParticleRenderer:
         root = scene.engine.root
         if shader: self.shader = shader
         else: self.shader = Shader(scene.engine, vert=root + '/shaders/particle.vert', frag=root + '/shaders/particle.frag')
+
         scene.engine.shader_handler.add(self.shader)
 
         self.particle_cube_size = 25

basilisk/render/frame.py

@@ -28,9 +28,6 @@ class Frame:
         self.framebuffer.texture.repeat_x = False
         self.framebuffer.texture.repeat_y = False
 
-        self.ctx.enable(mgl.BLEND)
-        self.ctx.blend_func = mgl.ADDITIVE_BLENDING
-
         # Load Shaders
         self.shader = Shader(self.engine, self.engine.root + '/shaders/frame.vert', self.engine.root + '/shaders/bloom_frame.frag')
         self.engine.shader_handler.add(self.shader)
@@ -50,21 +47,27 @@ class Frame:
         Renders the current frame to the screen
         """
 
+        self.ctx.enable(mgl.BLEND)
+        self.ctx.blend_func = mgl.ADDITIVE_BLENDING
+
         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)
         self.vao.render()
 
+        self.ctx.disable(mgl.BLEND)
+
     def use(self) -> None:
         """
         Uses the frame as a render target

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/scene.py

@@ -287,4 +287,5 @@ class Scene():
     @shader.setter
     def shader(self, value):
         self._shader = value
-        value.set_main(self)
+        value.set_main(self)
+        if self.light_handler: self.light_handler.write(value)

basilisk/shaders/geometry.frag

@@ -1,9 +1,11 @@
 #version 330 core
 
 layout (location = 0) out vec4 fragColor;
+layout (location = 1) out vec4 bloomColor;
 
 
 void main() {
     // Output fragment color
     fragColor = vec4(1.0, 1.0, 1.0, 1.0);
+    bloomColor = vec4(0.0);
 }

basilisk/shaders/normal.frag

@@ -1,6 +1,7 @@
 #version 330 core
 
 layout (location = 0) out vec4 fragColor;
+layout (location = 1) out vec4 bloomColor;
 
 // Structs needed for the shader
 struct textArray {
@@ -57,4 +58,6 @@ void main() {
 
     // Output fragment color
     fragColor = vec4(normal, 1.0);
+
+    bloomColor = vec4(0.0);
 }

basilisk/shaders/particle.frag

@@ -1,5 +1,7 @@
 #version 330 core
-out vec4 fragColor;
+
+layout (location = 0) out vec4 fragColor;
+layout (location = 1) out vec4 bloomColor;
 
 in vec2 uv;
 in vec3 position;
@@ -12,6 +14,7 @@ uniform textArray textureArrays[5];
 
 struct Material {
     vec3  color;
+    vec3  emissiveColor;
     float roughness;
     float subsurface;
     float sheen;
@@ -69,4 +72,6 @@ void main()
     // Get color and gamma correction
     fragColor = vec4(color * (.2 + diff), 1.0);
     fragColor.rgb = pow(fragColor.rgb, vec3(1.0/gamma));
+
+    bloomColor = vec4(mtl.emissiveColor, 1.0);
 }

basilisk/shaders/particle.vert

@@ -21,6 +21,7 @@ uniform sampler2D materialsTexture;
 
 struct Material {
     vec3  color;
+    vec3  emissiveColor;
     float roughness;
     float subsurface;
     float sheen;
@@ -71,14 +72,15 @@ void main() {
     uv       = in_uv;
 
     // Material Data
-    int mtl_size = 25;
+    int mtl_size = 28;
     int materialID      = int(in_instance_mtl);
-    mtl = Material(vec3(0), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, vec2(0), 0, vec2(0), 0, vec2(0), 0, vec2(0));
+    mtl = Material(vec3(0), vec3(0), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, vec2(0), 0, vec2(0), 0, vec2(0), 0, vec2(0));
     mtl.color           = vec3(texelFetch(materialsTexture, ivec2(0, 0 + materialID * mtl_size), 0).r, texelFetch(materialsTexture, ivec2(0, 1  + materialID * mtl_size), 0).r, texelFetch(materialsTexture, ivec2(0, 2  + materialID * mtl_size), 0).r);
     mtl.hasAlbedoMap    = int(texelFetch(materialsTexture,  ivec2(0, 13  + materialID * mtl_size), 0).r);
     mtl.albedoMap       = vec2(texelFetch(materialsTexture, ivec2(0, 14  + materialID * mtl_size), 0).r, texelFetch(materialsTexture, ivec2(0, 15  + materialID * mtl_size), 0).r);
     mtl.hasNormalMap    = int(texelFetch(materialsTexture,  ivec2(0, 16  + materialID * mtl_size), 0).r);
     mtl.normalMap       = vec2(texelFetch(materialsTexture, ivec2(0, 17  + materialID * mtl_size), 0).r, texelFetch(materialsTexture, ivec2(0, 18 + materialID * mtl_size), 0).r);    
+    mtl.emissiveColor  = vec3(texelFetch(materialsTexture, ivec2(0, 25 + materialID * mtl_size), 0).r, texelFetch(materialsTexture, ivec2(0, 26 + materialID * mtl_size), 0).r, texelFetch(materialsTexture, ivec2(0, 27 + materialID * mtl_size), 0).r);
 
     // Send position to the frag
     gl_Position = projectionMatrix * viewMatrix * modelMatrix * vec4(in_position, 1.0);

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

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

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

@@ -1,7 +1,7 @@
 basilisk/__init__.py,sha256=iek4GeDKFC1oFX6JHCzyB-6F1iqHY9fiQo6S-qiotsk,1160
 basilisk/config.py,sha256=czvjhMD2QVOGfxrdVfxI-jOex54dRwwwYzBiACYuZ0s,1765
 basilisk/engine.py,sha256=9cKvXoRn8BC6eV8u2kJly-lfmp-zb7xlI-MW2DLYIRg,5887
-basilisk/scene.py,sha256=NJUySG4vk4D9DOfajB6gdy_EgWZi2-R0rm28SfL_CII,12486
+basilisk/scene.py,sha256=UZVIXAVwuu9ktTh-FO2dVNlshGNz_KU-RDwKX8V0fY4,12550
 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
@@ -27,7 +27,7 @@ basilisk/collisions/narrow/line_intersections.py,sha256=CGtttZ6n51u4l8JtQXzkClgZ
 basilisk/collisions/narrow/sutherland_hodgman.py,sha256=SUjSU5y7AuzIDiljMcTXxlGuFHT5IwtrOJ_k5HS1S2Y,3140
 basilisk/draw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/draw/draw.py,sha256=j6vMAww5RqU_4VM4UcgxXl7FASBPbxy1Dqr-2eLx2pY,3620
-basilisk/draw/draw_handler.py,sha256=O8PXvyDigDv_GBHARzLl7nbuu-gS18WP2-8vrg3a0Ds,6246
+basilisk/draw/draw_handler.py,sha256=aoN0p2lQWUCRtn5M7dR2zwPqe03d0_Sm75BV64BNcSM,6283
 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
@@ -60,8 +60,8 @@ basilisk/nodes/helper.py,sha256=VdlGuEaMtLa992_8yNOB-QIgz4Izr5wNMSm8H6KftKE,2097
 basilisk/nodes/node.py,sha256=Bfi2OquiuSl_AJtQyXhwzkrE5ZO8FlIOBxuwD8h4No0,33619
 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=fFvvwtT-dw-Tst7Y6xLyjl2ljiP9u6T0ccNPZo3xy-8,2992
-basilisk/particles/particle_renderer.py,sha256=PEJ5qKCEPbPG__NSQcv2NKjTHtKviK5LqfCJS1vDbP8,3792
+basilisk/particles/particle_handler.py,sha256=g35CwFRvYVT5mxssEKaj9PgkCErbfP7kDcsu4e_VyFI,2991
+basilisk/particles/particle_renderer.py,sha256=GPC7txDpCP5cuRsrBvg-3xWNgof7vztfWuHwTtxzOfU,3794
 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
@@ -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=l8NwJdqSvfKxzS7Eb6pUh269UJlvR3HFVn3Mp7XtnEM,3486
+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
@@ -96,15 +97,15 @@ basilisk/shaders/draw.vert,sha256=rMtpZFcF3Batup8xgAoJuxJhZ03c8DZ6uu7G5BdJe-A,62
 basilisk/shaders/filter.frag,sha256=m_egR4yiFRmIHGwCCfpcdvGXQi1w1Ago_iABlbnX80c,584
 basilisk/shaders/frame.frag,sha256=rs_AA1u7DL3CxtqpTqvhgQjYYthl_l_Dg7RXpU9_5Ks,160
 basilisk/shaders/frame.vert,sha256=KPB-Q3-Rix9-JxSj5tBHbZOu7QCdFgCzHwiZKEYIbFc,227
-basilisk/shaders/geometry.frag,sha256=Vh57G0r7Jj0uaTQEYuovZSgzOIJyZi-bzGvNsWZ--Oc,157
+basilisk/shaders/geometry.frag,sha256=6Fcd1mMX5UAslw2GfREuA510UAAKrGdPYQHsaEDqLck,230
 basilisk/shaders/geometry.vert,sha256=2yPpezklovRQczpuf2pUhi4mMv3-YaOjDQCbrzdcdpk,1473
-basilisk/shaders/normal.frag,sha256=E6EwJUf76VCT8B_huuLfHRVRF7PkWxG1YGjdWh6sC44,1333
+basilisk/shaders/normal.frag,sha256=I1kU5-u_UeDJJJZLuSU6Dl-9oYmzP040_SLqbGFHWw8,1408
 basilisk/shaders/normal.vert,sha256=4BlcNsIw3fQFsZlfF7VZr6EAV2Y-M-72tXhfaE0uReM,3320
-basilisk/shaders/particle.frag,sha256=Cv8cWQpVVQvhZeWj3NqL0D5nLtSO3EWV0VzOU-ZVL4Y,1816
-basilisk/shaders/particle.vert,sha256=ElXzT7ywiZ0SjrFcUistVDBi4wOobQ7_J5O7XVxrsVs,3027
+basilisk/shaders/particle.frag,sha256=XZurKUl0oK9sfXXTa1-6rsGS7qBsuQSKajKN4tbMFaY,1960
+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.36.dist-info/METADATA,sha256=sbqmClimB7n89iktI5jnAQwPiC-exqTsSeiqKWtuz50,3882
-basilisk_engine-0.1.36.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-basilisk_engine-0.1.36.dist-info/top_level.txt,sha256=enlSYSf7CUyAly1jmUCNNGInTbaFUjGk4SKwyckZQkw,9
-basilisk_engine-0.1.36.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,,