Added noexcept flags to primitives package functions and methods.

Author: CnlPepper

raysect/primitive/box.pxd

@@ -43,8 +43,8 @@ cdef class Box(Primitive):
     cdef int _cached_face
     cdef int _cached_axis
 
-    cdef void _slab(self, int axis, double origin, double direction, double lower, double upper, double *near_intersection, double *far_intersection, int *near_face, int *far_face, int *near_axis, int *far_axis) nogil
+    cdef void _slab(self, int axis, double origin, double direction, double lower, double upper, double *near_intersection, double *far_intersection, int *near_face, int *far_face, int *near_axis, int *far_axis) noexcept nogil
 
     cdef Intersection _generate_intersection(self, Ray ray, Point3D origin, Vector3D direction, double ray_distance, int face, int axis)
 
-    cdef double _interior_offset(self, double hit_point, double lower, double upper) nogil
+    cdef double _interior_offset(self, double hit_point, double lower, double upper) noexcept nogil

raysect/primitive/box.pyx

@@ -231,7 +231,7 @@ cdef class Box(Primitive):
 
         return self._generate_intersection(self._cached_ray, self._cached_origin, self._cached_direction, self._next_t, self._cached_face, self._cached_axis)
 
-    cdef void _slab(self, int axis, double origin, double direction, double lower, double upper, double *near_intersection, double *far_intersection, int *near_face, int *far_face, int *near_axis, int *far_axis) nogil:
+    cdef void _slab(self, int axis, double origin, double direction, double lower, double upper, double *near_intersection, double *far_intersection, int *near_face, int *far_face, int *near_axis, int *far_axis) noexcept nogil:
 
         cdef:
             double reciprocal, tmin, tmax
@@ -327,7 +327,7 @@ cdef class Box(Primitive):
         return new_intersection(ray, ray_distance, self, hit_point, inside_point, outside_point,
                                 normal, exiting, self.to_local(), self.to_root())
 
-    cdef double _interior_offset(self, double hit_point, double lower, double upper) nogil:
+    cdef double _interior_offset(self, double hit_point, double lower, double upper) noexcept nogil:
         """
         Calculates an interior offset that ensures the inside_point is away from the primitive surface.
 

raysect/primitive/csg.pxd

@@ -44,17 +44,17 @@ cdef class CSGPrimitive(Primitive):
     cdef Intersection _cache_last_intersection
     cdef bint _cache_invalid
 
-    cdef bint terminate_early(self, Intersection intersection)
+    cdef bint terminate_early(self, Intersection intersection) noexcept
 
     cdef Intersection _identify_intersection(self, Ray ray, Intersection intersection_a, Intersection intersection_b, Intersection closest_intersection)
 
     cdef Intersection _closest_intersection(self, Intersection a, Intersection b)
 
-    cdef bint _valid_intersection(self, Intersection a, Intersection b, Intersection closest)
+    cdef bint _valid_intersection(self, Intersection a, Intersection b, Intersection closest) noexcept
 
     cdef Intersection _modify_intersection(self, Intersection closest, Intersection a, Intersection b)
 
-    cdef void rebuild(self)
+    cdef void rebuild(self) noexcept
 
 
 cdef class CSGRoot(Node):

raysect/primitive/csg.pyx

@@ -154,7 +154,7 @@ cdef class CSGPrimitive(Primitive):
         # identify first valid intersection
         return self._identify_intersection(ray, intersection_a, intersection_b, closest_intersection)
 
-    cdef bint terminate_early(self, Intersection intersection):
+    cdef bint terminate_early(self, Intersection intersection) noexcept:
         return False
 
     cpdef Intersection next_intersection(self):
@@ -233,14 +233,14 @@ cdef class CSGPrimitive(Primitive):
             else:
                 return b
 
-    cdef bint _valid_intersection(self, Intersection a, Intersection b, Intersection closest):
+    cdef bint _valid_intersection(self, Intersection a, Intersection b, Intersection closest) noexcept:
         raise NotImplementedError("Warning: CSG operator not implemented")
 
     cdef Intersection _modify_intersection(self, Intersection closest, Intersection a, Intersection b):
          # by default, do nothing
         return closest
 
-    cdef void rebuild(self):
+    cdef void rebuild(self) noexcept:
         """
         Triggers a rebuild of the CSG primitive's acceleration structures.
         """
@@ -323,7 +323,7 @@ cdef class Union(CSGPrimitive):
 
     """
 
-    cdef bint _valid_intersection(self, Intersection a, Intersection b, Intersection closest):
+    cdef bint _valid_intersection(self, Intersection a, Intersection b, Intersection closest) noexcept:
 
         cdef bint inside_a, inside_b
 
@@ -418,10 +418,10 @@ cdef class Intersect(CSGPrimitive):
 
     """
 
-    cdef bint terminate_early(self, Intersection intersection):
+    cdef bint terminate_early(self, Intersection intersection) noexcept:
         return intersection is None
 
-    cdef bint _valid_intersection(self, Intersection a, Intersection b, Intersection closest):
+    cdef bint _valid_intersection(self, Intersection a, Intersection b, Intersection closest) noexcept:
 
         cdef bint inside_a, inside_b
 
@@ -520,10 +520,10 @@ cdef class Subtract(CSGPrimitive):
 
     """
 
-    cdef bint terminate_early(self, Intersection intersection):
+    cdef bint terminate_early(self, Intersection intersection) noexcept:
         return intersection is None
 
-    cdef bint _valid_intersection(self, Intersection a, Intersection b, Intersection closest):
+    cdef bint _valid_intersection(self, Intersection a, Intersection b, Intersection closest) noexcept:
 
         cdef bint inside_a, inside_b
 

raysect/primitive/cylinder.pxd

@@ -47,6 +47,6 @@ cdef class Cylinder(Primitive):
 
     cdef Vector3D _interior_offset(self, Point3D hit_point, Normal3D normal, int type)
 
-    cdef bint _inside_cylinder(self, Point3D point)
+    cdef bint _inside_cylinder(self, Point3D point) noexcept
 
-    cdef bint _inside_slab(self, Point3D point)
+    cdef bint _inside_slab(self, Point3D point) noexcept

raysect/primitive/cylinder.pyx

@@ -359,12 +359,12 @@ cdef class Cylinder(Primitive):
         point = point.transform(self.to_local())
         return self._inside_slab(point) and self._inside_cylinder(point)
 
-    cdef bint _inside_cylinder(self, Point3D point):
+    cdef bint _inside_cylinder(self, Point3D point) noexcept:
 
         # is the point inside the cylinder radius
         return (point.x * point.x + point.y * point.y) <= (self._radius * self._radius)
 
-    cdef bint _inside_slab(self, Point3D point):
+    cdef bint _inside_slab(self, Point3D point) noexcept:
 
         # first check point is within the cylinder upper and lower bounds
         return 0.0 <= point.z <= self._height

raysect/primitive/lens/spherical.pyx

@@ -111,7 +111,7 @@ cdef class BiConvex(EncapsulatedPrimitive):
         # attach to local root (performed in EncapsulatedPrimitive init)
         super().__init__(lens, parent, transform, material, name)
 
-    cdef void _calc_geometry(self):
+    cdef void _calc_geometry(self) noexcept:
 
         cdef double radius, radius_sqr
 
@@ -126,7 +126,7 @@ cdef class BiConvex(EncapsulatedPrimitive):
         # edge thickness is the length of the barrel without the curved surfaces
         self.edge_thickness = self.center_thickness - (self.front_thickness + self.back_thickness)
 
-    cdef bint _is_short(self):
+    cdef bint _is_short(self) noexcept:
         """
         Do the facing spheres overlap sufficiently to build a lens using just their intersection?
         """
@@ -245,7 +245,7 @@ cdef class BiConcave(EncapsulatedPrimitive):
         # attach to local root (performed in EncapsulatedPrimitive init)
         super().__init__(lens, parent, transform, material, name)
 
-    cdef void _calc_geometry(self):
+    cdef void _calc_geometry(self) noexcept:
 
         cdef double radius, radius_sqr
 
@@ -327,7 +327,7 @@ cdef class PlanoConvex(EncapsulatedPrimitive):
         # attach to local root (performed in EncapsulatedPrimitive init)
         super().__init__(lens, parent, transform, material, name)
 
-    cdef void _calc_geometry(self):
+    cdef void _calc_geometry(self) noexcept:
 
         cdef double radius, radius_sqr
 
@@ -341,7 +341,7 @@ cdef class PlanoConvex(EncapsulatedPrimitive):
         # edge thickness is the length of the barrel without the curved surfaces
         self.edge_thickness = self.center_thickness - self.curve_thickness
 
-    cdef bint _is_short(self):
+    cdef bint _is_short(self) noexcept:
         """
         Does the front sphere have sufficient radius to build the lens with just an intersection?
         """
@@ -445,7 +445,7 @@ cdef class PlanoConcave(EncapsulatedPrimitive):
         # attach to local root (performed in EncapsulatedPrimitive init)
         super().__init__(lens, parent, transform, material, name)
 
-    cdef void _calc_geometry(self):
+    cdef void _calc_geometry(self) noexcept:
 
         cdef double radius, radius_sqr
 
@@ -531,7 +531,7 @@ cdef class Meniscus(EncapsulatedPrimitive):
         # attach to local root (performed in EncapsulatedPrimitive init)
         super().__init__(lens, parent, transform, material, name)
 
-    cdef void _calc_geometry(self):
+    cdef void _calc_geometry(self) noexcept:
 
         cdef double radius, radius_sqr
 
@@ -546,7 +546,7 @@ cdef class Meniscus(EncapsulatedPrimitive):
         # edge thickness is the length of the barrel without the front surface
         self.edge_thickness = self.center_thickness - self.front_thickness + self.back_thickness
 
-    cdef bint _is_short(self):
+    cdef bint _is_short(self) noexcept:
         """
         Does the front sphere have sufficient radius to build the lens with just an intersection?
         """

raysect/primitive/mesh/mesh.pxd

@@ -67,15 +67,15 @@ cdef class MeshData(KDTree3DCore):
     cdef object _flip_normals(self)
     cdef object _generate_face_normals(self)
     cdef BoundingBox3D _generate_bounding_box(self, int32_t i)
-    cdef void _calc_rayspace_transform(self, Ray ray)
-    cdef bint _hit_triangle(self, int32_t i, Ray ray, float[4] hit_data)
+    cdef void _calc_rayspace_transform(self, Ray ray) noexcept
+    cdef bint _hit_triangle(self, int32_t i, Ray ray, float[4] hit_data) noexcept
     cpdef Intersection calc_intersection(self, Ray ray)
     cdef Normal3D _intersection_normal(self)
-    cpdef bint contains(self, Point3D p)
+    cpdef bint contains(self, Point3D p) noexcept
     cpdef BoundingBox3D bounding_box(self, AffineMatrix3D to_world)
-    cdef uint8_t _read_uint8(self, object file)
-    cdef bint _read_bool(self, object file)
-    cdef double _read_float(self, object file)
+    cdef uint8_t _read_uint8(self, object file) noexcept
+    cdef bint _read_bool(self, object file) noexcept
+    cdef double _read_float(self, object file) noexcept
 
 
 cdef class Mesh(Primitive):

raysect/primitive/mesh/mesh.pyx

@@ -503,7 +503,7 @@ cdef class MeshData(KDTree3DCore):
 
         return bbox
 
-    cpdef bint trace(self, Ray ray):
+    cpdef bint trace(self, Ray ray) noexcept:
 
         # reset hit data
         self._u = -1.0
@@ -517,7 +517,7 @@ cdef class MeshData(KDTree3DCore):
 
     @cython.boundscheck(False)
     @cython.wraparound(False)
-    cdef bint _trace_leaf(self, int32_t id, Ray ray, double max_range):
+    cdef bint _trace_leaf(self, int32_t id, Ray ray, double max_range) noexcept:
 
         cdef:
             float hit_data[4]
@@ -563,7 +563,7 @@ cdef class MeshData(KDTree3DCore):
         return True
 
     @cython.cdivision(True)
-    cdef void _calc_rayspace_transform(self, Ray ray):
+    cdef void _calc_rayspace_transform(self, Ray ray) noexcept:
 
         # This code is a Python port of the code listed in appendix A of
         #  "Watertight Ray/Triangle Intersection", S.Woop, C.Benthin, I.Wald,
@@ -613,7 +613,7 @@ cdef class MeshData(KDTree3DCore):
     @cython.boundscheck(False)
     @cython.wraparound(False)
     @cython.initializedcheck(False)
-    cdef bint _hit_triangle(self, int32_t i, Ray ray, float[4] hit_data):
+    cdef bint _hit_triangle(self, int32_t i, Ray ray, float[4] hit_data) noexcept:
 
         # This code is a Python port of the code listed in appendix A of
         #  "Watertight Ray/Triangle Intersection", S.Woop, C.Benthin, I.Wald,
@@ -802,7 +802,7 @@ cdef class MeshData(KDTree3DCore):
     @cython.boundscheck(False)
     @cython.wraparound(False)
     @cython.initializedcheck(False)
-    cpdef bint contains(self, Point3D p):
+    cpdef bint contains(self, Point3D p) noexcept:
         """
         Tests if a point is contained by the mesh.
 
@@ -1035,13 +1035,13 @@ cdef class MeshData(KDTree3DCore):
         m.load(file)
         return m
 
-    cdef uint8_t _read_uint8(self, object file):
+    cdef uint8_t _read_uint8(self, object file) noexcept:
         return (<uint8_t *> PyBytes_AsString(file.read(sizeof(uint8_t))))[0]
 
-    cdef bint _read_bool(self, object file):
+    cdef bint _read_bool(self, object file) noexcept:
         return self._read_uint8(file) != 0
 
-    cdef double _read_float(self, object file):
+    cdef double _read_float(self, object file) noexcept:
         return (<float *> PyBytes_AsString(file.read(sizeof(float))))[0]