ncca-ngl 0.2.6__py3-none-any.whl → 0.2.7__py3-none-any.whl

ncca/ngl/first_person_camera.py

@@ -1,7 +1,7 @@
 import math
 
 from .mat4 import Mat4
-from .util import perspective
+from .util import PerspMode, look_at, perspective
 from .vec3 import Vec3
 
 
@@ -32,7 +32,7 @@ class FirstPersonCamera:
         view (Mat4): The view matrix.
     """
 
-    def __init__(self, eye: Vec3, look: Vec3, up: Vec3, fov: float) -> None:
+    def __init__(self, eye: Vec3, look: Vec3, up: Vec3, fov: float, persp_mode: PerspMode = PerspMode.OpenGL) -> None:
         """
         Initialize the FirstPersonCamera.
 
@@ -58,12 +58,9 @@ class FirstPersonCamera:
         self.aspect: float = 1.2
         self.fov: float = fov
         self._update_camera_vectors()
-        self.projection: Mat4 = self.set_projection(
-            self.fov, self.aspect, self.near, self.far
-        )
-        from .util import look_at
+        self._projection: Mat4 = self.set_projection(self.fov, self.aspect, self.near, self.far, persp_mode)
 
-        self.view: Mat4 = look_at(self.eye, self.eye + self.front, self.up)
+        self._view: Mat4 = look_at(self.eye, self.eye + self.front, self.up)
 
     def __str__(self) -> str:
         return f"Camera {self.eye} {self.look} {self.world_up} {self.fov}"
@@ -71,9 +68,15 @@ class FirstPersonCamera:
     def __repr__(self) -> str:
         return f"Camera {self.eye} {self.look} {self.world_up} {self.fov}"
 
-    def process_mouse_movement(
-        self, diffx: float, diffy: float, _constrain_pitch: bool = True
-    ) -> None:
+    @property
+    def projection(self) -> Mat4:
+        return self._projection
+
+    @property
+    def view(self) -> Mat4:
+        return self._view
+
+    def process_mouse_movement(self, diffx: float, diffy: float, _constrain_pitch: bool = True) -> None:
         """
         Process mouse movement to update the camera's direction vectors.
 
@@ -115,10 +118,10 @@ class FirstPersonCamera:
         self.front.normalize()
         from .util import look_at
 
-        self.view = look_at(self.eye, self.eye + self.front, self.up)
+        self._view = look_at(self.eye, self.eye + self.front, self.up)
 
     def set_projection(
-        self, fov: float, aspect: float, near: float, far: float
+        self, fov: float, aspect: float, near: float, far: float, persp_mode: PerspMode = PerspMode.OpenGL
     ) -> Mat4:
         """
         Set the projection matrix for the camera.
@@ -133,7 +136,7 @@ class FirstPersonCamera:
             Mat4: The projection matrix.
         """
 
-        return perspective(fov, aspect, near, far)
+        return perspective(fov, aspect, near, far, persp_mode)
 
     def move(self, x: float, y: float, delta: float) -> None:
         """
@@ -156,7 +159,7 @@ class FirstPersonCamera:
         Returns:
             Mat4: The view-projection matrix.
         """
-        return self.projection @ self.view
+        return self._projection @ self._view
 
     def process_mouse_scroll(self, y_offset: float) -> None:
         """
@@ -171,4 +174,4 @@ class FirstPersonCamera:
             self.zoom = 1.0
         if self.zoom >= 45.0:
             self.zoom = 45.0
-        self.projection = perspective(self.zoom, self.aspect, self.near, self.far)
+        self._projection = perspective(self.zoom, self.aspect, self.near, self.far)

ncca/ngl/prim_data.py

@@ -605,7 +605,7 @@ class PrimData:
     def primitive(name: Union[str, enum]) -> np.ndarray:
         prim_folder = Path(__file__).parent / "PrimData"
         prims = np.load(prim_folder / "Primitives.npz")
-        if isinstance(name, PrimData):
+        if isinstance(name, Prims):
             name = name.value
 
         try:

{ncca_ngl-0.2.6.dist-info → ncca_ngl-0.2.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ncca-ngl
-Version: 0.2.6
+Version: 0.2.7
 Summary: A Python version of the NGL graphics library.
 Author: Jon Macey
 Author-email: Jon Macey <jmacey@bournemouth.ac.uk>

{ncca_ngl-0.2.6.dist-info → ncca_ngl-0.2.7.dist-info}/RECORD

@@ -22,7 +22,7 @@ ncca/ngl/base_mesh.py,sha256=2JmVT5_bvgLHra1VnwRld-mh-20IqqekgEu1dbGU1a4,5736
 ncca/ngl/base_mesh.pyi,sha256=kobLuNnCSZlRRobIgVopQaS7Bjg0tJ3m4M64WXt5I-M,173
 ncca/ngl/bbox.py,sha256=PylB6ju_bkdDUqQkzO1n2E-jsmxiviNkyBLY-sN59n8,6578
 ncca/ngl/bezier_curve.py,sha256=A0aidWJ7c8Bh2KGCgCJ7aH8c8MakP8xrFFEFvCjva38,2297
-ncca/ngl/first_person_camera.py,sha256=Rrt3ibMh72K8gPBu6B8neIbYk5lnNZcDnvBB8mq5pz0,5890
+ncca/ngl/first_person_camera.py,sha256=IUIdiy17bMnx7Z210bH9Hr5D0RKvq_3lQs7tPt_7WJ0,6104
 ncca/ngl/image.py,sha256=zpG8egzXWkUJKQxpRhXndpRxJDKOKHZkDjQuKSRXN2E,2692
 ncca/ngl/log.py,sha256=b7l-XNJIpP36VqcCGXBV_0XT5Nkd5eyuC7043lWegcw,1282
 ncca/ngl/mat2.py,sha256=kHyrxLWQ_zGBf5t6huKL6BDrjF5a1skU_9PpcyMFi0I,3710
@@ -31,7 +31,7 @@ ncca/ngl/mat4.py,sha256=i6ZKnMpwJdh8ULTjcnWKPo9UK39ulU4WeUdoet4yZAE,17574
 ncca/ngl/multi_buffer_vao.py,sha256=cuNE6gSrqkNcYvfIOYOZp4MVnpCvChUgnzsf7b60pWg,1752
 ncca/ngl/obj.py,sha256=AGldNouHrkrDs2UhATClGkgo4dzr6lzArR4YeCxQKmo,13667
 ncca/ngl/plane.py,sha256=96WuGzexYKhoeRVevGP2pZcustt9fzyyAjuwJHT25tk,1299
-ncca/ngl/prim_data.py,sha256=vOPMRfKJ05WdBbeaKPOmX5UzOpkY94G4gjFyr97ssDI,19117
+ncca/ngl/prim_data.py,sha256=Ji08CdnCJP4KPYEwh5P_NcltC76rPfNPx3MXgnkUW-E,19114
 ncca/ngl/primitives.py,sha256=pThdSWLv7jJa9weBVOXhRgTfVVH54AWCbsDFCEI1YLg,4841
 ncca/ngl/pyside_event_handling_mixin.py,sha256=L8obXeTp-g2Va2eXyd1hnmSp-sY7p4GX6EcFYRnH1F4,10588
 ncca/ngl/quaternion.py,sha256=hvMoaV7uxx60boPg4cTqLJDyTpFZrEpUhikNqmNVTrU,5188
@@ -61,6 +61,6 @@ ncca/ngl/vec3.py,sha256=N_-LvP0nB0CQrZWG7TJntUl6QDHzIVLP-J1w8wPZTM0,12275
 ncca/ngl/vec3_array.py,sha256=fLRC8k0TwcaU7CnR2GmJ0prud4dcvvUX0JTbQH_2W3Y,3535
 ncca/ngl/vec4.py,sha256=mLl23D-3yAxh7GsP44ilRto-PMqIDxJjcZpNl2MyqGQ,6751
 ncca/ngl/vec4_array.py,sha256=PSJXfG0g2AT4oQCLHiVAP6EC5n7vMXRQy0N1rGvv1iw,3426
-ncca_ngl-0.2.6.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-ncca_ngl-0.2.6.dist-info/METADATA,sha256=_9ILP8ufEF7HhSGITkNZ66Xdsc5dsVy3y3tsfvJeEvw,1596
-ncca_ngl-0.2.6.dist-info/RECORD,,
+ncca_ngl-0.2.7.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+ncca_ngl-0.2.7.dist-info/METADATA,sha256=M6DICVnyLStX-WNzY-6ThLULlB9tWQkMu7Q8EGF1SRw,1596
+ncca_ngl-0.2.7.dist-info/RECORD,,