basilisk-engine 0.1.10__tar.gz → 0.1.12__tar.gz

{basilisk_engine-0.1.10 → basilisk_engine-0.1.12}/PKG-INFO

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

{basilisk_engine-0.1.10 → basilisk_engine-0.1.12}/basilisk/nodes/node.py

@@ -572,16 +572,18 @@ class Node():
         self.chunk.node_update_callback(self)
     
     @velocity.setter
-    def velocity(self, value: tuple | list | glm.vec3 | np.ndarray):
+    def velocity(self, value: tuple | list | glm.vec3 | np.ndarray | Vec3):
         if isinstance(value, glm.vec3): self._velocity = glm.vec3(value)
+        elif isinstance(value, Vec3): self._velocity = glm.vec3(value.data)
         elif isinstance(value, tuple) or isinstance(value, list) or isinstance(value, np.ndarray):
             if len(value) != 3: raise ValueError(f'Node: Invalid number of values for velocity. Expected 3, got {len(value)}')
             self._velocity = glm.vec3(value)
         else: raise TypeError(f'Node: Invalid velocity value type {type(value)}')
         
     @rotational_velocity.setter
-    def rotational_velocity(self, value: tuple | list | glm.vec3 | np.ndarray):
+    def rotational_velocity(self, value: tuple | list | glm.vec3 | np.ndarray | Vec3):
         if isinstance(value, glm.vec3): self._rotational_velocity = glm.vec3(value)
+        elif isinstance(value, Vec3): self._rotational_velocity = glm.vec3(value.data)
         elif isinstance(value, tuple) or isinstance(value, list) or isinstance(value, np.ndarray):
             if len(value) != 3: raise ValueError(f'Node: Invalid number of values for rotational velocity. Expected 3, got {len(value)}')
             self._rotational_velocity = glm.vec3(value)

{basilisk_engine-0.1.10 → basilisk_engine-0.1.12}/basilisk/render/batch.py

@@ -75,6 +75,25 @@ class Batch():
         
         return True
 
+    def swap_shader(self, shader):
+        """
+        Swap the shader without rebatching
+        """
+        
+        # Check there is actually something to swap
+        if not self.vao: return
+        
+        # Release old data
+        self.vao.release()
+
+        # Make new vao with old data
+        self.program = shader.program
+        self.vao = self.ctx.vertex_array(self.program, [(self.vbo, 
+                                                         '3f 2f 3f 3f 3f 3f 4f 3f 1f', 
+                                                         *['in_position', 'in_uv', 'in_normal', 'in_tangent', 'in_bitangent', 'obj_position', 'obj_rotation', 'obj_scale', 'obj_material'])], 
+                                                         skip_errors=True)
+
+
     def __repr__(self) -> str:
         return f'<Basilisk Batch | {self.chunk.chunk_key}, {self.vbo.size / 1024  / 1024} mb>'
 

{basilisk_engine-0.1.10 → basilisk_engine-0.1.12}/basilisk/render/camera.py

@@ -1,6 +1,9 @@
 import pygame as pg
 import glm
 import numpy as np
+from ..generic.vec3 import Vec3
+from ..generic.quat import Quat
+
 
 # Camera view constants
 FOV = 50  # Degrees
@@ -112,16 +115,18 @@ class Camera:
         self.use()
         
     @position.setter
-    def position(self, value: tuple | list | glm.vec3 | np.ndarray):
+    def position(self, value: tuple | list | glm.vec3 | np.ndarray | Vec3):
         if isinstance(value, glm.vec3): self._position = glm.vec3(value)
+        elif isinstance(value, Vec3): self._position = glm.vec3(value.data)
         elif isinstance(value, tuple) or isinstance(value, list) or isinstance(value, np.ndarray):
             if len(value) != 3: raise ValueError(f'Camera: Invalid number of values for position. Expected 3, got {len(value)}')
             self._position = glm.vec3(value)
         else: raise TypeError(f'Camera: Invalid position value type {type(value)}')
         
     @direction.setter
-    def direction(self, value: tuple | list | glm.vec3 | np.ndarray):
-        if isinstance(value, glm.vec3): self.direction = glm.normalize(glm.vec3(value))
+    def direction(self, value: tuple | list | glm.vec3 | np.ndarray | Vec3):
+        if isinstance(value, glm.vec3): self.forward = glm.normalize(glm.vec3(value))
+        elif isinstance(value, Vec3): self.forward = glm.normalize(value.data)
         elif isinstance(value, tuple) or isinstance(value, list) or isinstance(value, np.ndarray):
             if len(value) != 3: raise ValueError(f'Camera: Invalid number of values for direction. Expected 3, got {len(value)}')
             self.forward = glm.normalize(glm.vec3(value))

{basilisk_engine-0.1.10 → basilisk_engine-0.1.12}/basilisk/render/chunk.py

@@ -89,6 +89,13 @@ class Chunk():
         if shader: return shader.program
         return self.chunk_handler.engine.shader.program
 
+    def swap_shader(self, shader):
+        """
+        Swaps the batches shader to the given shader
+        """
+        
+        self.batch.swap_shader(shader)
+
     def __repr__(self) -> str:
         return f'<Basilisk Chunk | {self.position}, {len(self.nodes)} nodes, {"static" if self.static else "dynamic"}>'
 

{basilisk_engine-0.1.10 → basilisk_engine-0.1.12}/basilisk/render/chunk_handler.py

@@ -152,4 +152,15 @@ class ChunkHandler():
         render_range_z[1] -= render_distance * (270 - fov < self.scene.camera.yaw < 270 + fov) - 1
         render_range_z[0] += render_distance * (90 - fov < self.scene.camera.yaw < 90 + fov) - 1
 
-        return (render_range_x, render_range_y, render_range_z)
+        return (render_range_x, render_range_y, render_range_z)
+    
+    def swap_default(self, shader):
+        """
+        Swaps the shader of the default chunks
+        """
+        
+        group = self.shader_groups[None]
+        for chunk in group[0].values():
+            chunk.swap_shader(shader)
+        for chunk in group[1].values():
+            chunk.swap_shader(shader)

{basilisk_engine-0.1.10 → basilisk_engine-0.1.12}/basilisk/render/shader.py

@@ -94,7 +94,8 @@ class Shader:
         """
         
         self.engine.scene.shader_handler.add(self)
-        self.engine.scene.node_handler.chunk_handler.update_all()
+        # self.engine.scene.node_handler.chunk_handler.update_all()
+        self.engine.scene.node_handler.chunk_handler.swap_default(self)
 
     def write(self, name: str, value) -> None:
         """

{basilisk_engine-0.1.10 → basilisk_engine-0.1.12}/basilisk_engine.egg-info/PKG-INFO

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

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