Make curve functions universal.

Add operators for Vector.
gregersn · Nov 14, 2024 · 69ecaf4 · 69ecaf4
1 parent 14f867b
commit 69ecaf4
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 17 deletions.
diff --git a/include/pyro/shape.h b/include/pyro/shape.h
@@ -16,8 +16,12 @@ namespace Pyro
     const int QUADS{6};
     const int QUAD_STRIP{7};
 
-    float bezierpoint(float a, float b, float c, float d, float t);
-    float curvepoint(float p0, float p1, float p2, float p3, float t);
+    template <typename T>
+    T bezierpoint(T a, T b, T c, T d, float t);
+
+    template <typename T>
+    T curvepoint(T p0, T p1, T p2, T p3, float t);
+
     enum class PointType
     {
         VERTEX,

diff --git a/include/pyro/vector.h b/include/pyro/vector.h
@@ -44,6 +44,11 @@ namespace Pyro
             return Vector(x - other.x, y - other.y, z - other.z);
         }
 
+        Vector operator-() const
+        {
+            return Vector(-x, -y, -z);
+        }
+
         void operator-=(Vector const &other)
         {
             x -= other.x;
@@ -139,6 +144,9 @@ namespace Pyro
             return oss.str();
         }
     };
+
+    Vector operator*(float const f, Vector const v);
+
 }
 
 #endif
diff --git a/src/shape.cpp b/src/shape.cpp
@@ -8,19 +8,22 @@ namespace Pyro
 {
     unsigned int curve_resolution = 32;
     void curveresolution(unsigned int res) { curve_resolution = res; }
-    float bezierpoint(float a, float b, float c, float d, float t)
+
+    template <typename T>
+    T bezierpoint(T a, T b, T c, T d, float t)
     {
-        float ab = lerp(a, b, t);
-        float bc = lerp(b, c, t);
-        float cd = lerp(c, d, t);
+        T ab = lerp(a, b, t);
+        T bc = lerp(b, c, t);
+        T cd = lerp(c, d, t);
 
-        float ac = lerp(ab, bc, t);
-        float bd = lerp(bc, cd, t);
+        T ac = lerp(ab, bc, t);
+        T bd = lerp(bc, cd, t);
 
         return lerp(ac, bd, t);
     }
 
-    float curvepoint(float p0, float p1, float p2, float p3, float t)
+    template <typename T>
+    T curvepoint(T p0, T p1, T p2, T p3, float t)
     {
         return 0.5 * ((2 * p1) +
                       (-p0 + p2) * t +
@@ -103,10 +106,7 @@ namespace Pyro
 
                     for (unsigned int i = 0; i < curve_resolution + 1; i++)
                     {
-                        contour.push_back(
-                            Pyro::Vector(
-                                curvepoint(p0.v.x, point.v.x, p2.v.x, p3.v.x, i * delta),
-                                curvepoint(p0.v.y, point.v.y, p2.v.y, p3.v.y, i * delta)));
+                        contour.push_back(curvepoint(p0.v, point.v, p2.v, p3.v, i * delta));
                     }
                 }
                 else if (point.type == PointType::BEZIERVERTEX)
@@ -129,10 +129,7 @@ namespace Pyro
 
                     for (unsigned int i = 1; i < curve_resolution + 1; i++)
                     {
-                        contour.push_back(
-                            Pyro::Vector(
-                                bezierpoint(p0.v.x, point.v.x, p2.v.x, p3.v.x, i * delta),
-                                bezierpoint(p0.v.y, point.v.y, p2.v.y, p3.v.y, i * delta)));
+                        contour.push_back(bezierpoint(p0.v, point.v, p2.v, p3.v, i * delta));
                     }
                     curveiterator += 2;
                 }

diff --git a/src/vector.cpp b/src/vector.cpp
@@ -112,5 +112,9 @@ namespace Pyro
     {
         return Vector(x / v, y / v, z / v);
     }
+    Vector operator*(float const f, Vector const v)
+    {
+        return Vector(v.x * f, v.y * f, v.z * f);
+    }
 
 }