X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fcurve_helper.cpp;h=d5996202d4922156e1f79a460653d22164608689;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=6805f2615ad17e321383002d62cd8d7031950cf4;hpb=45c5a96c311e15d1bc66a141cabb09b9a8b59080;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/curve_helper.cpp b/synfig-core/trunk/src/synfig/curve_helper.cpp index 6805f26..d599620 100644 --- a/synfig-core/trunk/src/synfig/curve_helper.cpp +++ b/synfig-core/trunk/src/synfig/curve_helper.cpp @@ -530,7 +530,7 @@ static int recurse_intersect(const CIntersect::SCurve &b, const Point &p1, int d for(int i = 0; i < 3; ++i) { - //intersect line segmentsssss + //intersect line segments //solve for the y_value Vector v = b.b[i+1] - b.b[i]; @@ -569,7 +569,7 @@ int intersect(const bezier &b, const Point &p) //Curve curve intersection void CIntersect::recurse_intersect(const SCurve &left, const SCurve &right, int depth) { - //reject curves that do not overlap with bouding boxes + //reject curves that do not overlap with bounding boxes if(!intersect(left.aabb,right.aabb)) return; //accept curves (and perform super detailed check for intersections) @@ -590,7 +590,7 @@ void CIntersect::recurse_intersect(const SCurve &left, const SCurve &right, int { for(int j = 0; j < 3; ++j) { - //intersect line segmentsssss + //intersect line segments if(intersect_line_segments(left.b[i],left.b[i+1],t,right.b[j],right.b[j+1],s)) { //We got one Jimmy @@ -621,7 +621,7 @@ void CIntersect::recurse_intersect(const SCurve &left, const SCurve &right, int -bool CIntersect::operator()(const bezier &c1, const bezier &c2) +bool CIntersect::operator()(const etl::bezier &c1, const etl::bezier &c2) { times.clear();