**
** \legal
** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+** Copyright (c) 2007 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
SYNFIG_LAYER_INIT(Rectangle);
SYNFIG_LAYER_SET_NAME(Rectangle,"rectangle");
-SYNFIG_LAYER_SET_LOCAL_NAME(Rectangle,_("Rectangle"));
-SYNFIG_LAYER_SET_CATEGORY(Rectangle,_("Geometry"));
+SYNFIG_LAYER_SET_LOCAL_NAME(Rectangle,N_("Rectangle"));
+SYNFIG_LAYER_SET_CATEGORY(Rectangle,N_("Geometry"));
SYNFIG_LAYER_SET_VERSION(Rectangle,"0.2");
SYNFIG_LAYER_SET_CVS_ID(Rectangle,"$Id$");
return context.hit_check(pos);
}
+bool
+Rectangle::is_solid_color()const
+{
+ return Layer_Composite::is_solid_color() ||
+ (get_blend_method() == Color::BLEND_COMPOSITE &&
+ get_amount() == 1.0f &&
+ color.get_a() == 1.0f);
+}
+
Color
Rectangle::get_color(Context context, const Point &pos)const
{
surface->blit_to(subimage_pen,left,top,right-left,bottom-top);
}
- // fill surface with the rectangle's colour
+ // fill surface with the rectangle's color
Surface::alpha_pen surface_pen(surface->begin(),get_amount(),get_blend_method());
surface->fill(color,surface_pen,w,h);
return true;
}
- // Render what is behind us
- if(!context.accelerated_render(surface,quality,renddesc,cb))
- {
- if(cb)cb->error(strprintf(__FILE__"%d: Accelerated Renderer Failure",__LINE__));
- return false;
- }
+ // not inverted
int left(ceil_to_int((min[0]-tl[0])/pw));
int right(floor_to_int((max[0]-tl[0])/pw));
right = std::min(w,right);
*/
- Surface::alpha_pen pen;
+ // optimization - if the whole tile is covered by this rectangle,
+ // and the rectangle is a solid color, we don't need to render
+ // what's behind us
+ if (is_solid_color() && top == 0 && left == 0 && bottom == h && right == w)
+ {
+ surface->set_wh(w,h);
+ surface->fill(color);
+ return true;
+ }
+
+ // Render what is behind us
+ if(!context.accelerated_render(surface,quality,renddesc,cb))
+ {
+ if(cb)cb->error(strprintf(__FILE__"%d: Accelerated Renderer Failure",__LINE__));
+ return false;
+ }
// In the case where there is nothing to render...
- if(right-left<0||bottom-top<0)
+ if (right < left || bottom < top)
return true;
+ Surface::alpha_pen pen;
+
if(right-left>0&&bottom-top>0)
{
if(is_solid_color())