// there is no elegance here. only sleep deprivation and regret.

[ipdf/code.git] / src / bezier.cpp

diff --git a/src/bezier.cpp b/src/bezier.cpp
index 3fa16e3..99611dc 100644 (file)
--- a/src/bezier.cpp
+++ b/src/bezier.cpp
@@ -97,23 +97,6 @@ vector<Real> SolveCubic(const Real & a, const Real & b, const Real & c, const Re
        tu = max;
        CubicSolveSegment(roots, a, b, c, d, tl, tu,delta);
        return roots;
-       /*
-               Real maxi(100);
-               Real prevRes(d);
-               for(int i = 0; i <= 100; ++i)
-               {
-                       Real x(i);
-                       x /= maxi;
-                       Real y = a*(x*x*x) + b*(x*x) + c*x + d;
-                       if (((y < Real(0)) && (prevRes > Real(0))) || ((y > Real(0)) && (prevRes < Real(0))))
-                       {
-                               //Debug("Found root of %fx^3 + %fx^2 + %fx + %f at %f (%f)", a, b, c, d, x, y);
-                               roots.push_back(x);
-                       }
-                       prevRes = y;
-               }
-               return roots;
-       */
 }
 
 /**
@@ -166,8 +149,8 @@ pair<Real, Real> BezierTurningPoints(const Real & p0, const Real & p1, const Rea
        {
                return pair<Real,Real>(0, 1);
        }
-       Real a = (3*(p1-p2) + p3 - p0);
-       Real b = 2*(p2 - 2*p1 + p0);
+       Real a = ((p1-p2)*3 + p3 - p0);
+       Real b = (p2 - p1*2 + p0)*2;
        Real c = (p1-p0);
        if (a == 0)
        {
@@ -179,7 +162,7 @@ pair<Real, Real> BezierTurningPoints(const Real & p0, const Real & p1, const Rea
                return pair<Real, Real>(t, t);
        }
        //Debug("a, b, c are %f, %f, %f", Float(a), Float(b), Float(c));
-       if (b*b - 4*a*c < 0)
+       if (b*b - a*c*4 < 0)
        {
                //Debug("No real roots");
                return pair<Real, Real>(0,1);