X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_shape.cpp;h=2116d2f4e1229113ba6a59d3be3b5872837df34c;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=3a9c52d9ae7c0303b074b179119cac5945d0e4e8;hpb=c3ad95144d148602f672e95ddda1f18fc35502f8;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/layer_shape.cpp b/synfig-core/trunk/src/synfig/layer_shape.cpp index 3a9c52d..2116d2f 100644 --- a/synfig-core/trunk/src/synfig/layer_shape.cpp +++ b/synfig-core/trunk/src/synfig/layer_shape.cpp @@ -1,11 +1,12 @@ /* === S Y N F I G ========================================================= */ /*! \file layer_shape.cpp -** \brief Template Header +** \brief Implementation of the "Shape" layer ** ** $Id$ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007, 2008 Chris Moore ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -59,8 +60,8 @@ using namespace etl; SYNFIG_LAYER_INIT(Layer_Shape); SYNFIG_LAYER_SET_NAME(Layer_Shape,"shape"); -SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Shape,_("Shape")); -SYNFIG_LAYER_SET_CATEGORY(Layer_Shape,_("Internal")); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Shape,N_("Shape")); +SYNFIG_LAYER_SET_CATEGORY(Layer_Shape,N_("Internal")); SYNFIG_LAYER_SET_VERSION(Layer_Shape,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Layer_Shape,"$Id$"); @@ -233,7 +234,7 @@ struct MonoSegment int intersect(Real x,Real y) const { - if((y < aabb.miny) || (y > aabb.maxy) || (x < aabb.minx)) return 0; + if((y < aabb.miny+EPSILON) || (y > aabb.maxy) || (x < aabb.minx)) return 0; if(x > aabb.maxx) return ydir; //int i = 0; @@ -244,11 +245,13 @@ struct MonoSegment //assumes that the rect culled away anything that would be beyond the edges if(ydir > 0) { - while(y > (*++p)[1]); + while(y > (*++p)[1]) + ; } else { - while(y < (*++p)[1]); + while(y < (*++p)[1]) + ; } //for the loop to break there must have been a slope (straight line would do nothing) @@ -334,7 +337,7 @@ struct CurveArray if( (y > ymax && y > p[1][1]) || (y < ymin && y < p[1][1]) ) return 0; //degenerate line max - if(ymin == ymax == p[1][1]) + if(ymin == ymax && ymax == p[1][1]) return 0; //degenerate accept - to the right and crossing the base line @@ -712,7 +715,7 @@ struct Layer_Shape::Intersector { Rect aabb; - //! true iff aabb hasn't been initialised yet + //! true iff aabb hasn't been initialized yet bool initaabb; int flags; @@ -944,7 +947,7 @@ struct PenMark void setcover(Real c, Real a) { cover = c; area = a; } void addcover(Real c, Real a) { cover += c; area += a; } - bool operator < (const PenMark &rhs) const + bool operator<(const PenMark &rhs) const { return y == rhs.y ? x < rhs.x : y < rhs.y; } @@ -1121,7 +1124,7 @@ Layer_Shape::Layer_Shape(const Real &a, const Color::BlendMethod m): Layer_Composite (a,m), edge_table (new Intersector), color (Color::black()), - offset (0,0), + origin (0,0), invert (false), antialias (true), blurtype (Blur::FASTGAUSSIAN), @@ -1148,14 +1151,18 @@ Layer_Shape::clear() bool Layer_Shape::set_param(const String & param, const ValueBase &value) { - IMPORT(color); - IMPORT(offset); + IMPORT_PLUS(color, { if (color.get_a() == 0) { if (converted_blend_) { + set_blend_method(Color::BLEND_ALPHA_OVER); + color.set_a(1); } else transparent_color_ = true; } }); + IMPORT(origin); IMPORT(invert); IMPORT(antialias); - IMPORT(feather); + IMPORT_PLUS(feather, if(feather<0)feather=0;); IMPORT(blurtype); IMPORT(winding_style); + IMPORT_AS(origin,"offset"); + return Layer_Composite::set_param(param,value); } @@ -1163,7 +1170,7 @@ ValueBase Layer_Shape::get_param(const String ¶m)const { EXPORT(color); - EXPORT(offset); + EXPORT(origin); EXPORT(invert); EXPORT(antialias); EXPORT(feather); @@ -1185,8 +1192,8 @@ Layer_Shape::get_param_vocab()const .set_local_name(_("Color")) .set_description(_("Layer_Shape Color")) ); - ret.push_back(ParamDesc("offset") - .set_local_name(_("Position")) + ret.push_back(ParamDesc("origin") + .set_local_name(_("Origin")) ); ret.push_back(ParamDesc("invert") .set_local_name(_("Invert")) @@ -1222,7 +1229,7 @@ Layer_Shape::get_param_vocab()const synfig::Layer::Handle Layer_Shape::hit_check(synfig::Context context, const synfig::Point &p)const { - Point pos(p-offset); + Point pos(p-origin); int intercepts = edge_table->intersect(pos[0],pos[1]); @@ -1269,7 +1276,7 @@ Layer_Shape::get_color(Context context, const Point &p)const if(feather) pp = Blur(feather,feather,blurtype)(p); - Point pos(pp-offset); + Point pos(pp-origin); int intercepts = edge_table->intersect(pos[0],pos[1]); @@ -1278,7 +1285,7 @@ Layer_Shape::get_color(Context context, const Point &p)const bool intersect = ((!!intercepts) ^ invert); if(!intersect) - return context.get_color(pp); + return Color::blend(Color::alpha(),context.get_color(pp),get_amount(),get_blend_method()); //Ok, we're inside... bummmm ba bum buM... if(get_blend_method() == Color::BLEND_STRAIGHT && get_amount() == 1) @@ -1290,7 +1297,7 @@ Layer_Shape::get_color(Context context, const Point &p)const //************** SCANLINE RENDERING ********************* void Layer_Shape::PolySpan::line_to(Real x, Real y) { - Real n[4]; + Real n[4] = {0,0,0,0}; bool afterx = false; const Real xin(x), yin(y); @@ -1327,7 +1334,7 @@ void Layer_Shape::PolySpan::line_to(Real x, Real y) //generate data for the ending clipped info if(y > window.maxy) { - //intial line to intersection (and degenerate) + //initial line to intersection (and degenerate) n[2] = x + (window.maxy - y) * dx / dy; //intersect coords @@ -1351,7 +1358,7 @@ void Layer_Shape::PolySpan::line_to(Real x, Real y) //generate data for the ending clipped info if(y < window.miny) { - //intial line to intersection (and degenerate) + //initial line to intersection (and degenerate) n[2] = x + (window.miny - y) * dx / dy; //intersect coords @@ -1401,7 +1408,7 @@ void Layer_Shape::PolySpan::line_to(Real x, Real y) //generate data for the ending clipped info if(x > window.maxx) { - //intial line to intersection (and degenerate) + //initial line to intersection (and degenerate) n[2] = y + (window.maxx - x) * dy / dx; n[0] = window.maxx; @@ -1430,7 +1437,7 @@ void Layer_Shape::PolySpan::line_to(Real x, Real y) //generate data for the ending clipped info if(x < window.minx) { - //intial line to intersection (and degenerate) + //initial line to intersection (and degenerate) n[2] = y + (window.minx - x) * dy / dx; n[0] = window.minx; @@ -1547,7 +1554,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); @@ -1620,7 +1627,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); @@ -1698,7 +1705,7 @@ void Layer_Shape::PolySpan::draw_scanline(int y, Real x1, Real fy1, Real x2, Rea //case all in same pixel if(ix1 == ix2) //impossible for degenerate case (covered by the previous cases) { - current.addcover(dy,(fx1 + fx2)*dy/2); //horizontal trapazoid area + current.addcover(dy,(fx1 + fx2)*dy/2); //horizontal trapezoid area return; } @@ -1712,7 +1719,7 @@ void Layer_Shape::PolySpan::draw_scanline(int y, Real x1, Real fy1, Real x2, Rea mult = (1 - fx1)*dydx; //next y intersection diff value (at 1) //first pixel - current.addcover(mult,(1 + fx1)*mult/2); // fx1,fy1,1,fy@1 - starting trapazoidal area + current.addcover(mult,(1 + fx1)*mult/2); // fx1,fy1,1,fy@1 - starting trapezoidal area //move to the next pixel fy1 += mult; @@ -1748,7 +1755,7 @@ void Layer_Shape::PolySpan::draw_scanline(int y, Real x1, Real fy1, Real x2, Rea mult = fx1*dydx; //next y intersection diff value //first pixel - current.addcover(mult,fx1*mult/2); // fx1,fy1,0,fy@0 - starting trapazoidal area + current.addcover(mult,fx1*mult/2); // fx1,fy1,0,fy@0 - starting trapezoidal area //move to next pixel fy1 += mult; @@ -1876,7 +1883,7 @@ void Layer_Shape::PolySpan::draw_line(Real x1, Real y1, Real x2, Real y2) mult = (1 - fy1) * dxdy; - //x interset scanline + //x intersect scanline x_from = x1 + mult; draw_scanline(iy1,x1,fy1,x_from,1); @@ -1906,7 +1913,7 @@ void Layer_Shape::PolySpan::draw_line(Real x1, Real y1, Real x2, Real y2) mult = fy1 * dxdy; - //x interset scanline + //x intersect scanline x_from = x1 + mult; draw_scanline(iy1,x1,fy1,x_from,0); @@ -2469,15 +2476,15 @@ Layer_Shape::accelerated_render(Context context,Surface *surface,int quality, co if(is_solid_color() && invert) { Rect aabb = edge_table->aabb; - Point tl = renddesc.get_tl() - offset; + Point tl = renddesc.get_tl() - origin; Real pw = renddesc.get_pw(), ph = renddesc.get_ph(); Rect nrect; - Real pixelfeatherx = abs(feather/pw), - pixelfeathery = abs(feather/ph); + Real pixelfeatherx = quality == 10 ? 0 : abs(feather/pw), + pixelfeathery = quality == 10 ? 0 : abs(feather/ph); nrect.set_point((aabb.minx - tl[0])/pw,(aabb.miny - tl[1])/ph); nrect.expand((aabb.maxx - tl[0])/pw,(aabb.maxy - tl[1])/ph); @@ -2518,7 +2525,7 @@ Layer_Shape::accelerated_render(Context context,Surface *surface,int quality, co if(cb && !cb->amount_complete(10000,10001+renddesc.get_h())) return false; - if(feather) + if(feather && quality != 10) { //we have to blur rather than be crappy @@ -2639,7 +2646,11 @@ Layer_Shape::render_shape(Surface *surface,bool useblend,int /*quality*/, PolySpan span; - //optimization for tesselating only inside tiles + // if the pixels are zero sized then we're too zoomed out to see anything + if (pw == 0 || ph == 0) + return true; + + //optimization for tessellating only inside tiles span.window.minx = 0; span.window.miny = 0; span.window.maxx = w; @@ -2714,9 +2725,9 @@ Layer_Shape::render_shape(Surface *surface,bool useblend,int /*quality*/, case Primitive::MOVE_TO: { x = data[curnum][0]; - x = (x - tl[0] + offset[0])*pw; + x = (x - tl[0] + origin[0])*pw; y = data[curnum][1]; - y = (y - tl[1] + offset[1])*ph; + y = (y - tl[1] + origin[1])*ph; if(curnum == 0) { @@ -2741,9 +2752,9 @@ Layer_Shape::render_shape(Surface *surface,bool useblend,int /*quality*/, case Primitive::LINE_TO: { x = data[curnum][0]; - x = (x - tl[0] + offset[0])*pw; + x = (x - tl[0] + origin[0])*pw; y = data[curnum][1]; - y = (y - tl[1] + offset[1])*ph; + y = (y - tl[1] + origin[1])*ph; tangent[0] = x - span.cur_x; tangent[1] = y - span.cur_y; @@ -2756,14 +2767,14 @@ Layer_Shape::render_shape(Surface *surface,bool useblend,int /*quality*/, case Primitive::CONIC_TO: { x = data[curnum+1][0]; - x = (x - tl[0] + offset[0])*pw; + x = (x - tl[0] + origin[0])*pw; y = data[curnum+1][1]; - y = (y - tl[1] + offset[1])*ph; + y = (y - tl[1] + origin[1])*ph; x1 = data[curnum][0]; - x1 = (x1 - tl[0] + offset[0])*pw; + x1 = (x1 - tl[0] + origin[0])*pw; y1 = data[curnum][1]; - y1 = (y1 - tl[1] + offset[1])*ph; + y1 = (y1 - tl[1] + origin[1])*ph; tangent[0] = 2*(x - x1); tangent[1] = 2*(y - y1); @@ -2776,9 +2787,9 @@ Layer_Shape::render_shape(Surface *surface,bool useblend,int /*quality*/, case Primitive::CONIC_TO_SMOOTH: { x = data[curnum][0]; - x = (x - tl[0] + offset[0])*pw; + x = (x - tl[0] + origin[0])*pw; y = data[curnum][1]; - y = (y - tl[1] + offset[1])*ph; + y = (y - tl[1] + origin[1])*ph; x1 = span.cur_x + tangent[0]/2; y1 = span.cur_y + tangent[1]/2; @@ -2795,19 +2806,19 @@ Layer_Shape::render_shape(Surface *surface,bool useblend,int /*quality*/, case Primitive::CUBIC_TO: { x = data[curnum+2][0]; - x = (x - tl[0] + offset[0])*pw; + x = (x - tl[0] + origin[0])*pw; y = data[curnum+2][1]; - y = (y - tl[1] + offset[1])*ph; + y = (y - tl[1] + origin[1])*ph; x2 = data[curnum+1][0]; - x2 = (x2 - tl[0] + offset[0])*pw; + x2 = (x2 - tl[0] + origin[0])*pw; y2 = data[curnum+1][1]; - y2 = (y2 - tl[1] + offset[1])*ph; + y2 = (y2 - tl[1] + origin[1])*ph; x1 = data[curnum][0]; - x1 = (x1 - tl[0] + offset[0])*pw; + x1 = (x1 - tl[0] + origin[0])*pw; y1 = data[curnum][1]; - y1 = (y1 - tl[1] + offset[1])*ph; + y1 = (y1 - tl[1] + origin[1])*ph; tangent[0] = 2*(x - x2); tangent[1] = 2*(y - y2); @@ -2821,14 +2832,14 @@ Layer_Shape::render_shape(Surface *surface,bool useblend,int /*quality*/, case Primitive::CUBIC_TO_SMOOTH: { x = data[curnum+1][0]; - x = (x - tl[0] + offset[0])*pw; + x = (x - tl[0] + origin[0])*pw; y = data[curnum+1][1]; - y = (y - tl[1] + offset[1])*ph; + y = (y - tl[1] + origin[1])*ph; x2 = data[curnum][0]; - x2 = (x2 - tl[0] + offset[0])*pw; + x2 = (x2 - tl[0] + origin[0])*pw; y2 = data[curnum][1]; - y2 = (y2 - tl[1] + offset[1])*ph; + y2 = (y2 - tl[1] + origin[1])*ph; x1 = span.cur_x + tangent[0]/3.0; y1 = span.cur_y + tangent[1]/3.0; @@ -2854,7 +2865,7 @@ Layer_Shape::render_shape(Surface *surface,bool useblend,int /*quality*/, } bool -Layer_Shape::render_shape(surface *surface,int /*quality*/, +Layer_Shape::render_shape(etl::surface *surface,int /*quality*/, const RendDesc &renddesc, ProgressCallback */*cb*/)const { // If our amount is set to zero, no need to render anything @@ -2875,7 +2886,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; @@ -2943,9 +2954,9 @@ Layer_Shape::render_shape(surface *surface,int /*quality*/, case Primitive::MOVE_TO: { x = data[curnum][0]; - x = (x - tl[0] + offset[0])*pw; + x = (x - tl[0] + origin[0])*pw; y = data[curnum][1]; - y = (y - tl[1] + offset[1])*ph; + y = (y - tl[1] + origin[1])*ph; if(curnum == 0) { @@ -2970,9 +2981,9 @@ Layer_Shape::render_shape(surface *surface,int /*quality*/, case Primitive::LINE_TO: { x = data[curnum][0]; - x = (x - tl[0] + offset[0])*pw; + x = (x - tl[0] + origin[0])*pw; y = data[curnum][1]; - y = (y - tl[1] + offset[1])*ph; + y = (y - tl[1] + origin[1])*ph; tangent[0] = x - span.cur_x; tangent[1] = y - span.cur_y; @@ -2985,14 +2996,14 @@ Layer_Shape::render_shape(surface *surface,int /*quality*/, case Primitive::CONIC_TO: { x = data[curnum+1][0]; - x = (x - tl[0] + offset[0])*pw; + x = (x - tl[0] + origin[0])*pw; y = data[curnum+1][1]; - y = (y - tl[1] + offset[1])*ph; + y = (y - tl[1] + origin[1])*ph; x1 = data[curnum][0]; - x1 = (x1 - tl[0] + offset[0])*pw; + x1 = (x1 - tl[0] + origin[0])*pw; y1 = data[curnum][1]; - y1 = (y1 - tl[1] + offset[1])*ph; + y1 = (y1 - tl[1] + origin[1])*ph; tangent[0] = 2*(x - x1); tangent[1] = 2*(y - y1); @@ -3005,9 +3016,9 @@ Layer_Shape::render_shape(surface *surface,int /*quality*/, case Primitive::CONIC_TO_SMOOTH: { x = data[curnum][0]; - x = (x - tl[0] + offset[0])*pw; + x = (x - tl[0] + origin[0])*pw; y = data[curnum][1]; - y = (y - tl[1] + offset[1])*ph; + y = (y - tl[1] + origin[1])*ph; x1 = span.cur_x + tangent[0]/2; y1 = span.cur_y + tangent[1]/2; @@ -3024,19 +3035,19 @@ Layer_Shape::render_shape(surface *surface,int /*quality*/, case Primitive::CUBIC_TO: { x = data[curnum+2][0]; - x = (x - tl[0] + offset[0])*pw; + x = (x - tl[0] + origin[0])*pw; y = data[curnum+2][1]; - y = (y - tl[1] + offset[1])*ph; + y = (y - tl[1] + origin[1])*ph; x2 = data[curnum+1][0]; - x2 = (x2 - tl[0] + offset[0])*pw; + x2 = (x2 - tl[0] + origin[0])*pw; y2 = data[curnum+1][1]; - y2 = (y2 - tl[1] + offset[1])*ph; + y2 = (y2 - tl[1] + origin[1])*ph; x1 = data[curnum][0]; - x1 = (x1 - tl[0] + offset[0])*pw; + x1 = (x1 - tl[0] + origin[0])*pw; y1 = data[curnum][1]; - y1 = (y1 - tl[1] + offset[1])*ph; + y1 = (y1 - tl[1] + origin[1])*ph; tangent[0] = 2*(x - x2); tangent[1] = 2*(y - y2); @@ -3050,14 +3061,14 @@ Layer_Shape::render_shape(surface *surface,int /*quality*/, case Primitive::CUBIC_TO_SMOOTH: { x = data[curnum+1][0]; - x = (x - tl[0] + offset[0])*pw; + x = (x - tl[0] + origin[0])*pw; y = data[curnum+1][1]; - y = (y - tl[1] + offset[1])*ph; + y = (y - tl[1] + origin[1])*ph; x2 = data[curnum][0]; - x2 = (x2 - tl[0] + offset[0])*pw; + x2 = (x2 - tl[0] + origin[0])*pw; y2 = data[curnum][1]; - y2 = (y2 - tl[1] + offset[1])*ph; + y2 = (y2 - tl[1] + origin[1])*ph; x1 = span.cur_x + tangent[0]/3.0; y1 = span.cur_y + tangent[1]/3.0; @@ -3089,7 +3100,7 @@ Layer_Shape::get_bounding_rect()const if (edge_table->initaabb) return Rect::zero(); - Rect bounds(edge_table->aabb+offset); + Rect bounds(edge_table->aabb+origin); bounds.expand(max((bounds.get_min() - bounds.get_max()).mag()*0.01, feather));