basilisk-engine 0.1.44__py3-none-any.whl → 0.1.46__py3-none-any.whl

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.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(self.ctx.screen)
 
         # Even though we may not render here, the user might be rendering in their file, so we need to flip
         pg.display.flip()

basilisk/scene.py

@@ -74,22 +74,24 @@ class Scene():
             self.collider_handler.resolve_collisions()
 
         # Render by default to the scene frame
-        if render: self.render()
+        if render: self.render(self.engine.frame.output_buffer)
 
     def render(self, target=None) -> None:
         """
         Renders all the nodes with meshes in the scene
         """
 
-        target.use() if target else self.frame.use(); self.frame.clear()
+        # target.use() if target else self.frame.use(); self.frame.clear()
+        self.frame.use()
+        self.frame.clear()
         self.engine.shader_handler.write(self)
         self.particle.render()
         self.node_handler.render()
         if self.sky: self.sky.render()
 
-        if target: return
+        self.frame.scene_render(target)
         # This will show the frame to screen on engine.update()
-        self.frame.scene_render(self.ctx.screen)
+        # self.frame.scene_render(self.ctx.screen)
 
 
 

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.dist-info → basilisk_engine-0.1.46.dist-info}/METADATA

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

{basilisk_engine-0.1.44.dist-info → basilisk_engine-0.1.46.dist-info}/RECORD

@@ -1,7 +1,7 @@
 basilisk/__init__.py,sha256=23OM1kiXMU44J2TVp66efVSrbQAeiuTDmcdhNAftFfY,1134
 basilisk/config.py,sha256=Ajm3BjCryuX5bmJglqRZDR1SjE0sDjTbulta5GZ67hA,1712
-basilisk/engine.py,sha256=xuah50P1y6fgllWvi75pLtDL2plf-GGSoZY4lQFLdSo,6002
-basilisk/scene.py,sha256=3grqRcytDCplwAMOmc7lIJOzKzQUtSEWwk94tpj4W4Q,12223
+basilisk/engine.py,sha256=rUI4DCeCFCMPBxd-A3DSZKHXu-CVb1I3F5nJ6MhNrU4,6016
+basilisk/scene.py,sha256=tb7SyK_BaG5JXqKFAifT3nSx0dNS7-zX4RSEUE-2uX8,12324
 basilisk/audio/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/audio/sound.py,sha256=h2dQ3IKb_SRKNZqNuk-fdNg_Xfz0P7sqEXA33qiBXG4,692
 basilisk/bsk_assets/Roboto-Regular.ttf,sha256=kqYnZjMRQMpbyLulIChCLSdgYa1XF8GsUIoRi2Gcauw,168260
@@ -27,7 +27,7 @@ basilisk/collisions/narrow/line_intersections.py,sha256=hZCXAeAGbs9adGraa6tHUOli
 basilisk/collisions/narrow/sutherland_hodgman.py,sha256=8FOrqxCApsQTmw4n_meSaLIzc5s_dD4tMJTHahzaZ-A,3065
 basilisk/draw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/draw/draw.py,sha256=bbmx_q8GyDhWELDBTfy16e7Y-22amVyoTcf8orwveKw,3520
-basilisk/draw/draw_handler.py,sha256=GzCKEkW7tUsufIF0ZaQYVrgY5LkZDBJD519_iduurgc,6105
+basilisk/draw/draw_handler.py,sha256=9ueMTCPwvO8u5I9gJborCbawxebHnkfxou73ZLJidCk,6188
 basilisk/draw/font_renderer.py,sha256=esCaQ4rJ3kjeIZ0xr510k2JIE_K9bshO9_OkByYNo_0,1064
 basilisk/generic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/generic/abstract_bvh.py,sha256=BZv9mgkUpNu3bcqmn9I60VqMZocebeyUOoER2Wdky3g,368
@@ -41,9 +41,6 @@ basilisk/generic/quat.py,sha256=gEqvQvNwx5K7e0zqY0TFTAFtNFSkOatleoP9HQQ-xyk,5102
 basilisk/generic/quat_methods.py,sha256=SO18ush7pfeGUmncPy4i5nsab1e_zkQkY6zT1bAsSDY,234
 basilisk/generic/raycast_result.py,sha256=waVmS9fYhLoz_G_DU2Mj7896rF0Xy_59JVGALq-kD7g,783
 basilisk/generic/vec3.py,sha256=AtPSz2S1ZqAm-sZUz4phB09hgFxMIsJnQdU1wmxiOBw,5137
-basilisk/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-basilisk/input/mouse.py,sha256=waXJLIyka4IVe3W2WH5SNNxiOQRouYo3NxafP3fg0qg,1937
-basilisk/input/path.py,sha256=GpFYe3Uu6VZAuKh9Q2nQM1H8immiCp_snznLG9FKcvU,441
 basilisk/input_output/IO_handler.py,sha256=DDQEjmIHzWo99rk1riT_QJKGQ5F8-lOilmchRXeQuYI,2822
 basilisk/input_output/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/input_output/clock.py,sha256=GHTagpPyPlLjWyonaHV8M-nPCcdHcHL4JobbuUOxYf0,1462
@@ -87,12 +84,10 @@ basilisk/render/post_process.py,sha256=QAIwNccycEJqA1UVGKUqwVus11sJX9qm3Mjl0gdGY
 basilisk/render/shader.py,sha256=xh2p8kPFCPD479wyf6X3NUsgGfy3sbnSypNqFd8k83c,4870
 basilisk/render/shader_handler.py,sha256=Tk-wbejg7UhXyq1c9pHjb-590zqAakNLCZu2ZbKCCAs,3260
 basilisk/render/sky.py,sha256=2HWv8_2tfJfCiLz6WVE3BnWSAi4Ttulks5l-IF9YG3g,4747
-basilisk/render/tempCodeRunnerFile.py,sha256=ep1eVZzUd30SDCNE5l3OJsqp2fW2LEXrjYGW31AMWgw,10
 basilisk/shaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-basilisk/shaders/batch.frag,sha256=ATxjwTy-bhf5O1eEhmfh9uf4FjFUQ4IlYA4V6W1_TZw,9437
+basilisk/shaders/batch.frag,sha256=F_rGIQaY5jfep3WTCNY9Q3uLfu2lNuUSZZR7GZy_HCk,9514
 basilisk/shaders/batch.vert,sha256=LYzcqcwCyCpnxF5V-ilx79HU2cYz66hylBmZChcVmos,5555
 basilisk/shaders/bloom_downsample.frag,sha256=rIQTnBkSNiTF57D-yvWwQv_3_PmxznquHdlma8ua8Uw,685
-basilisk/shaders/bloom_frame.frag,sha256=Y0m8DnQKz3G9FKq7VjCGrVXZw2vSigyGX7-tlxZN0lE,567
 basilisk/shaders/bloom_upsample.frag,sha256=Pe1AupjM2OCMieW7oEYHoEx2LhbPtbpwcylruF5Ntm4,1156
 basilisk/shaders/crt.frag,sha256=ss6xhXwwOH9bXEhqyim--K4o1BOo1Wwq6tGAwjpRHEQ,1043
 basilisk/shaders/draw.frag,sha256=rcPmGMh850M1ypcFNlJCyFWxfZ739lVNl6OPTxPIYIE,605
@@ -109,7 +104,7 @@ basilisk/shaders/particle.frag,sha256=IskhyXelHs9GqABKwTYSwooWL0nP-nkmXl6a5iT6Q3
 basilisk/shaders/particle.vert,sha256=oiBz6S_2dzqioAhyzVYT1ZKOED4h4R6IoP-UJ8KRHhU,3227
 basilisk/shaders/sky.frag,sha256=dJRdSbg16aZYYjxdoG1spVQRIVBGNVdyX0rqp4ER6v8,556
 basilisk/shaders/sky.vert,sha256=oAnrknEgsd9MawE_zx8P0u9nUSFEBYBg5ykBmWpqZ_g,332
-basilisk_engine-0.1.44.dist-info/METADATA,sha256=JwByp7SjP1rOiHU8QqqLsK4UYbF-Z_0uxd3h4LJxzqo,3793
-basilisk_engine-0.1.44.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-basilisk_engine-0.1.44.dist-info/top_level.txt,sha256=enlSYSf7CUyAly1jmUCNNGInTbaFUjGk4SKwyckZQkw,9
-basilisk_engine-0.1.44.dist-info/RECORD,,
+basilisk_engine-0.1.46.dist-info/METADATA,sha256=EKpZDCMzIALAWkQjmiKgUDcgLJdDdRg68dq2GL32rfY,3793
+basilisk_engine-0.1.46.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+basilisk_engine-0.1.46.dist-info/top_level.txt,sha256=enlSYSf7CUyAly1jmUCNNGInTbaFUjGk4SKwyckZQkw,9
+basilisk_engine-0.1.46.dist-info/RECORD,,

basilisk/input/mouse.py

@@ -1,62 +0,0 @@
-import pygame as pg
-
-
-class Mouse():
-    def __init__(self, grab=True):
-        self.x, self.y = pg.mouse.get_pos()
-        self.buttons = pg.mouse.get_pressed()
-        self.previous_buttons = pg.mouse.get_pressed()
-        self.grab = grab
-
-    def update(self, events):
-        """
-        Updates all mouse state variables.
-        Checks for mouse-related events.
-        """
-        
-        self.x, self.y = pg.mouse.get_pos()
-        self.previous_buttons = self.buttons
-        self.buttons = pg.mouse.get_pressed()
-
-        for event in events:
-            if event.type == pg.KEYUP:
-                if event.key == pg.K_ESCAPE and self.grab:
-                    # Unlock mouse
-                    pg.event.set_grab(False)
-                    pg.mouse.set_visible(True)
-            if event.type == pg.MOUSEBUTTONUP and self.grab:
-                # Lock mouse
-                pg.event.set_grab(True)
-                pg.mouse.set_visible(False)
-
-    def set_pos(self, x, y):
-        """Set the mouse position"""
-        pg.mouse.set_pos(x, y)
-
-    @property
-    def click(self): return self.buttons[0] and not self.previous_buttons[0]
-    @property
-    def left_click(self): return self.buttons[0] and not self.previous_buttons[0]
-    @property
-    def middle_click(self): return self.buttons[1] and not self.previous_buttons[1]
-    @property
-    def right_click(self): return self.buttons[2] and not self.previous_buttons[2]
-    @property
-    def left_down(self): return self.buttons[0]
-    @property
-    def middle_down(self): return self.buttons[1]
-    @property
-    def right_down(self): return self.buttons[2]
-
-    @property
-    def grab(self): return self._grab
-
-    @grab.setter
-    def grab(self, value):
-        self._grab = value
-        if self._grab:
-            pg.event.set_grab(True)
-            pg.mouse.set_visible(False)
-        else:
-            pg.event.set_grab(False)
-            pg.mouse.set_visible(True)

basilisk/input/path.py

@@ -1,14 +0,0 @@
-import os
-import sys
-
-
-# Credit for function: https://stackoverflow.com/questions/7674790/bundling-data-files-with-pyinstaller-onefile
-def get_root():
-    """ Get absolute path to resource, works for dev and for PyInstaller """
-    try:
-        # PyInstaller creates a temp folder and stores path in _MEIPASS
-        base_path = sys._MEIPASS
-    except Exception:
-        base_path = os.path.abspath(".")
-
-    return base_path + '/basilisk'

basilisk/render/tempCodeRunnerFile.py

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

basilisk/shaders/bloom_frame.frag

@@ -1,25 +0,0 @@
-#version 330 core
-
-out vec4 fragColor;
-
-in vec2 uv;
-
-uniform sampler2D screenTexture;
-uniform sampler2D bloomTexture;
-
-
-
-void main()
-{ 
-    const float gamma = 2.2;
-    const float exposure = 1.2;
-    vec3 hdrColor = texture(screenTexture, uv).rgb + texture(bloomTexture, uv).rgb / 2;
-  
-    // exposure tone mapping
-    vec3 mapped = vec3(1.0) - exp(-hdrColor * exposure);
-    // gamma correction 
-    mapped = pow(mapped, vec3(1.0 / gamma));
-  
-    fragColor = vec4(mapped, 1.0);
-    //fragColor = texture(screenTexture, uv) + texture(bloomTexture, uv) / 20000.0;
-}