basilisk-engine 0.1.29__tar.gz → 0.1.31__tar.gz

{basilisk_engine-0.1.29 → basilisk_engine-0.1.31}/PKG-INFO

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

{basilisk_engine-0.1.29 → basilisk_engine-0.1.31}/basilisk/engine.py

@@ -163,8 +163,4 @@ class Engine():
 
 
     @property
-    def shader(self): return self._shader
-    @shader.setter
-    def shader(self, value):
-        self._shader = value
-        value.set_main()
+    def shader(self): return self._shader

{basilisk_engine-0.1.29 → basilisk_engine-0.1.31}/basilisk/nodes/node.py

@@ -19,11 +19,11 @@ class Node():
     """The scale of the node in meters in each direction"""
     rotation: Quat
     """The rotation of the node"""
-    position_relative: bool
+    relative_position: bool
     """The position of this node relative to the parent node"""
-    scale_relative: bool
+    relative_scale: bool
     """The scale of this node relative to the parent node"""
-    rotation_relative: bool
+    relative_rotation: bool
     """The rotation of this node relative to the parent node"""
     forward: glm.vec3
     """The forward facing vector of the node"""
@@ -239,9 +239,9 @@ class Node():
         if self.relative_scale:    transform  = glm.scale(transform, self.parent.scale.data)
         
         # set this node's transforms based on the parent
-        self.position = transform * self.relative_position
-        self.scale = self.relative_scale * self.parent.scale.data
-        self.rotation = self.relative_rotation * self.parent.rotation.data
+        if self.relative_position: self.position = transform * self.relative_position
+        if self.relative_scale:    self.scale = self.relative_scale * self.parent.scale.data
+        if self.relative_rotation: self.rotation = self.relative_rotation * self.parent.rotation.data
         
         for child in self.children: child.sync_data()
         
@@ -287,12 +287,22 @@ class Node():
         """
         Adopts a node as a child. Relative transforms can be changed, if left bank they will not be chnaged from the current child nodes settings.
         """
-        if child in self.children: return
+        if child in self.children or child is self: return
+        assert isinstance(child, Node), 'Nodes can only accept other Nodes as children.'
+        
+        relative = glm.inverse(self.model_matrix) * child.model_matrix
+        position = glm.vec3(relative[3])
+        scale = glm.vec3([glm.length(relative[i]) for i in range(3)])
+        rotation = glm.quat_cast(glm.mat3x3(*[glm.vec3(relative[i]) / scale[i] for i in range(3)])) # TODO ensure that these are the correct calculations
         
         # compute relative transformations
-        if relative_position or (relative_position is None and child.relative_position): child.relative_position = child.position.data - self.position.data
-        if relative_scale    or (relative_scale    is None and child.relative_scale):    child.relative_scale    = child.scale.data / self.scale.data
-        if relative_rotation or (relative_rotation is None and child.relative_rotation): child.relative_rotation = child.rotation.data * glm.inverse(self.rotation.data)
+        if relative_position or (relative_position is None and child.relative_position): child.relative_position = position
+        if relative_scale    or (relative_scale    is None and child.relative_scale):    child.relative_scale    = scale
+        if relative_rotation or (relative_rotation is None and child.relative_rotation): child.relative_rotation = rotation
+        
+        print(child.relative_position)
+        print(child.relative_scale)
+        print(child.relative_rotation)
         
         # add as a child to by synchronized and controlled
         if self.node_handler: self.node_handler.add(child)

{basilisk_engine-0.1.29 → basilisk_engine-0.1.31}/basilisk/render/chunk.py

@@ -87,7 +87,7 @@ class Chunk():
         shader = self.shader
 
         if shader: return shader
-        return self.chunk_handler.engine.shader
+        return self.chunk_handler.scene.shader
 
     def swap_shader(self, shader):
         """

{basilisk_engine-0.1.29 → basilisk_engine-0.1.31}/basilisk/render/framebuffer.py

@@ -166,9 +166,18 @@ class Framebuffer:
     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
-        self.color_attachments[value].use(location=value+1)
+        src.use(location=value+1)
 
     def __repr__(self) -> str:
         return f'<bsk.Framebuffer | size: {self.size}>' 

{basilisk_engine-0.1.29 → basilisk_engine-0.1.31}/basilisk/render/shader.py

@@ -98,13 +98,13 @@ class Shader:
         # Create a program with shaders
         self.program = self.ctx.program(vertex_shader=self.vertex_shader, fragment_shader=self.fragment_shader)
 
-    def set_main(self):
+    def set_main(self, scene):
         """
         Selects a shader for use
         """
         
         self.engine.shader_handler.add(self)
-        self.engine.scene.node_handler.chunk_handler.swap_default(self)
+        if scene.node_handler: scene.node_handler.chunk_handler.swap_default(self)
 
     def write(self, name: str, value) -> None:
         """

{basilisk_engine-0.1.29 → basilisk_engine-0.1.31}/basilisk/render/shader_handler.py

@@ -28,7 +28,7 @@ class ShaderHandler:
         self.shaders = set()
 
         # Load a default shader
-        self.default_shader = Shader(self, self.engine.root + '/shaders/batch.vert', self.engine.root + '/shaders/batch.frag')
+        self.default_shader = Shader(self.engine, self.engine.root + '/shaders/batch.vert', self.engine.root + '/shaders/batch.frag')
         self.default_shader.hash = self.default_shader.hash + hash('engine_shader')
         self.add(self.default_shader)
         setattr(self.engine, "_shader", self.default_shader)

{basilisk_engine-0.1.29 → basilisk_engine-0.1.31}/basilisk/scene.py

@@ -4,8 +4,7 @@ import pygame as pg
 
 from .mesh.mesh import Mesh
 from .render.material import Material
-from .render.shader_handler import ShaderHandler
-from .render.material_handler import MaterialHandler
+from .render.shader import Shader
 from .render.light_handler import LightHandler
 from .render.camera import Camera, FreeCamera
 from .nodes.node_handler import NodeHandler
@@ -34,13 +33,14 @@ class Scene():
     node_handler: NodeHandler=None
     """"""
 
-    def __init__(self, engine: ...) -> None:
+    def __init__(self, engine: ..., shader: Shader=None) -> None:
         """
         Basilisk scene object. Contains all nodes for the scene
         """
 
         self.engine = engine
         self.ctx    = engine.ctx
+        self.shader = shader if shader else engine.shader
         self.camera           = FreeCamera()
         self.light_handler    = LightHandler(self)
         self.physics_engine   = PhysicsEngine()
@@ -69,7 +69,11 @@ class Scene():
             self.collider_handler.resolve_collisions()
 
         # Render by default to the engine frame
-        if render: self.render()
+        if not render: return
+
+        # Check if the user is giving a destination
+        if not isinstance(render, bool): self.render(renders)
+        else: self.render()
 
     def render(self, render_target: Framebuffer|Frame=None) -> None:
         """
@@ -92,7 +96,6 @@ class Scene():
         if self.engine.headless or not show: return
 
 
-    
     def add(self, *objects: Node | None) -> None | Node | list:
         """
         Adds the given object(s) to the scene. Can pass in any scene objects:
@@ -263,6 +266,8 @@ class Scene():
     def sky(self): return self._sky
     @property
     def nodes(self): return self.node_handler.nodes
+    @property
+    def shader(self): return self._shader
 
     @camera.setter
     def camera(self, value: Camera):
@@ -277,4 +282,9 @@ class Scene():
         if not isinstance(value, Sky) and not isinstance(value, type(None)):
             raise TypeError(f'Scene: Invalid sky type: {type(value)}. Expected type bsk.Sky or None')
         self._sky = value
-        if value: self._sky.write()
+        if value: self._sky.write()
+
+    @shader.setter
+    def shader(self, value):
+        self._shader = value
+        value.set_main(self)

{basilisk_engine-0.1.29 → basilisk_engine-0.1.31}/basilisk_engine.egg-info/PKG-INFO

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

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