basilisk-engine 0.0.2__py3-none-any.whl → 0.0.4__py3-none-any.whl

basilisk/__init__.py

@@ -2,7 +2,6 @@ from .engine import Engine
 from .scene import Scene
 from .nodes.node import Node
 from .mesh.mesh import Mesh
-from .mesh.cube import cube
 from .render.image import Image
 from .render.material import Material
 from .render.shader_handler import ShaderHandler

basilisk/collisions/collider.py

@@ -1,7 +1,6 @@
 import glm
 from ..generic.abstract_bvh import AbstractAABB as AABB
 from ..generic.meshes import transform_points, get_aabb_surface_area
-from ..mesh.cube import cube
 from ..mesh.mesh import Mesh
 
 class Collider():
@@ -39,7 +38,7 @@ class Collider():
     def __init__(self, collider_handler, node, box_mesh: bool=False, static_friction: glm.vec3=0.7, kinetic_friction: glm.vec3=0.3, elasticity: glm.vec3=0.1, collision_group: str=None):
         self.collider_handler = collider_handler
         self.node = node
-        self.mesh = cube if box_mesh else self.node.mesh
+        self.mesh = self.collider_handler.cube if box_mesh else self.node.mesh
         self.static_friction = static_friction
         self.kinetic_friction = kinetic_friction
         self.elasticity = elasticity

basilisk/collisions/collider_handler.py

@@ -2,7 +2,7 @@ import glm
 from .narrow.gjk import *
 from .collider import Collider
 from .broad.broad_bvh import BroadBVH
-from ..mesh.cube import cube
+from ..mesh.cube import Cube
 from ..generic.collisions import get_sat_axes
 from .narrow.gjk import collide_gjk
 from .narrow.epa import get_epa_from_gjk
@@ -17,6 +17,7 @@ class ColliderHandler():
     
     def __init__(self, scene) -> None:
         self.scene = scene
+        self.cube = self.scene.engine.cube
         self.colliders = []
         self.bvh = BroadBVH(self)
         
@@ -132,7 +133,7 @@ class ColliderHandler():
             node2: Node = collider2.node
             
             # get peneration data or quit early if no collision is found
-            if collider1.mesh == cube and collider2.mesh == cube: # obb-obb collision
+            if collider1.mesh == self.cube and collider2.mesh == self.cube: # obb-obb collision
                 
                 # run SAT for obb-obb (includes peneration)
                 data = self.collide_obb_obb(collider1, collider2)

basilisk/draw/font_renderer.py

@@ -3,7 +3,7 @@ import pygame as pg
 class FontRenderer():
     def __init__(self, root):
         pg.font.init()
-        self.font = pg.font.Font(root + '/draw/Roboto-Regular.ttf', 48)
+        self.font = pg.font.Font(root + '/bsk_assets/Roboto-Regular.ttf', 48)
         self.text_renders = {}
 
     def render(self, text, color=(255, 255, 255), bold=False, underline=False, italic=False):

basilisk/engine.py

@@ -4,6 +4,7 @@ import pygame as pg
 import moderngl as mgl
 from .config import Config
 from .input.mouse import Mouse
+from .mesh.cube import Cube
 import time
 
 class Engine():
@@ -72,7 +73,7 @@ class Engine():
         self.headless = headless
         self.set_configurations()
         self.root = os.path.dirname(__file__)
-        print(self.root)
+        self.cube = Cube(self)
 
         # Time variables
         self.clock = pg.time.Clock()

basilisk/input/__init__.py

@@ -1 +0,0 @@
-import 

basilisk/mesh/cube.py

@@ -4,17 +4,13 @@ from .mesh import Mesh
 
     
 class Cube(Mesh):
-    def __init__(self) -> None:
+    def __init__(self, engine) -> None:
         # built-in cube mesh with custom functions
-        dire = os.path.dirname(__file__)
-        path = os.path.join(dire, 'built-in', 'cube.obj')
+        path = engine.root + '/bsk_assets/cube.obj'
         super().__init__(path)
 
     def get_best_dot(self, vec: glm.vec3) -> glm.vec3:
         """
         Gets the best dot point of a cube
         """
-        return glm.vec3([-1 if v < 0 else 1 for v in vec])
-    
-# create instance of cube mesh to be used by both the user and the package. Needs to be the same cube object for internal comparisons. Do not allow the user to access the Cube class to prevent them from making other Cube objects. 
-cube = Cube()
+        return glm.vec3([-1 if v < 0 else 1 for v in vec])

basilisk/nodes/node.py

@@ -4,7 +4,6 @@ from ..generic.vec3 import Vec3
 from ..generic.quat import Quat
 from ..generic.matrices import get_model_matrix
 from ..mesh.mesh import Mesh
-from ..mesh.cube import cube
 from ..render.material import Material
 from ..physics.physics_body import PhysicsBody
 from ..collisions.collider import Collider
@@ -95,7 +94,7 @@ class Node():
         self.internal_scale   : Vec3 = Vec3(scale)    if scale    else Vec3(1, 1, 1)
         self.internal_rotation: Quat = Quat(rotation) if rotation else Quat(1, 0, 0, 0)
         self.forward  = forward  if forward  else glm.vec3(1, 0, 0)
-        self.mesh     = mesh     if mesh     else cube
+        self.mesh     = mesh     if mesh     else self.node_handler.scene.engine.cube
         self.material = material if material else None # TODO add default base material
         self.velocity = velocity if velocity else glm.vec3(0, 0, 0)
         self.rotational_velocity = rotational_velocity if rotational_velocity else glm.vec3(0, 0, 0)

{basilisk_engine-0.0.2.dist-info → basilisk_engine-0.0.4.dist-info}/METADATA

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

{basilisk_engine-0.0.2.dist-info → basilisk_engine-0.0.4.dist-info}/RECORD

@@ -1,11 +1,11 @@
-basilisk/__init__.py,sha256=hJVKd8NebPIdDzhfRMZsOElR5w2wGkrsW7WJqb0tpB0,368
+basilisk/__init__.py,sha256=g1picXHoGTf2Oo0cc7XfMZr58QW8sPO7Gubsvlfmj_E,339
 basilisk/config.py,sha256=ynTRlX633DGoEtZOeAK8KNJF6offV3k3XFD7cia3Keg,61
-basilisk/engine.py,sha256=R1COiHLHNgsfIJ72U_XxAR2oftBRsVYyYOrVqTr48Xc,5709
+basilisk/engine.py,sha256=jp5_ZDwp72UdbWvQIciOcWo63x5SFYtZ4tW_TQOYB5U,5744
 basilisk/scene.py,sha256=ow3w2ZouBdn7E1xw39-aMu7_gbsnDxzeNi1mqbYqa-M,4452
 basilisk/bsk_assets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/collisions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-basilisk/collisions/collider.py,sha256=wGOZOaHD2cOerbPsJDQ61Zt0EfvjBLOOZoClbBfQOCk,3477
-basilisk/collisions/collider_handler.py,sha256=TquzaPW0WRIlUsjh_ClpF4hNuVnCnP_A2hGFsK3yOd4,7318
+basilisk/collisions/collider.py,sha256=-bWTt5s_cO2Nmn9lG3igFQulYw5M19B9xoEEiGRCAzM,3469
+basilisk/collisions/collider_handler.py,sha256=S1TsBd8S3s_U5vozodTxIxRrAUMcYP6dIe2uf_42zaM,7372
 basilisk/collisions/broad/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/collisions/broad/broad_aabb.py,sha256=4__sd6CoIE6_Vk18X60loPTPH8YqD6fBBXLJraGOqqk,4194
 basilisk/collisions/broad/broad_bvh.py,sha256=ZidQcGWrdIsz8T4Nbt6T-V0Tjd_XeqHamsFaYAXmUCA,3739
@@ -16,7 +16,7 @@ basilisk/collisions/narrow/helper.py,sha256=gTnyiyYLfTaRWYXi8EMUHvxN-sLbOf1esTLC
 basilisk/draw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/draw/draw.py,sha256=S1eMkuOiM2M0GQTxb1LgFMX7OCDn3YsUCkNc6-t-ClU,3631
 basilisk/draw/draw_handler.py,sha256=5NYo6gMAY4drl00jp-_J6ul9yLyzFVzVJoxgXm5oLqo,7479
-basilisk/draw/font_renderer.py,sha256=xM17puuAUOvRacDrciS9g_gKkOZkX_b-_rZHQn-i0Ao,1086
+basilisk/draw/font_renderer.py,sha256=gyI59fW3DUswIcSg5VJLLcJti3OLTMdXNQrYJaw18dE,1092
 basilisk/generic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/generic/abstract_bvh.py,sha256=iQ6HjcI8Msw34dZ3YuDAhWSqEc4NTBHAaGqAZZAoLL8,383
 basilisk/generic/collisions.py,sha256=usdbNidhDOn_JBXnA58iNvdCfQEetmoMoAT5R9_Y28w,930
@@ -27,19 +27,18 @@ basilisk/generic/meshes.py,sha256=0Zq5EkWEtqz-2V-kEQt-R3JZvUS5RTqflih8Mj9vL4o,26
 basilisk/generic/quat.py,sha256=u8vqFWCVouKPJCi79fhWhRvqHoKduqUwgYs10-C4WvQ,4625
 basilisk/generic/quat_methods.py,sha256=FFqS2Iy1OLH6oJf1elhH9RbWiE_KMXe5eO95ayrEhbc,241
 basilisk/generic/vec3.py,sha256=jlCbRJUejnmQerEaiyOBki0uKh37pUzV6whcqtEnmBg,4394
-basilisk/input/__init__.py,sha256=gZNSeo1hVcucAob7E3NmKyhxCUCnU7wFGzoQsexAy0M,7
+basilisk/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/input/mouse.py,sha256=H5evv3K7ibCSFy2N3A7KWvlfTXKJxvqCsAua0n5x0co,1900
 basilisk/mesh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-basilisk/mesh/cube.py,sha256=tlOnYpT7XUWrKs-T0gt-LkKLUez5JTr8I-_SVW9Pqr4,730
+basilisk/mesh/cube.py,sha256=yBNqmbRrj-_yWWHkI69SACSpgVLlcYP3KtYbVC6qLaU,437
 basilisk/mesh/mesh.py,sha256=pnSxWNK6_RqwYS-Nygj53v4O9uW5g-ZngJ2ynelZRbo,9297
 basilisk/mesh/mesh_from_data.py,sha256=KC-5u0x5jrY8PyXLyRUo-OPZYe4uLtnPHmWqETkmQ3E,1538
 basilisk/mesh/model.py,sha256=uVnYm_XYSoZslNWmOego59Ku-gqKxZHpta_dHi65X1s,11993
 basilisk/mesh/narrow_aabb.py,sha256=gPsZ6f-W-wiHJbQhthit23N_Nh6PWJTil-jWCl35xzg,3303
 basilisk/mesh/narrow_bvh.py,sha256=a2fqUn_EDweEy_6QyhmPdkGjgPRodYorMuI2rC5VE9g,3921
 basilisk/mesh/narrow_primative.py,sha256=vWpIeo8I9le-EAvcr9rFUQlbl9mi6eYroqCSMK-m9eY,953
-basilisk/mesh/built-in/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/nodes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-basilisk/nodes/node.py,sha256=d2BtVMsnuuAwbkley7VI2U3FWFFNDnkcB4ppvtakmoE,23285
+basilisk/nodes/node.py,sha256=oRSFCC2-NF5Fjox9B7TFPB56ebEN-KdGEcziWcrgxKw,23286
 basilisk/nodes/node_handler.py,sha256=_-wL6Cj7nqkkTpB5bPEmXquD7wkpvt8Bs73Sq-p5uy4,3214
 basilisk/physics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 basilisk/physics/physics_body.py,sha256=9Tau3y_vdI2-z-BE85zrEHty8yfeGfZWEZBSteWUv74,1316
@@ -59,7 +58,7 @@ basilisk/render/material_handler.py,sha256=pYgDBFFJw9TASVBQ33F4eO7SEh4vpVIHIDoVf
 basilisk/render/shader_handler.py,sha256=DBpW_Dx4GAaR_YHAslu4ZuXk35mL4iZaEIGMCpBQX7U,3557
 basilisk/render/sky.py,sha256=aYC8W_RehC084OcJK22HQnViu_wFPWqHv8lMzSwBJMw,4725
 basilisk/shaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-basilisk_engine-0.0.2.dist-info/METADATA,sha256=H0OcTPdqW78RzOnfaJaF7KxWnKwSXCH2HC9BX1xrsxk,1118
-basilisk_engine-0.0.2.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-basilisk_engine-0.0.2.dist-info/top_level.txt,sha256=enlSYSf7CUyAly1jmUCNNGInTbaFUjGk4SKwyckZQkw,9
-basilisk_engine-0.0.2.dist-info/RECORD,,
+basilisk_engine-0.0.4.dist-info/METADATA,sha256=Qf6kcCPol9MB8o3m8GSt6hxd9hzzFtNdFWhQLJYVi-E,1118
+basilisk_engine-0.0.4.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+basilisk_engine-0.0.4.dist-info/top_level.txt,sha256=enlSYSf7CUyAly1jmUCNNGInTbaFUjGk4SKwyckZQkw,9
+basilisk_engine-0.0.4.dist-info/RECORD,,