X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_pastecanvas.cpp;h=3fafb8ed6076071b6e76ebb666f86b79e594b368;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=d7d5b3972ebedd80d6f5fdfaf17af4f20970e6fa;hpb=803a0f13b422298eb82d67ffdf20b110dfd186ac;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp index d7d5b39..3fafb8e 100644 --- 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 @@ -83,6 +83,7 @@ SYNFIG_LAYER_SET_CVS_ID(Layer_PasteCanvas,"$Id$"); Layer_PasteCanvas::Layer_PasteCanvas(): origin(0,0), + focus(0,0), depth(0), zoom(0), time_offset(0), @@ -144,6 +145,26 @@ Layer_PasteCanvas::get_param_vocab()const .set_local_name(_("Children Lock")) ); + ret.push_back(ParamDesc("focus") + .set_local_name(_("Focus Point")) + .set_origin("origin") + .set_connect("origin") + .set_description(_("Point to remain fixed when zooming")) + // .set_invisible_duck() + ); + + // 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; } @@ -151,6 +172,7 @@ bool Layer_PasteCanvas::set_param(const String & param, const ValueBase &value) { IMPORT(origin); + IMPORT(focus); // IMPORT(canvas); if(param=="canvas" && value.same_type_as(Canvas::Handle())) @@ -159,7 +181,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 +205,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); } @@ -194,6 +222,8 @@ Layer_PasteCanvas::set_sub_canvas(etl::handle x) child_changed_connection.disconnect(); + if (canvas != x) signal_subcanvas_changed()(); + canvas=x; /*if(canvas) @@ -205,8 +235,7 @@ Layer_PasteCanvas::set_sub_canvas(etl::handle x) ); */ if(canvas) - bounds = ((canvas->get_context().get_full_bounding_rect() - canvas->rend_desc().get_focus()) * exp(zoom) + - origin + canvas->rend_desc().get_focus()); + bounds = ((canvas->get_context().get_full_bounding_rect() - focus) * exp(zoom) + origin + focus); if(canvas && muck_with_time_) add_child(canvas.get()); @@ -223,6 +252,24 @@ Layer_PasteCanvas::set_sub_canvas(etl::handle 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 paste = etl::handle::cast_dynamic(*context); + if (paste) paste->update_renddesc(); + } +} + // This is called whenever the parent canvas gets set/changed void Layer_PasteCanvas::on_canvas_set() @@ -240,10 +287,12 @@ ValueBase Layer_PasteCanvas::get_param(const String& param)const { EXPORT(origin); + EXPORT(focus); EXPORT(canvas); EXPORT(zoom); EXPORT(time_offset); EXPORT(children_lock); + EXPORT(curr_time); EXPORT_NAME(); EXPORT_VERSION(); @@ -262,7 +311,7 @@ Layer_PasteCanvas::set_time(Context context, Time time)const { canvas->set_time(time+time_offset); - bounds=(canvas->get_context().get_full_bounding_rect()-canvas->rend_desc().get_focus())*exp(zoom)+origin+canvas->rend_desc().get_focus(); + bounds=(canvas->get_context().get_full_bounding_rect()-focus)*exp(zoom)+origin+focus; } else bounds=Rect::zero(); @@ -274,7 +323,7 @@ Layer_PasteCanvas::hit_check(synfig::Context context, const synfig::Point &pos)c if(depth==MAX_DEPTH)return 0;depth_counter counter(depth); if (canvas) { - Point target_pos=(pos-canvas->rend_desc().get_focus()-origin)/exp(zoom)+canvas->rend_desc().get_focus(); + Point target_pos=(pos-focus-origin)/exp(zoom)+focus; if(canvas && get_amount() && canvas->get_context().get_color(target_pos).get_a()>=0.25) { @@ -296,7 +345,7 @@ Layer_PasteCanvas::get_color(Context context, const Point &pos)const if(depth==MAX_DEPTH)return Color::alpha();depth_counter counter(depth); - Point target_pos=(pos-canvas->rend_desc().get_focus()-origin)/exp(zoom)+canvas->rend_desc().get_focus(); + Point target_pos=(pos-focus-origin)/exp(zoom)+focus; return Color::blend(canvas->get_context().get_color(target_pos),context.get_color(pos),get_amount(),get_blend_method()); } @@ -317,9 +366,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); @@ -327,8 +373,8 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali RendDesc desc(renddesc); Vector::value_type zoomfactor=1.0/exp(zoom); desc.clear_flags(); - desc.set_tl((desc.get_tl()-canvas->rend_desc().get_focus()-origin)*zoomfactor+canvas->rend_desc().get_focus()); - desc.set_br((desc.get_br()-canvas->rend_desc().get_focus()-origin)*zoomfactor+canvas->rend_desc().get_focus()); + desc.set_tl((desc.get_tl()-focus-origin)*zoomfactor+focus); + desc.set_br((desc.get_br()-focus-origin)*zoomfactor+focus); desc.set_flags(RendDesc::PX_ASPECT); if (is_solid_color() || context->empty()) @@ -339,6 +385,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 +423,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-focus)*exp(zoom)+origin+focus)) { - // 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