Fix 1993098: "Composited Inline canvases fails if background is transp.". This was...

[synfig.git] / synfig-core / trunk / src / synfig / layer_pastecanvas.cpp

diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
index d7d5b39..bcf954f 100644 (file)
--- a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
@@ -6,7 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**     Copyright (c) 2007 Chris Moore
+**     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
@@ -144,6 +144,18 @@ Layer_PasteCanvas::get_param_vocab()const
                .set_local_name(_("Children Lock"))
        );
 
+       // optimize_layers() in canvas.cpp makes a new PasteCanvas layer
+       // and copies over the parameters of the old layer.  the
+       // 'curr_time' member wasn't being copied, so I've added it as a
+       // hidden, non critical parameter, and now it will be.  this
+       // allows a single exported subcanvas to be used more than once at
+       // a time, with different time offets in each.  see bug #1896557.
+       ret.push_back(ParamDesc("curr_time")
+               .set_local_name(_("Current Time"))
+               .not_critical()
+               .hidden()
+       );
+
        return ret;
 }
 
@@ -159,7 +171,12 @@ Layer_PasteCanvas::set_param(const String & param, const ValueBase &value)
                return true;
        }
 
-       //! \todo this introduces bug 1844764 if enabled; it was introduced in r954, but I can't see if it's useful
+       //! \todo this introduces bug 1844764 if enabled; it was introduced in r954.
+       // http://synfig.org/images/3/3d/Moving-waypoints.sifz is an
+       // example of an animation that has its waypoints displayed
+       // incorrectly without this fix; select the outer layer and drag
+       // the time slider.  The linear waypoints don't take effect until
+       // 5s, but the time slider appears to pass the first one at 3s.
 #if 0
        if (param=="time_offset" && value.same_type_as(time_offset))
        {
@@ -178,6 +195,7 @@ Layer_PasteCanvas::set_param(const String & param, const ValueBase &value)
 
        IMPORT(children_lock);
        IMPORT(zoom);
+       IMPORT(curr_time);
 
        return Layer_Composite::set_param(param,value);
 }
@@ -223,6 +241,24 @@ Layer_PasteCanvas::set_sub_canvas(etl::handle<synfig::Canvas> x)
                on_canvas_set();
 }
 
+// when a pastecanvas that contains another pastecanvas is copy/pasted
+// from one document to another, only the outermost pastecanvas was
+// getting its renddesc set to match that of its new parent.  this
+// function is used to recurse through the pastecanvas copying its
+// renddesc to any pastecanvases it contains (bug #2116947, svn r2200)
+void
+Layer_PasteCanvas::update_renddesc()
+{
+       if(!get_canvas() || !canvas || !canvas->is_inline()) return;
+
+       canvas->rend_desc()=get_canvas()->rend_desc();
+       for (Context context = canvas->get_context(); !context->empty(); context++)
+       {
+               etl::handle<Layer_PasteCanvas> paste = etl::handle<Layer_PasteCanvas>::cast_dynamic(*context);
+               if (paste) paste->update_renddesc();
+       }
+}
+
 // This is called whenever the parent canvas gets set/changed
 void
 Layer_PasteCanvas::on_canvas_set()
@@ -244,6 +280,7 @@ Layer_PasteCanvas::get_param(const String& param)const
        EXPORT(zoom);
        EXPORT(time_offset);
        EXPORT(children_lock);
+       EXPORT(curr_time);
 
        EXPORT_NAME();
        EXPORT_VERSION();
@@ -317,9 +354,6 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali
        if(!canvas || !get_amount())
                return context.accelerated_render(surface,quality,renddesc,cb);
 
-       if(muck_with_time_ && curr_time!=Time::begin() && canvas->get_time()!=curr_time+time_offset)
-               canvas->set_time(curr_time+time_offset);
-
        SuperCallback stageone(cb,0,4500,10000);
        SuperCallback stagetwo(cb,4500,9000,10000);
        SuperCallback stagethree(cb,9000,9999,10000);
@@ -339,6 +373,9 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali
        else if (!context.accelerated_render(surface,quality,renddesc,&stageone))
                return false;
 
+       if(muck_with_time_ && curr_time!=Time::begin() && canvas->get_time()!=curr_time+time_offset)
+               canvas->set_time(curr_time+time_offset);
+
        Color::BlendMethod blend_method(get_blend_method());
        const Rect full_bounding_rect(canvas->get_context().get_full_bounding_rect());
 
@@ -374,10 +411,12 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali
                if (blend_method==Color::BLEND_COMPOSITE) blend_using_straight = true;
        }
 
-       if (!etl::intersect(context.get_full_bounding_rect(),full_bounding_rect+origin))
+       if (!etl::intersect(context.get_full_bounding_rect(),(full_bounding_rect*exp(zoom))+origin))
        {
-               // if there's no intersection between the context and our surface, and we're rendering 'onto', then we're done
-               if (Color::is_onto(blend_method)) return true;
+               // if there's no intersection between the context and our
+               // surface, and we're rendering 'onto', then we're done
+               if (Color::is_onto(blend_method) && !Color::is_straight(blend_method))
+                       return true;
 
                /* 'straight' is faster than 'composite' and has the same
                 * effect if the affected area of the lower layer is