ncca-ngl 0.2.1__py3-none-any.whl → 0.2.2__py3-none-any.whl

ncca/ngl/prim_data.py

@@ -21,6 +21,14 @@ class Prims(enum.Enum):
     TEAPOT = "teapot"
     TETRAHEDRON = "tetrahedron"
     TROLL = "troll"
+    SPHERE = "sphere"
+    TORUS = "torus"
+    LINE_GRID = "line_grid"
+    TRIANGLE_PLANE = "triangle_plane"
+    CONE = "cone"
+    CAPSULE = "capsule"
+    CYLINDER = "cylinder"
+    DISK = "disk"
 
 
 def _circle_table(n: int) -> np.ndarray:

ncca/ngl/primitives.py

@@ -47,51 +47,62 @@ class Primitives:
     _primitives: Dict[str, _primitive] = {}
     _loaded: bool = False
 
+    @classmethod
+    def create(cls, type: str, name: str, *args: object, **kwargs: object) -> None:
+        """
+        Creates and stores a primitive object of the specified type from :-
+        Prims.SPHERE : (radius: float, precision: int).
+        Prims.TORUS : (radius: float, tube_radius: float, precision: int).
+        Prims.LINE_GRID : (width: float, depth: float, steps: int).
+        Prims.TRIANGLE_PLANE : ( width: float, depth: float, w_p: int, d_p: int, v_n: Vec3).
+        Prims.CYLINDER : (radius: float, height: float, slices: int, stacks: int).
+        Prims.CAPSULE : (radius: float, height: float, slices: int, stacks: int).
+        Prims.CONE : (radius: float, height: float, slices: int, stacks: int).
+
+        Args:
+            type (str): The primitive type, typically from the Prims enum (e.g., Prims.SPHERE).
+            name (str): The name to associate with the created primitive.
+            *args: Positional arguments to pass to the primitive creation function (e.g., radius, precision).
+            **kwargs: Keyword arguments to pass to the primitive creation function.
+
+        Raises:
+            ValueError: If the primitive type is not recognized.
+
+        Example:
+            Primitives.create(Prims.SPHERE, "sphere", 0.3, 32)
+            Primitives.create(Prims.SPHERE, "sphere", radius=0.3, precision=32)
+        """
+        prim_methods = {
+            Prims.SPHERE: PrimData.sphere,
+            Prims.TORUS: PrimData.torus,
+            Prims.LINE_GRID: PrimData.line_grid,
+            Prims.TRIANGLE_PLANE: PrimData.triangle_plane,
+            Prims.CYLINDER: PrimData.cylinder,
+            Prims.DISK: PrimData.disk,
+            Prims.CAPSULE: PrimData.capsule,
+            Prims.CONE: PrimData.cone,
+        }
+        try:
+            method = prim_methods[type]
+        except KeyError:
+            raise ValueError(f"Unknown primitive: {name}")
+
+        cls._primitives[name] = _primitive(method(*args, **kwargs))
+
     @classmethod
     def load_default_primitives(cls) -> None:
         """Loads the default primitives from the PrimData directory."""
         logger.info("Loading default primitives...")
         if not cls._loaded:
             for p in Prims:
-                prim_data = PrimData.primitive(p.value)
-                prim = _primitive(prim_data)
-                cls._primitives[p.value] = prim
+                try:
+                    prim_data = PrimData.primitive(p.value)
+                    prim = _primitive(prim_data)
+                    cls._primitives[p.value] = prim
+                except Exception:
+                    pass
             cls._loaded = True
 
-    @classmethod
-    def create_line_grid(cls, name: str, width: float, depth: float, steps: int) -> None:
-        """
-        Creates a line grid primitive.
-
-        Args:
-            name: The name of the primitive to create.
-            width: The width of the grid.
-            depth: The depth of the grid.
-            steps: The number of steps in the grid.
-        """
-        # Convert the list to a NumPy array
-        data_array = PrimData.line_grid(width, depth, steps)
-        prim = _primitive(data_array)
-        cls._primitives[name] = prim
-
-    @classmethod
-    def create_triangle_plane(cls, name: str, width: float, depth: float, w_p: int, d_p: int, v_n: Vec3) -> None:
-        """
-        Creates a triangle plane primitive.
-
-        Args:
-            name: The name of the primitive.
-            width: The width of the plane.
-            depth: The depth of the plane.
-            w_p: The number of width partitions.
-            d_p: The number of depth partitions.
-            v_n: The normal vector for the plane.
-        """
-
-        data_array = PrimData.triangle_plane(width, depth, w_p, d_p, v_n)
-        prim = _primitive(data_array)
-        cls._primitives[name] = prim
-
     @classmethod
     def draw(cls, name: Union[str, Prims]) -> None:
         """
@@ -108,112 +119,3 @@ class Primitives:
         except KeyError:
             logger.error(f"Failed to draw primitive {key}")
             return
-
-    @classmethod
-    def create_sphere(cls, name: str, radius: float, precision: int) -> None:
-        """
-        Creates a sphere primitive.
-
-        Args:
-            name: The name of the primitive.
-            radius: The radius of the sphere.
-            precision: The precision of the sphere (number of slices).
-        """
-
-        data_array = PrimData.sphere(radius, precision)
-        prim = _primitive(data_array)
-        cls._primitives[name] = prim
-
-    @classmethod
-    def create_cone(cls, name: str, base: float, height: float, slices: int, stacks: int) -> None:
-        """
-        Creates a cone primitive.
-
-        Args:
-            name: The name of the primitive.
-            base: The radius of the cone's base.
-            height: The height of the cone.
-            slices: The number of divisions around the cone.
-            stacks: The number of divisions along the cone's height.
-        """
-        data_array = PrimData.cone(base, height, slices, stacks)
-        prim = _primitive(data_array)
-        cls._primitives[name] = prim
-
-    @classmethod
-    def create_capsule(cls, name: str, radius: float, height: float, precision: int) -> None:
-        """
-        Creates a capsule primitive.
-        The capsule is aligned along the y-axis.
-        It is composed of a cylinder and two hemispherical caps.
-        based on code from here https://code.google.com/p/rgine/source/browse/trunk/RGine/opengl/src/RGLShapes.cpp
-        and adapted
-
-        Args:
-            name: The name of the primitive.
-            radius: The radius of the capsule.
-            height: The height of the capsule.
-            precision: The precision of the capsule.
-        """
-
-        data_array = PrimData.capsule(radius, height, precision)
-        prim = _primitive(data_array)
-        cls._primitives[name] = prim
-
-    @classmethod
-    def create_cylinder(cls, name: str, radius: float, height: float, slices: int, stacks: int) -> None:
-        """
-        Creates a cylinder primitive.
-        The cylinder is aligned along the y-axis.
-        This method generates the cylinder walls, but not the top and bottom caps.
-
-        Args:
-            name: The name of the primitive.
-            radius: The radius of the cylinder.
-            height: The height of the cylinder.
-            slices: The number of slices.
-            stacks: The number of stacks.
-        """
-
-        data_array = PrimData.cylinder(radius, height, slices, stacks)
-        prim = _primitive(data_array)
-        cls._primitives[name] = prim
-
-    @classmethod
-    def create_disk(cls, name: str, radius: float, slices: int) -> None:
-        """
-        Creates a disk primitive.
-
-        Args:
-            name: The name of the primitive.
-            radius: The radius of the disk.
-            slices: The number of slices to divide the disk into.
-        """
-
-        data_array = PrimData.disk(radius, slices)
-        prim = _primitive(data_array)
-        cls._primitives[name] = prim
-
-    @classmethod
-    def create_torus(
-        cls,
-        name: str,
-        minor_radius: float,
-        major_radius: float,
-        sides: int,
-        rings: int,
-    ) -> None:
-        """
-        Creates a torus primitive.
-
-        Args:
-            name: The name of the primitive.
-            minor_radius: The minor radius of the torus.
-            major_radius: The major radius of the torus.
-            sides: The number of sides for each ring.
-            rings: The number of rings for the torus.
-        """
-
-        data_array = PrimData.torus(minor_radius, major_radius, sides, rings)
-        prim = _primitive(data_array)
-        cls._primitives[name] = prim

{ncca_ngl-0.2.1.dist-info → ncca_ngl-0.2.2.dist-info}/METADATA

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

{ncca_ngl-0.2.1.dist-info → ncca_ngl-0.2.2.dist-info}/RECORD

@@ -30,8 +30,8 @@ ncca/ngl/mat4.py,sha256=eGvmLfw_wwKuuVh29wAKrvSZJB41jgmcYV5EufzyXbo,17273
 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=Y-Y748_3-VgimuUlbengPyJvZIJQAPBFmnlMbsLPCVU,18853
-ncca/ngl/primitives.py,sha256=YitjEsxDKo94mLeYclDOeG41ZVr9VM9TGhMCiKqGAgs,7651
+ncca/ngl/prim_data.py,sha256=sBynXeAfVtYXK7dkdLYELo0VIbN1lK1KZ8KMmCWzjBA,19047
+ncca/ngl/primitives.py,sha256=pThdSWLv7jJa9weBVOXhRgTfVVH54AWCbsDFCEI1YLg,4841
 ncca/ngl/pyside_event_handling_mixin.py,sha256=L8obXeTp-g2Va2eXyd1hnmSp-sY7p4GX6EcFYRnH1F4,10588
 ncca/ngl/quaternion.py,sha256=agmbW8i125FyLOV2Z9SpTY5yQwmnnm0rxQawwHqq1YI,3858
 ncca/ngl/random.py,sha256=wX1R2rMpb76TP4rk44NUp5XoVuMisH9d-eBG5kFBZsM,5579
@@ -60,6 +60,6 @@ ncca/ngl/vec3.py,sha256=ntgqB3sc_jzcGO5vlHKgDqloOoMkykVcWPxpYdWFy5Q,12449
 ncca/ngl/vec3_array.py,sha256=fLRC8k0TwcaU7CnR2GmJ0prud4dcvvUX0JTbQH_2W3Y,3535
 ncca/ngl/vec4.py,sha256=95b7yr82JtC3FqVDC8Hwn3wzPmVzSYTDCR1A6h_w9RM,6884
 ncca/ngl/vec4_array.py,sha256=PSJXfG0g2AT4oQCLHiVAP6EC5n7vMXRQy0N1rGvv1iw,3426
-ncca_ngl-0.2.1.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-ncca_ngl-0.2.1.dist-info/METADATA,sha256=DvVhD66ulcT-u9WQEmfkzZtGy2iaQstB_9dEM_xK_Xo,1596
-ncca_ngl-0.2.1.dist-info/RECORD,,
+ncca_ngl-0.2.2.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+ncca_ngl-0.2.2.dist-info/METADATA,sha256=7mdnns3adaYNydJ1fvfPeSO_alBW080SZQfnx6wGhGY,1596
+ncca_ngl-0.2.2.dist-info/RECORD,,