Don't waste time rendering layers which are completely obscured by solid-colour recta...

[synfig.git] / synfig-core / trunk / src / modules / mod_geometry / rectangle.cpp

diff --git a/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp b/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp
index 50af745..d5b861c 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp
+++ b/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp
@@ -2,7 +2,7 @@
 /*!    \file rectangle.cpp
 **     \brief Template Header
 **
-**     $Id: rectangle.cpp,v 1.2 2005/01/24 03:08:17 darco Exp $
+**     $Id$
 **
 **     \legal
 **     Copyright (c) 2002 Robert B. Quattlebaum Jr.
@@ -57,7 +57,7 @@ SYNFIG_LAYER_SET_NAME(Rectangle,"rectangle");
 SYNFIG_LAYER_SET_LOCAL_NAME(Rectangle,_("Rectangle"));
 SYNFIG_LAYER_SET_CATEGORY(Rectangle,_("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 ================================================= */
 
@@ -377,7 +377,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 +400,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 colour
                        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 +456,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));
@@ -482,9 +483,26 @@ Rectangle::accelerated_render(Context context,Surface *surface,int quality, cons
        Surface::alpha_pen pen;
 
        // In the case where there is nothing to render...
-       if(right-left<0||bottom-top<0)
+       if (right < left || bottom < top)
                return true;
 
+       // optimisation - if the whole tile is covered by this rectangle,
+       // and the rectangle is a solid colour, 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;
+       }
+
        if(right-left>0&&bottom-top>0)
        {
                if(is_solid_color())