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

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

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

{basilisk_engine-0.1.44 → basilisk_engine-0.1.45}/basilisk/draw/draw_handler.py

@@ -44,10 +44,11 @@ class DrawHandler():
         if not self.draw_data: return
 
         self.ctx.enable(mgl.BLEND)
-        self.ctx.blend_func = mgl.ADDITIVE_BLENDING
+        self.ctx.disable(mgl.DEPTH_TEST)
+        self.ctx.blend_func = mgl.DEFAULT_BLENDING
 
         # Reverse the draw order, and convert to C-like array
-        self.draw_data.reverse()
+        # self.draw_data.reverse()
         data = np.array(self.draw_data, dtype='f4')
         ratio = np.array([2 / self.engine.win_size[0], 2 / self.engine.win_size[1]])
         data[:,:2] = data[:,:2] * ratio - 1
@@ -67,6 +68,8 @@ class DrawHandler():
         self.draw_data.clear()
 
         self.ctx.disable(mgl.BLEND)
+        self.ctx.enable(mgl.DEPTH_TEST)
+
 
     def draw_rect(self, color: tuple, rect: tuple) -> None:
         """
@@ -87,8 +90,8 @@ class DrawHandler():
         v4 = (*p4, *color, 0, 0.0)
 
         self.draw_data.extend([
-            v1, v3, v2,
-            v2, v3, v4
+            v1, v2, v3,
+            v2, v4, v3
         ])
 
     def draw_circle(self, color: tuple, center: tuple, radius: int, resolution: int=20, outer_color: tuple=None) -> None:
@@ -118,7 +121,7 @@ class DrawHandler():
             v2 = (center[0] + radius * cos(theta), center[1] + radius * sin(theta), *outer_color, 0, 0.0)
             theta += delta_theta
             v3 = (center[0] + radius * cos(theta), center[1] + radius * sin(theta), *outer_color, 0, 0.0)
-            self.draw_data.extend([v1, v2, v3])
+            self.draw_data.extend([v1, v3, v2])
 
     def draw_line(self, color: tuple, p1: tuple, p2: tuple, thickness: int=1):
         """
@@ -150,7 +153,7 @@ class DrawHandler():
         v3 = (*(p2 - perp_vector), *color, 0, 0.0)
         v4 = (*(p2 + perp_vector), *color, 0, 0.0)
         
-        self.draw_data.extend([v1, v3, v4, v2, v1, v4])
+        self.draw_data.extend([v1, v4, v3, v2, v4, v1])
 
     def blit(self, image: Image, rect: tuple, alpha: float=1.0):
         rect  = validate_rect(rect)
@@ -166,8 +169,8 @@ class DrawHandler():
         v4 = (*p4, *image.index, 1, 1, 1, alpha)
 
         self.draw_data.extend([
-            v1, v3, v2,
-            v2, v3, v4
+            v1, v2, v3,
+            v2, v4, v3
         ])
 
     def __del__(self) -> None:

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

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

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

@@ -270,20 +270,23 @@ void main() {
     lightResult.diffuse  *= mix(vec3(1.0), ambient_sky, 0.25);
     lightResult.diffuse  *= ao;
 
-    vec3 finalColor = albedo * 0.3 * mix(vec3(1.0), reflect_sky, mtl.metallicness);
-    finalColor += (lightResult.diffuse + lightResult.specular + lightResult.clearcoat);
-
-    // Output fragment color
-    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);
+    vec3 finalColor = lightResult.diffuse + lightResult.specular + lightResult.clearcoat;
 
+    float brightness = dot(finalColor, vec3(0.2126, 0.7152, 0.0722)) + dot(lightResult.specular, vec3(.15)) + dot(mtl.emissiveColor, vec3(1));
     // Filter out bright pixels for bloom
-    if (brightness > 0.5) {
-        bloomColor = vec4(fragColor.rgb, 1.0);
+    float threshold = 0.5;
+    if (brightness > threshold) {
+        bloomColor = vec4(max(finalColor + mtl.emissiveColor - threshold, 0.0), 1.0);
     }
     else{
         bloomColor = vec4(0.0, 0.0, 0.0, 1.0);
     }
+    
+
+    // Output fragment color
+    finalColor += albedo * 0.3 * mix(vec3(1.0), reflect_sky, mtl.metallicness) + mtl.emissiveColor;
+    fragColor = vec4(finalColor, 1.0);
+
+    normalTexture = vec4(abs(N), 1.0);
+
 }

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

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

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