projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't show "file not found" error messages whenever find_canvas() and surefind_canvas...
[synfig.git]
/
synfig-core
/
tags
/
stable
/
src
/
synfig
/
curve_helper.cpp
diff --git
a/synfig-core/tags/stable/src/synfig/curve_helper.cpp
b/synfig-core/tags/stable/src/synfig/curve_helper.cpp
index
b066d9d
..
d599620
100644
(file)
--- a/
synfig-core/tags/stable/src/synfig/curve_helper.cpp
+++ b/
synfig-core/tags/stable/src/synfig/curve_helper.cpp
@@
-352,7
+352,7
@@
int intersect(const BezHull &bh, const Point &p, const Vector &v)
{
float mint = 0, maxt = 1e20;
{
float mint = 0, maxt = 1e20;
- //polygon cliping
+ //polygon clip
p
ing
Vector n;
Vector::value_type nv;
Vector n;
Vector::value_type nv;
@@
-530,7
+530,7
@@
static int recurse_intersect(const CIntersect::SCurve &b, const Point &p1, int d
for(int i = 0; i < 3; ++i)
{
for(int i = 0; i < 3; ++i)
{
- //intersect line segments
ssss
+ //intersect line segments
//solve for the y_value
Vector v = b.b[i+1] - b.b[i];
//solve for the y_value
Vector v = b.b[i+1] - b.b[i];
@@
-569,7
+569,7
@@
int intersect(const bezier<Point> &b, const Point &p)
//Curve curve intersection
void CIntersect::recurse_intersect(const SCurve &left, const SCurve &right, int depth)
{
//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 bou
n
ding boxes
if(!intersect(left.aabb,right.aabb)) return;
//accept curves (and perform super detailed check for intersections)
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)
{
{
for(int j = 0; j < 3; ++j)
{
- //intersect line segments
ssss
+ //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
if(intersect_line_segments(left.b[i],left.b[i+1],t,right.b[j],right.b[j+1],s))
{
//We got one Jimmy
@@
-612,7
+612,7
@@
void CIntersect::recurse_intersect(const SCurve &left, const SCurve &right, int
left.Split(l1,r1); //subdivide left
right.Split(l2,r2); //subdivide right
left.Split(l1,r1); //subdivide left
right.Split(l2,r2); //subdivide right
- //Test each can
tidate against each
other
+ //Test each can
didate against each
other
recurse_intersect(l1,l2);
recurse_intersect(l1,r2);
recurse_intersect(r1,l2);
recurse_intersect(l1,l2);
recurse_intersect(l1,r2);
recurse_intersect(r1,l2);
@@
-621,11
+621,11
@@
void CIntersect::recurse_intersect(const SCurve &left, const SCurve &right, int
-bool CIntersect::operator()(const
bezier<Point> &c1, const
bezier<Point> &c2)
+bool CIntersect::operator()(const
etl::bezier<Point> &c1, const etl::
bezier<Point> &c2)
{
times.clear();
{
times.clear();
- //need to subdivide and check recursive bounding regions against eachother
+ //need to subdivide and check recursive bounding regions against each
other
//so track a list of dirty curves and compare compare compare
//so track a list of dirty curves and compare compare compare