basilisk-engine 0.1.42__tar.gz → 0.1.44__tar.gz

{basilisk_engine-0.1.42/basilisk_engine.egg-info → basilisk_engine-0.1.44}/PKG-INFO

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

{basilisk_engine-0.1.42 → basilisk_engine-0.1.44}/basilisk/engine.py

@@ -142,14 +142,12 @@ class Engine():
         self._update()
         if not self.running: return
 
-        # Render all draw calls from the past frame
-        self.ctx.screen.use()
-        self.draw_handler.render()
 
         # Clear the screen and render the frame
         if render:
-            for frame in self.frames:
-                frame.render(self.frame.output_buffer)
+            # Render all draw calls from the past frame
+            self.ctx.screen.use()
+            self.draw_handler.render()
             self.frame.render()
 
         # Even though we may not render here, the user might be rendering in their file, so we need to flip

{basilisk_engine-0.1.42 → basilisk_engine-0.1.44}/basilisk/render/bloom.py

@@ -14,12 +14,11 @@ class Bloom:
         self.downsample_shader = Shader(self.engine, self.engine.root + '/shaders/frame.vert', self.engine.root + '/shaders/bloom_downsample.frag')
         self.upsample_shader   = Shader(self.engine, self.engine.root + '/shaders/frame.vert', self.engine.root + '/shaders/bloom_upsample.frag')
         
-        self.engine.shader_handler.add(self.downsample_shader)
-        self.engine.shader_handler.add(self.upsample_shader)
-
         self.downsample_vao = self.ctx.vertex_array(self.downsample_shader.program, [(self.frame.vbo, '3f 2f', 'in_position', 'in_uv')], skip_errors=True)
         self.upsample_vao   = self.ctx.vertex_array(self.upsample_shader.program, [(self.frame.vbo, '3f 2f', 'in_position', 'in_uv')], skip_errors=True)
 
+        self.upsample_buffers = []
+        self.downsample_buffers = []
         self.generate_bloom_buffers()
 
     def render(self) -> None:
@@ -35,13 +34,20 @@ class Bloom:
         self.ctx.enable(mgl.BLEND)
         self.ctx.blend_func = mgl.ADDITIVE_BLENDING
 
-        self.downsample(self.frame.input_buffer.color_attachments[1], getattr(self, f'bloom_buffer_{0}'))
+        # Render the screen's bloom texture to a local buffer
+        bloom_texture = self.frame.input_buffer.color_attachments[1]
+        self.downsample_shader.bind(bloom_texture, 'screenTexture', 0)
+        self.downsample_shader.write(glm.ivec2(bloom_texture.size), 'textureSize')
+        self.downsample_buffers[0].clear()
+        self.downsample_buffers[0].use()
+        self.downsample_vao.render()
+
         for i in range(0, n):
-            self.downsample(getattr(self, f'bloom_buffer_{i}'), getattr(self, f'bloom_buffer_{i + 1}'))
+            self.downsample(self.downsample_buffers[i], self.downsample_buffers[i + 1])
 
-        self.upsample(getattr(self, f'bloom_buffer_{n - 1}'), getattr(self, f'bloom_buffer_{n}'), getattr(self, f'upscale_buffer_{n}'))
+        self.upsample(self.downsample_buffers[n - 1], self.downsample_buffers[n], self.upsample_buffers[n])
         for i in range(n - 1, -1, -1):
-            self.upsample(getattr(self, f'upscale_buffer_{i + 1}'), getattr(self, f'bloom_buffer_{i}'), getattr(self, f'upscale_buffer_{i}'))
+            self.upsample(self.upsample_buffers[i + 1], self.downsample_buffers[i], self.upsample_buffers[i])
 
         self.ctx.disable(mgl.BLEND)
 
@@ -56,7 +62,7 @@ class Bloom:
         else: texture = source
 
         self.downsample_shader.bind(texture, 'screenTexture', 0)
-        self.downsample_shader.write('textureSize', glm.ivec2(source.size))
+        self.downsample_shader.write(glm.ivec2(source.size), 'textureSize')
 
         # Clear and use the destination fbo
         dest.use()
@@ -73,7 +79,7 @@ class Bloom:
         # Bind the source texture to the shader
         self.upsample_shader.bind(high.texture, 'highTexture', 0)
         self.upsample_shader.bind(low.texture, 'lowTexture', 1)
-        self.upsample_shader.write('textureSize', glm.ivec2(low.size))
+        self.upsample_shader.write(glm.ivec2(low.size), 'textureSize')
 
         # Clear and use the destination fbo
         dest.use()
@@ -92,33 +98,21 @@ class Bloom:
         n = self.engine.config.bloom_quality
         size = self.frame.input_buffer.size
 
-        for i in range(100):
-            try:
-                getattr(self, f'bloom_buffer_{i}').__del__()
-                getattr(self, f'upscale_buffer_{i}').__del__()
-            except:
-                break
+        self.downsample_buffers = []
+        self.upsample_buffers = []
 
         for i in range(n + 1):
-            fbo = Framebuffer(self.engine, size=(max(size[0] // (2 ** (i)), 1), max(size[1] // (2 ** (i)), 1)))
-            fbo.texture.repeat_x = False
-            fbo.texture.repeat_y = False
-            setattr(self, f'bloom_buffer_{i}', fbo)
+            downsample_fbo = Framebuffer(self.engine, size=(max(size[0] // (2 ** (i)), 1), max(size[1] // (2 ** (i)), 1)))
+            upsample_fbo = Framebuffer(self.engine, size=(max(size[0] // (2 ** (i)), 1), max(size[1] // (2 ** (i)), 1)))
 
-            fbo = Framebuffer(self.engine, size=(max(size[0] // (2 ** (i)), 1), max(size[1] // (2 ** (i)), 1)))
-            fbo.texture.repeat_x = False
-            fbo.texture.repeat_y = False
-            setattr(self, f'upscale_buffer_{i}', fbo)
+            self.downsample_buffers.append(downsample_fbo)
+            self.upsample_buffers.append(upsample_fbo)
 
     def clear(self):
-        for i in range(100):
-            try:
-                getattr(self, f'bloom_buffer_{i}').clear()
-                getattr(self, f'upscale_buffer_{i}').clear()
-            except:
-                break
+        for buffer in self.upsample_buffers + self.downsample_buffers:
+            buffer.clear()
 
     @property
-    def texture(self): return getattr(self, f'upscale_buffer_0').texture
+    def fbo(self): return self.upsample_buffers[0]
     @property
-    def fbo(self): return getattr(self, f'upscale_buffer_0')
+    def texture(self): return self.fbo.texture

{basilisk_engine-0.1.42 → basilisk_engine-0.1.44}/basilisk/render/chunk.py

@@ -1,3 +1,4 @@
+import sys
 from .batch import Batch
 
 
@@ -55,7 +56,11 @@ class Chunk():
         if not self.batch.vbo: return
         
         data = node.get_data()
-        self.batch.vbo.write(data, node.data_index * data.shape[1] * 4)
+
+        if ((node.data_index * data.shape[1] + (data.shape[0] * data.shape[1])) * 4) > self.batch.vbo.size:
+            self.batch.batch()
+        else:
+            self.batch.vbo.write(data, node.data_index * data.shape[1] * 4)
 
     def add(self, node):
         """

{basilisk_engine-0.1.42 → basilisk_engine-0.1.44}/basilisk/render/frame.py

@@ -55,10 +55,12 @@ class Frame:
         #     self.ping_pong_buffer = temp
         
 
-        self.bloom.render()
+        if self.engine.config.bloom_enabled: 
+            self.bloom.render()
+            self.shader.bind(self.bloom.texture, 'bloomTexture', 1)
+        
         target.use() if target else self.output_buffer.use()
         self.shader.bind(self.input_buffer.texture, 'screenTexture', 0)
-        self.shader.bind(self.bloom.texture, 'bloomTexture', 1)
         self.vao.render()
 
     def render(self, target=None) -> None:

{basilisk_engine-0.1.42 → basilisk_engine-0.1.44}/basilisk/render/framebuffer.py

@@ -124,7 +124,7 @@ class Framebuffer:
         Clear all data currently in the textures (set to black)        
         """
 
-        self.fbo.clear()
+        self.fbo.clear(color=color)
 
     def bind(self, sampler: mgl.Texture | mgl.TextureArray | mgl.TextureCube , name: str, slot: int=None):
         """
@@ -167,31 +167,11 @@ class Framebuffer:
     def data(self) -> bytes:
         """Reads the data from the fbo"""
         return self.fbo.read()
-    @property
-    def show(self) -> int:
-        return self._show
 
     @size.setter
     def size(self, value: tuple[int]=None) -> tuple[int]:
         self.resize(value)
         return self.size
-    
-    @show.setter
-    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
-        src.use(location=value+1)
 
     def __repr__(self) -> str:
         return f'<bsk.Framebuffer | size: {self.size}>' 

{basilisk_engine-0.1.42 → basilisk_engine-0.1.44}/basilisk/render/image_handler.py

@@ -76,7 +76,8 @@ class ImageHandler():
 
     def write(self, regenerate=False) -> None:
         """
-        Writes all texture arrays to shaders that use images 
+        Writes all texture arrays to shaders that use images
+        Uses bind slots [10, 11, 12, 13, 14]
         """
 
         if not self.engine.shader_handler: return
@@ -91,8 +92,7 @@ class ImageHandler():
             for i, size in enumerate(texture_sizes):
                 if not size in self.texture_arrays: continue
                 if not self.texture_arrays[size]: continue
-                shader.program[f'textureArrays[{i}].array'] = i + 3
-                self.texture_arrays[size].use(location=i+3)
+                shader.bind(self.texture_arrays[size], f'textureArrays[{i}].array', i + 10)
 
     def get(self, identifier: str | int) -> any:
         """

{basilisk_engine-0.1.42 → basilisk_engine-0.1.44}/basilisk/render/material_handler.py

@@ -85,6 +85,7 @@ class MaterialHandler():
     def write(self, regenerate=False) -> None:
         """
         Writes all material data to relavent shaders
+        Uses bind slot 15
         """
 
         if regenerate: self.generate_material_texture()
@@ -94,8 +95,7 @@ class MaterialHandler():
         for shader in self.engine.shader_handler.shaders:
             if 'materialsTexture' not in shader.uniforms: continue
 
-            shader.program['materialsTexture'] = 9
-            self.data_texture.use(location=9)
+            shader.bind(self.data_texture, 'materialsTexture', 9)
 
     def get(self, identifier: str | int) -> any:
         """

{basilisk_engine-0.1.42 → basilisk_engine-0.1.44}/basilisk/render/shader.py

@@ -13,7 +13,6 @@ attribute_mappings = {
     'obj_material' : [24],
 }
 
-
 class Shader:
     program: mgl.Program=None
     """Shader program for the vertex and fragment shader"""
@@ -106,7 +105,7 @@ class Shader:
         self.engine.shader_handler.add(self)
         if scene.node_handler: scene.node_handler.chunk_handler.swap_default(self)
 
-    def write(self, name: str, value) -> None:
+    def write(self, value, name: str) -> None:
         """
         Writes a uniform to the shader program
         """
@@ -118,6 +117,8 @@ class Shader:
         Binds the given sampler to the next availible slot
         """
 
+        # print(f'Binding {name} to slot {slot}')
+
         # Use the next slot if no slot is given
         if slot == None: slot = self.bindings; self.bindings+=1
 

{basilisk_engine-0.1.42 → basilisk_engine-0.1.44}/basilisk/render/shader_handler.py

@@ -1,3 +1,18 @@
+"""
+
+---------------------------------------
+Standard Reserved Bind Slots Mappings:
+    8 : Bloom
+    9 : Sky
+    10: Images[0]
+    11: Images[1]
+    12: Images[2]
+    13: Images[3]
+    14: Images[4]
+    15: Material Texture
+
+"""
+
 import moderngl as mgl
 import glm
 from .shader import Shader
@@ -85,7 +100,7 @@ class ShaderHandler:
         for uniform in self.uniform_values:
             for shader in self.shaders:
                 if not uniform in shader.uniforms: continue  # Does not write uniforms not in the shader
-                shader.write(uniform, self.uniform_values[uniform])
+                shader.write(self.uniform_values[uniform], uniform)
 
     def release(self) -> None:
         """

{basilisk_engine-0.1.42 → basilisk_engine-0.1.44}/basilisk/render/sky.py

@@ -28,13 +28,11 @@ class Sky:
 
     def write(self):
         # Write the texture cube to the sky shader
-        self.shader.program['skyboxTexture']  = 8
-        self.texture_cube.use(location = 8)
+        self.shader.bind(self.texture_cube, 'skyboxTexture', 8)
 
         shader = self.engine.shader
         if 'skyboxTexture' not in shader.uniforms: return
-        shader.program['skyboxTexture'] = 8
-        self.texture_cube.use(location = 8)
+        shader.bind(self.texture_cube, 'skyboxTexture', 8)
 
 
     def set_texture(self, skybox_images: list):

{basilisk_engine-0.1.42 → basilisk_engine-0.1.44}/basilisk/scene.py

@@ -89,8 +89,7 @@ class Scene():
 
         if target: return
         # This will show the frame to screen on engine.update()
-        self.frame.scene_render(target)
-        self.engine.frames.append(self.frame)
+        self.frame.scene_render(self.ctx.screen)
 
 
 

{basilisk_engine-0.1.42 → basilisk_engine-0.1.44}/basilisk/shaders/batch.frag

@@ -273,22 +273,17 @@ void main() {
     vec3 finalColor = albedo * 0.3 * mix(vec3(1.0), reflect_sky, mtl.metallicness);
     finalColor += (lightResult.diffuse + lightResult.specular + lightResult.clearcoat);
 
-    // light_result *= mix(vec3(1.0), texture(skyboxTexture, reflect(-V, N)).rgb, mtl.metallicness);
-    // Gamma correction
-    // finalColor = pow(finalColor, vec3(1.0/gamma));
-
     // Output fragment color
-    float brightness = dot(fragColor.rgb, vec3(0.2126, 0.7152, 0.0722)) + dot(lightResult.specular, vec3(.2)) + dot(mtl.emissiveColor, vec3(1));
+    float brightness = dot(finalColor, vec3(0.2126, 0.7152, 0.0722)) + dot(lightResult.specular, vec3(.2)) + dot(mtl.emissiveColor, vec3(1));
     fragColor = vec4(finalColor + mtl.emissiveColor, 1.0);
 
     normalTexture = vec4(abs(N), 1.0);
 
-    // // Filter out bright pixels for bloom
+    // Filter out bright pixels for bloom
     if (brightness > 0.5) {
         bloomColor = vec4(fragColor.rgb, 1.0);
     }
     else{
         bloomColor = vec4(0.0, 0.0, 0.0, 1.0);
     }
-
 }

basilisk_engine-0.1.44/basilisk/shaders/bloom_downsample.frag

@@ -0,0 +1,24 @@
+#version 330 core
+
+out vec4 fragColor;
+
+in vec2 uv;
+
+uniform sampler2D screenTexture;
+uniform ivec2 textureSize;
+
+void main()
+{ 
+
+    vec2 texelSize = 1.0 / textureSize;
+
+    vec4 color = vec4(0.0);
+
+    // Basic 2x2 downsampling (averaging)
+    color += texture(screenTexture, clamp(uv + vec2(-texelSize.x, -texelSize.y), 0.0, 0.9999));
+    color += texture(screenTexture, clamp(uv + vec2( texelSize.x, -texelSize.y), 0.0, 0.9999));
+    color += texture(screenTexture, clamp(uv + vec2(-texelSize.x,  texelSize.y), 0.0, 0.9999));
+    color += texture(screenTexture, clamp(uv + vec2( texelSize.x,  texelSize.y), 0.0, 0.9999));
+
+    fragColor = color / 4.0; // Average the four samples
+}

{basilisk_engine-0.1.42 → basilisk_engine-0.1.44/basilisk_engine.egg-info}/PKG-INFO

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

{basilisk_engine-0.1.42 → basilisk_engine-0.1.44}/basilisk_engine.egg-info/SOURCES.txt

@@ -119,6 +119,7 @@ images/floor.png
 images/foil.png
 images/mud.png
 tests/SkySkybox.png
+tests/battery.obj
 tests/box_three.obj
 tests/box_three_lid.obj
 tests/brick.png

{basilisk_engine-0.1.42 → basilisk_engine-0.1.44}/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.42',
+    version = '0.1.44',
     url = 'https://basilisk-website.vercel.app/',
     author = 'Name',
     author_email = 'basiliskengine@gmail.com',