basilisk-engine 0.1.36__tar.gz → 0.1.38__tar.gz

{basilisk_engine-0.1.36 → basilisk_engine-0.1.38}/PKG-INFO

@@ -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 → basilisk_engine-0.1.38}/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_engine-0.1.36 → basilisk_engine-0.1.38}/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_engine-0.1.36 → basilisk_engine-0.1.38}/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_engine-0.1.36 → basilisk_engine-0.1.38}/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_engine-0.1.36 → basilisk_engine-0.1.38}/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_engine-0.1.38/basilisk/render/tempCodeRunnerFile.py

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

{basilisk_engine-0.1.36 → basilisk_engine-0.1.38}/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_engine-0.1.36 → basilisk_engine-0.1.38}/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_engine-0.1.36 → basilisk_engine-0.1.38}/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_engine-0.1.36 → basilisk_engine-0.1.38}/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_engine-0.1.36 → basilisk_engine-0.1.38}/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 → basilisk_engine-0.1.38}/basilisk_engine.egg-info/PKG-INFO

@@ -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 → basilisk_engine-0.1.38}/basilisk_engine.egg-info/SOURCES.txt

@@ -87,6 +87,7 @@ basilisk/render/post_process.py
 basilisk/render/shader.py
 basilisk/render/shader_handler.py
 basilisk/render/sky.py
+basilisk/render/tempCodeRunnerFile.py
 basilisk/shaders/__init__.py
 basilisk/shaders/batch.frag
 basilisk/shaders/batch.vert

{basilisk_engine-0.1.36 → basilisk_engine-0.1.38}/setup.py

@@ -7,7 +7,7 @@ with open(path.join(working_directory, 'README.md'), encoding='utf-8') as f:
 
 setup(
     name = 'basilisk-engine',  # Name of folder containing scripts and __init__
-    version = '0.1.36',
+    version = '0.1.38',
     url = 'https://basilisk-website.vercel.app/',
     author = 'Name',
     author_email = 'basiliskengine@gmail.com',