Tidied up nmath namespaces

Also adds a wip for bvh Fixes #59
4rknova · May 11, 2022 · b247807 · b247807
1 parent 11e1e47
commit b247807
Show file tree

Hide file tree

Showing 88 changed files with 483 additions and 279 deletions.
diff --git a/lib/nmath/interpolation.h b/lib/nmath/interpolation.h
@@ -3,8 +3,8 @@
 
 #include "types.h"
 
-namespace NMath {
-	namespace Interpolation {
+namespace nmath {
+	namespace interpolation {
 
 #ifdef __cplusplus
 extern "C" {
@@ -52,8 +52,8 @@ static inline scalar_t bezier_cubic(const scalar_t a, const scalar_t b, const sc
 }   /* extern "C" */
 #endif
 
-	} /* namespace Interpolation */
-} /* namespace NMath */
+	} /* namespace interpolation */
+} /* namespace nmath */
 
 #include "interpolation.inl"
 

diff --git a/lib/nmath/interpolation.inl b/lib/nmath/interpolation.inl
@@ -35,8 +35,8 @@
 #include "precision.h"
 #include "defs.h"
 
-namespace NMath {
-	namespace Interpolation {
+namespace nmath {
+	namespace interpolation {
 
 #ifdef __cplusplus
 extern "C" {
@@ -272,7 +272,7 @@ static inline scalar_t bezier_cubic(const scalar_t a, const scalar_t b, const sc
 }   /* extern "C" */
 #endif
 
-	} /* namespace Interpolation */
-} /* namespace NMath */
+	} /* namespace interpolation */
+} /* namespace nmath */
 
 #endif /* NMATH_INTERPOLATION_INL_INCLUDED */
diff --git a/lib/nmath/matrix.cc b/lib/nmath/matrix.cc
@@ -3,7 +3,7 @@
 #include "matrix.h"
 #include "vector.h"
 
-namespace NMath {
+namespace nmath {
 
 const Matrix3x3f Matrix3x3f::identity = Matrix3x3f(1, 0, 0, 0, 1, 0, 0, 0, 1);
 
@@ -710,4 +710,4 @@ Matrix4x4f Matrix4x4f::inverse() const
     return adjMat * (1.0f / determinant());
 }
 
-} /* namespace NMath */
+} /* namespace nmath */
diff --git a/lib/nmath/matrix.h b/lib/nmath/matrix.h
@@ -4,7 +4,7 @@
 #include "precision.h"
 #include "types.h"
 
-namespace NMath {
+namespace nmath {
 
 class Matrix3x3f
 {
@@ -144,7 +144,7 @@ class Matrix4x4f
 		scalar_t data[4][4];
 };
 
-} /* namespace NMath */
+} /* namespace nmath */
 
 #include "matrix.inl"
 

diff --git a/lib/nmath/matrix.inl b/lib/nmath/matrix.inl
@@ -7,7 +7,7 @@
 
 #include <cstring>
 
-namespace NMath {
+namespace nmath {
 
 inline scalar_t *Matrix3x3f::operator [](int index)
 {
@@ -39,6 +39,6 @@ inline void Matrix4x4f::reset_identity()
     memcpy(data, identity.data, 16 * sizeof(scalar_t));
 }
 
-} /* namespace NMath */
+} /* namespace nmath */
 
 #endif /* NMATH_MATRIX_INL_INCLUDED */
diff --git a/lib/nmath/mutil.h b/lib/nmath/mutil.h
@@ -3,12 +3,20 @@
 
 #include "precision.h"
 
-namespace NMath {
+namespace nmath {
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
+static inline scalar_t max  (scalar_t x, scalar_t y);
+static inline scalar_t max3 (scalar_t x, scalar_t y, scalar_t z);
+static inline scalar_t max4 (scalar_t x, scalar_t y, scalar_t z, scalar_t w);
+static inline scalar_t min  (scalar_t x, scalar_t y);
+static inline scalar_t min3 (scalar_t x, scalar_t y, scalar_t z);
+static inline scalar_t min4 (scalar_t x, scalar_t y, scalar_t z, scalar_t w);
+static inline scalar_t sign (scalar_t x);
+
 /* Angle conversion */
 static inline scalar_t degree_to_radian(const scalar_t r);
 static inline scalar_t radian_to_degree(const scalar_t d);
@@ -26,7 +34,7 @@ static inline int is_power_of_2(const int v);
 }   /* extern "C" */
 #endif /* __cplusplus */
 
-} /* namespace NMath */
+} /* namespace nmath */
 
 #include "mutil.inl"
 

diff --git a/lib/nmath/mutil.inl b/lib/nmath/mutil.inl
@@ -32,12 +32,20 @@
     #error "mutil.h must be included before mutil.inl"
 #endif /* NMATH_MUTIL_H_INCLUDED */
 
-namespace NMath {
+namespace nmath {
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
+static inline scalar_t max  (scalar_t x, scalar_t y)                         { return (x > y ? x : y);                   }
+static inline scalar_t max3 (scalar_t x, scalar_t y, scalar_t z)             { return (max(max(x,y),z));                 }
+static inline scalar_t max4 (scalar_t x, scalar_t y, scalar_t z, scalar_t w) { return (max(max(max(x,y),z),w));          }
+static inline scalar_t min  (scalar_t x, scalar_t y)                         { return (y > x ? x : y);                   }
+static inline scalar_t min3 (scalar_t x, scalar_t y, scalar_t z)             { return (min(min(x,y),z));                 }
+static inline scalar_t min4 (scalar_t x, scalar_t y, scalar_t z, scalar_t w) { return (min(min(min(x,y),z),w));          }
+static inline scalar_t sign (scalar_t x)                                     { return (x < 0 ? -1 : ( x > 0 ? 1 : 0));   }
+
 /* Inverse square root */
 /*
 	Notes:
@@ -116,6 +124,6 @@ static inline int is_power_of_2(const int v)
 }   /* extern "C" */
 #endif /* __cplusplus */
 
-} /* namespace NMath */
+} /* namespace nmath */
 
 #endif /* NMATH_MUTIL_INL_INCLUDED */
diff --git a/lib/nmath/precision.h b/lib/nmath/precision.h
@@ -36,7 +36,7 @@
 	#include <math.h>
 #endif	/* __cplusplus */
 
-namespace NMath {
+namespace nmath {
 
 #ifdef __cplusplus
 	extern "C" {
@@ -115,23 +115,15 @@ const scalar_t RADIAN = 0.017453292519943;
 	}   /* extern "C" */
 #endif
 
-inline scalar_t max  (scalar_t x, scalar_t y)                         { return (x > y ? x : y);                   }
-inline scalar_t max3 (scalar_t x, scalar_t y, scalar_t z)             { return (max(max(x,y),z));                 }
-inline scalar_t max4 (scalar_t x, scalar_t y, scalar_t z, scalar_t w) { return (max(max(max(x,y),z),w));          }
-inline scalar_t min  (scalar_t x, scalar_t y)                         { return (y > x ? x : y);                   }
-inline scalar_t min3 (scalar_t x, scalar_t y, scalar_t z)             { return (min(min(x,y),z));                 }
-inline scalar_t min4 (scalar_t x, scalar_t y, scalar_t z, scalar_t w) { return (min(min(min(x,y),z),w));          }
-inline scalar_t sign (scalar_t x)                                     { return (x < 0 ? -1 : ( x > 0 ? 1 : 0));   }
-
-} /* namespace NMath */
+} /* namespace nmath */
 
 // Check for standard definitions
 #ifndef M_PI
-    #define M_PI NMath::PI
+    #define M_PI nmath::PI
 #endif /* M_PI */
 
 #ifndef M_E
-    #define M_E	NMath::EULER_E
+    #define M_E	nmath::EULER_E
 #endif /* M_E */
 
 #endif /* NMATH_PRECISION_H_INCLUDED */
diff --git a/lib/nmath/prime.h b/lib/nmath/prime.h
@@ -3,7 +3,7 @@
 
 #include "defs.h"
 
-namespace NMath {
+namespace nmath {
 
 #ifdef __cplusplus
 extern "C" {
@@ -17,7 +17,7 @@ static inline unsigned long getPrevPrime(unsigned long i);
 }   /* extern "C" */
 #endif
 
-} /* namespace NMath */
+} /* namespace nmath */
 
 #include "prime.inl"
 

diff --git a/lib/nmath/prime.inl b/lib/nmath/prime.inl
@@ -35,7 +35,7 @@
 #include <math.h>
 #include <limits.h>
 
-namespace NMath {
+namespace nmath {
 
 #ifdef __cplusplus
 extern "C" {
@@ -83,6 +83,6 @@ static inline unsigned long getPrevPrime(unsigned long i)
 }   /* extern "C" */
 #endif
 
-} /* namespace NMath */
+} /* namespace nmath */
 
 #endif /* NMATH_PRIME_INL_INCLUDED */
diff --git a/lib/nmath/prng.h b/lib/nmath/prng.h
@@ -4,7 +4,7 @@
 #include "vector.h"
 #include "types.h"
 
-namespace NMath {
+namespace nmath {
 
 #ifdef __cplusplus
 extern "C" {
@@ -20,7 +20,7 @@ static inline scalar_t prng_multiplyWithCarry(const scalar_t a, const scalar_t b
 }   /* extern "C" */
 #endif
 
-} /* namespace NMath */
+} /* namespace nmath */
 
 #include "prng.inl"
 

diff --git a/lib/nmath/prng.inl b/lib/nmath/prng.inl
@@ -45,7 +45,7 @@
 #include "precision.h"
 #include "types.h"
 
-namespace NMath {
+namespace nmath {
 
 #ifdef __cplusplus
 extern "C" {
@@ -211,6 +211,6 @@ static inline scalar_t prng_multiplyWithCarry(const scalar_t a, const scalar_t b
 }   /* extern "C" */
 #endif
 
-} /* namespace NMath */
+} /* namespace nmath */
 
 #endif /* NMATH_PRNG_INL_INCLUDED */
diff --git a/lib/nmath/quadratic.cc b/lib/nmath/quadratic.cc
@@ -1,7 +1,7 @@
 #include <algorithm>
 #include "quadratic.h"
 
-namespace NMath {
+namespace nmath {
 
 bool solve_quadratic(const scalar_t a, const scalar_t b, const scalar_t c, scalar_t &x0, scalar_t &x1)
 {
@@ -23,4 +23,4 @@ bool solve_quadratic(const scalar_t a, const scalar_t b, const scalar_t c, scala
     return true;
 }
 
-} /* namespace NMath */
+} /* namespace nmath */
diff --git a/lib/nmath/quadratic.h b/lib/nmath/quadratic.h
@@ -4,10 +4,10 @@
 #include <algorithm>
 #include "precision.h"
 
-namespace NMath {
+namespace nmath {
 
 bool solve_quadratic(const scalar_t a, const scalar_t b, const scalar_t c, scalar_t &x0, scalar_t &x1);
 
-} /* namespace NMath */
+} /* namespace nmath */
 
 #endif /* NMATH_QUADRATIC_H_INCLUDED */
diff --git a/lib/nmath/sample.h b/lib/nmath/sample.h
@@ -31,16 +31,16 @@
 #include "precision.h"
 #include "vector.h"
 
-namespace NMath {
-	namespace Sample {
+namespace nmath {
+	namespace sample {
 
 inline Vector3f sphere();
 inline Vector3f hemisphere(const Vector3f &normal, const Vector3f &direction);
 inline Vector3f lobe(const Vector3f &normal, const Vector3f &direction, const scalar_t exponent);
 inline Vector3f diffuse(const Vector3f &normal);
 
-	} /* namespace Sample */
-} /* namespace NMath */
+	} /* namespace sample */
+} /* namespace nmath */
 
 #include "sample.inl"
 

diff --git a/lib/nmath/sample.inl b/lib/nmath/sample.inl
@@ -9,8 +9,8 @@
 #include "prng.h"
 #include "matrix.h"
 
-namespace NMath {
-	namespace Sample {
+namespace nmath {
+	namespace sample {
 
 inline Vector3f sphere()
 {
@@ -38,7 +38,7 @@ inline Vector3f hemisphere(const Vector3f &normal, const Vector3f &direction)
 	d.y = nmath_cos(phi);
 	d.z = nmath_sin(theta) * nmath_sin(phi);
 
-	NMath::Matrix3x3f mat;
+	nmath::Matrix3x3f mat;
 
 	Vector3f norm = normal.normalized();
 
@@ -106,7 +106,7 @@ inline Vector3f diffuse(const Vector3f &normal)
     return p;
 }
 
-	} /* namespace Sample */
-} /* namespace NMath */
+	} /* namespace sample */
+} /* namespace nmath */
 
 #endif /* NMATH_SAMPLE_INL_INCLUDED */
diff --git a/lib/nmath/types.h b/lib/nmath/types.h
@@ -3,7 +3,7 @@
 
 #include "precision.h"
 
-namespace NMath {
+namespace nmath {
 
 /* C++ equivalents - Forward declarations */
 class Vector2f;
@@ -13,6 +13,6 @@ class Vector4f;
 class Matrix3x3f;
 class Matrix4x4f;
 
-} /* namespace NMath */
+} /* namespace nmath */
 
 #endif /* NMATH_TYPES_H_INCLUDED */
diff --git a/lib/nmath/vector.cc b/lib/nmath/vector.cc
@@ -2,7 +2,7 @@
 
 #ifdef __cplusplus
 
-namespace NMath {
+namespace nmath {
 
 Vector2f::Vector2f(scalar_t aX, scalar_t aY): x(aX), y(aY){}
 Vector2f::Vector2f(const Vector2f& v): x(v.x), y(v.y){}
@@ -19,4 +19,4 @@ Vector4f::Vector4f(const Vector3f& v): x(v.x), y(v.y), z(v.z), w(0.0f){}
 
 #endif  /* __cplusplus */
 
-} /* namespace NMath */
+} /* namespace nmath */
diff --git a/lib/nmath/vector.h b/lib/nmath/vector.h
@@ -6,7 +6,7 @@
 #include <ostream>
 #include <cstdio>
 
-namespace NMath {
+namespace nmath {
 
 class Vector2f
 {
@@ -223,7 +223,7 @@ class Vector4f
 
 inline scalar_t dot(const Vector4f &v1, const Vector4f &v2);
 
-} /* namespace NMath */
+} /* namespace nmath */
 
 #include "vector.inl"