X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_geometry%2Frectangle.cpp;h=374af9c1a7a98c2d1a90067fd35a197bf0a27f6c;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=50af74514e30a5451942b6855d565446b00dcf9b;hpb=0809ba8eb14cf885c8f197d751c80cced84d9676;p=synfig.git diff --git a/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp b/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp index 50af745..374af9c 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp +++ b/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp @@ -1,11 +1,12 @@ /* === S Y N F I G ========================================================= */ /*! \file rectangle.cpp -** \brief Template Header +** \brief Implementation of the "Rectangle" layer ** -** $Id: rectangle.cpp,v 1.2 2005/01/24 03:08:17 darco Exp $ +** $Id$ ** ** \legal ** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** 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 @@ -54,10 +55,10 @@ using namespace synfig; 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: rectangle.cpp,v 1.2 2005/01/24 03:08:17 darco Exp $"); +SYNFIG_LAYER_SET_CVS_ID(Rectangle,"$Id$"); /* === P R O C E D U R E S ================================================= */ @@ -86,7 +87,9 @@ Rectangle::Rectangle(): bool Rectangle::set_param(const String & param, const ValueBase &value) { - IMPORT(color); + 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(point1); IMPORT(point2); IMPORT(expand); @@ -177,6 +180,15 @@ Rectangle::hit_check(synfig::Context context, const synfig::Point &pos)const 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 { @@ -262,27 +274,26 @@ Rectangle::get_color(Context context, const Point &pos)const if( pos[0]min[0] && pos[1]min[1] ) { + // inside the expanded rectangle if(invert) - return context.get_color(pos); - else - { - if(is_solid_color()) - return color; - else - return Color::blend(color,context.get_color(pos),get_amount(),get_blend_method()); + return Color::blend(Color::alpha(),context.get_color(pos),get_amount(),get_blend_method()); - } - } + if(is_solid_color()) + return color; - if(invert) + return Color::blend(color,context.get_color(pos),get_amount(),get_blend_method()); + } + else { + // outside the expanded rectangle + if(!invert) + return Color::blend(Color::alpha(),context.get_color(pos),get_amount(),get_blend_method()); + if(is_solid_color()) return color; - else - return Color::blend(color,context.get_color(pos),get_amount(),get_blend_method()); - } - return context.get_color(pos); + return Color::blend(color,context.get_color(pos),get_amount(),get_blend_method()); + } } bool @@ -377,7 +388,7 @@ Rectangle::accelerated_render(Context context,Surface *surface,int quality, cons surface->fill(color); // Check for the case where there is nothing to render - if(right-left<=0||bottom-top<=0) + if (right <= left || bottom <= top) return true; desc.set_subwindow(left,top,right-left,bottom-top); @@ -400,25 +411,31 @@ Rectangle::accelerated_render(Context context,Surface *surface,int quality, cons if(cb)cb->error(strprintf(__FILE__"%d: Accelerated Renderer Failure",__LINE__)); return false; } + Surface subimage; - // Check for the case where there is nothing to render - if(!(right-left<=0||bottom-top<=0)) + // Check for the case where there is something to render + if (right > left && bottom > top) { + // save a copy of the overlapping region from surface into subimage subimage.set_wh(right-left,bottom-top); Surface::pen subimage_pen(subimage.begin()); surface->blit_to(subimage_pen,left,top,right-left,bottom-top); } + // 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); - if(subimage) + if (subimage) { + // copy the saved overlapping region back from subimage into surface Surface::pen pen(surface->get_pen(left,top)); subimage.blit_to(pen); } + else + // if there's no overlapping region, return now of the following code corrupts memory + return true; } Surface::alpha_pen pen; @@ -450,12 +467,7 @@ Rectangle::accelerated_render(Context context,Surface *surface,int quality, cons 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)); @@ -479,12 +491,29 @@ Rectangle::accelerated_render(Context context,Surface *surface,int quality, cons 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())