From 50cd69a8ee306a98e5c7a435796f77400f2d5fd1 Mon Sep 17 00:00:00 2001 From: dooglus Date: Tue, 30 Oct 2007 14:14:50 +0000 Subject: [PATCH] Typo: 'tesselate' -> 'tessellate'. git-svn-id: http://svn.voria.com/code@1029 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/src/synfig/layer_shape.cpp | 8 ++++---- synfig-studio/trunk/src/synfigapp/blineconvert.cpp | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/synfig-core/trunk/src/synfig/layer_shape.cpp b/synfig-core/trunk/src/synfig/layer_shape.cpp index d9e3f96..3f91a64 100644 --- a/synfig-core/trunk/src/synfig/layer_shape.cpp +++ b/synfig-core/trunk/src/synfig/layer_shape.cpp @@ -1548,7 +1548,7 @@ void Layer_Shape::PolySpan::conic_to(Real x1, Real y1, Real x, Real y) { if(num >= MAX_SUBDIVISION_SIZE) { - warning("Curve subdivision somehow ran out of space while tesselating!"); + warning("Curve subdivision somehow ran out of space while tessellating!"); //do something... assert(0); @@ -1621,7 +1621,7 @@ void Layer_Shape::PolySpan::cubic_to(Real x1, Real y1, Real x2, Real y2, Real x, { if(num >= MAX_SUBDIVISION_SIZE) { - warning("Curve subdivision somehow ran out of space while tesselating!"); + warning("Curve subdivision somehow ran out of space while tessellating!"); //do something... assert(0); @@ -2640,7 +2640,7 @@ Layer_Shape::render_shape(Surface *surface,bool useblend,int /*quality*/, PolySpan span; - //optimization for tesselating only inside tiles + //optimization for tessellating only inside tiles span.window.minx = 0; span.window.miny = 0; span.window.maxx = w; @@ -2876,7 +2876,7 @@ Layer_Shape::render_shape(surface *surface,int /*quality*/, PolySpan span; - //optimization for tesselating only inside tiles + //optimization for tessellating only inside tiles span.window.minx = 0; span.window.miny = 0; span.window.maxx = w; diff --git a/synfig-studio/trunk/src/synfigapp/blineconvert.cpp b/synfig-studio/trunk/src/synfigapp/blineconvert.cpp index 19e7e8e..e8849e0 100644 --- a/synfig-studio/trunk/src/synfigapp/blineconvert.cpp +++ b/synfig-studio/trunk/src/synfigapp/blineconvert.cpp @@ -326,7 +326,7 @@ Real CurveError(const synfig::Point *pts, unsigned int n, std::vector &inds, const std::vector &f, const std::vector &df, std::vector &work) +int tessellate_curves(const std::vector &inds, const std::vector &f, const std::vector &df, std::vector &work) { if(inds.size() < 2) return 0; @@ -341,7 +341,7 @@ int tesselate_curves(const std::vector &inds, const std::vector j2 = j++; for(; j != end; j2 = j++) { - //if this curve has invalid error (in j) then retesselate its work points (requires reparametrization, etc.) + //if this curve has invalid error (in j) then retessellate its work points (requires reparametrization, etc.) if(j->error < 0) { //get the stepsize etc. for the number of points in here @@ -629,7 +629,7 @@ synfigapp::BLineConverter::operator () (std::list &out, cons //preproceval += timer(); //numpre++; - work.resize(size*2-1); //guarantee that all points will be tesselated correctly (one point inbetween every 2 adjacent points) + work.resize(size*2-1); //guarantee that all points will be tessellated correctly (one point inbetween every 2 adjacent points) //if size of work is size*2-1, the step size should be 1/(size*2 - 2) //Real step = 1/(Real)(size*2 - 1); @@ -645,18 +645,18 @@ synfigapp::BLineConverter::operator () (std::list &out, cons //while there are still enough points between us, and the error is too high subdivide (and invalidate neighbors that share tangents) while(!done) { - //tesselate all curves with invalid error values + //tessellate all curves with invalid error values work[0] = f[i0]; //timer.reset(); - /*numtess += */tesselate_curves(curind,f,df,work); + /*numtess += */tessellate_curves(curind,f,df,work); //tesseval += timer(); //now get all error values //timer.reset(); for(i = 1; i < (int)curind.size(); ++i) { - if(curind[i].error < 0) //must have been retesselated, so now recalculate error value + if(curind[i].error < 0) //must have been retessellated, so now recalculate error value { //evaluate error from points (starting at current index) int size = curind[i].curind - curind[i-1].curind + 1; @@ -667,7 +667,7 @@ synfigapp::BLineConverter::operator () (std::list &out, cons { synfig::info("Holy crap %d-%d error %f",curind[i-1].curind,curind[i].curind,curind[i].error); curind[i].error = -1; - numtess += tesselate_curves(curind,f,df,work); + numtess += tessellate_curves(curind,f,df,work); curind[i].error = CurveError(&f[curind[i-1].curind], size, work,0,work.size());//(curind[i-1].curind - i0)*2,(curind[i].curind - i0)*2+1); }*/ @@ -807,7 +807,7 @@ synfigapp::BLineConverter::operator () (std::list &out, cons "\tDistance Calculation: %f\n" " Algorithm: (numtimes,totaltime)\n" "\tPreprocess step: (%d,%f)\n" - "\tTesselation step: (%d,%f)\n" + "\tTessellation step: (%d,%f)\n" "\tError step: (%d,%f)\n" "\tSplit step: (%d,%f)\n" " Num Input: %d, Num Output: %d\n" -- 2.7.4