X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_pastecanvas.cpp;h=89b3f284c259d0fae462733abf7155c72a3284ec;hb=0590e8116853b768e027f0ead843e01696458dfc;hp=d76318ff4349a1edbb9d593ddeb00ab7280740a9;hpb=cc54c38609ee9745ad678e5e9b9d7d2912be9c95;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp index d76318f..89b3f28 100644 --- a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp +++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp @@ -6,6 +6,7 @@ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** 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 @@ -69,9 +70,9 @@ public: /* === G L O B A L S ======================================================= */ SYNFIG_LAYER_INIT(Layer_PasteCanvas); -SYNFIG_LAYER_SET_NAME(Layer_PasteCanvas,"PasteCanvas"); +SYNFIG_LAYER_SET_NAME(Layer_PasteCanvas,"PasteCanvas"); // todo: use paste_canvas SYNFIG_LAYER_SET_LOCAL_NAME(Layer_PasteCanvas,_("Paste Canvas")); -SYNFIG_LAYER_SET_CATEGORY(Layer_PasteCanvas,_("Default")); +SYNFIG_LAYER_SET_CATEGORY(Layer_PasteCanvas,_("Other")); SYNFIG_LAYER_SET_VERSION(Layer_PasteCanvas,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Layer_PasteCanvas,"$Id$"); @@ -84,7 +85,7 @@ Layer_PasteCanvas::Layer_PasteCanvas(): time_offset(0) { children_lock=false; - do_not_muck_with_time_=false; + muck_with_time_=true; curr_time=Time::begin(); } @@ -146,16 +147,28 @@ Layer_PasteCanvas::set_param(const String & param, const ValueBase &value) { IMPORT(origin); - if(param=="canvas" && value.same_as(Canvas::Handle())) + // IMPORT(canvas); + if(param=="canvas" && value.same_type_as(Canvas::Handle())) { set_sub_canvas(value.get(Canvas::Handle())); return true; } -// IMPORT(canvas); + // IMPORT(time_offset); + if (param=="time_offset" && value.same_type_as(time_offset)) + { + if (time_offset != value.get(Time())) + { + value.put(&time_offset); + // notify that the time_offset has changed so we can update the + // waypoint positions in parent layers + changed(); + } + return true; + } + IMPORT(children_lock); IMPORT(zoom); - IMPORT(time_offset); return Layer_Composite::set_param(param,value); } @@ -163,7 +176,7 @@ Layer_PasteCanvas::set_param(const String & param, const ValueBase &value) void Layer_PasteCanvas::set_sub_canvas(etl::handle x) { - if(canvas && !do_not_muck_with_time_) + if(canvas && muck_with_time_) remove_child(canvas.get()); if(canvas && (canvas->is_inline() || !get_canvas() || get_canvas()->get_root()!=canvas->get_root())) @@ -184,7 +197,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(); - if(canvas && !do_not_muck_with_time_) + if(canvas && muck_with_time_) add_child(canvas.get()); if(canvas && (canvas->is_inline() || !get_canvas() || get_canvas()->get_root()!=canvas->get_root())) @@ -231,7 +244,7 @@ Layer_PasteCanvas::set_time(Context context, Time time)const context.set_time(time); if(canvas) { - canvas->set_time(time); + 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(); } @@ -244,18 +257,19 @@ Layer_PasteCanvas::hit_check(synfig::Context context, const synfig::Point &pos)c { if(depth==MAX_DEPTH)return 0;depth_counter counter(depth); - Point target_pos=(pos-canvas->rend_desc().get_focus()-origin)/exp(zoom)+canvas->rend_desc().get_focus(); + if (canvas) { + Point target_pos=(pos-canvas->rend_desc().get_focus()-origin)/exp(zoom)+canvas->rend_desc().get_focus(); - if(canvas && get_amount() && canvas->get_context().get_color(target_pos).get_a()>=0.25) - { - if(!children_lock) + if(canvas && get_amount() && canvas->get_context().get_color(target_pos).get_a()>=0.25) { - return canvas->get_context().hit_check(target_pos); + if(!children_lock) + { + return canvas->get_context().hit_check(target_pos); + } + return const_cast(this); } - return const_cast(this); } - else - return context.hit_check(pos); + return context.hit_check(pos); } Color @@ -289,7 +303,7 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali if(!canvas || !get_amount()) return context.accelerated_render(surface,quality,renddesc,cb); - if(!do_not_muck_with_time_ && curr_time!=Time::begin() && canvas->get_time()!=curr_time+time_offset) + if(muck_with_time_ && curr_time!=Time::begin() && canvas->get_time()!=curr_time+time_offset) { canvas->set_time(curr_time+time_offset); } @@ -357,7 +371,9 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali Surface pastesurface; - if(area.area()<=0.000001 || desc.get_w()==0 || desc.get_h()==0) + // \todo this used to also have "area.area()<=0.000001 || " - is it useful? + // it was causing bug #1809480 (Zoom in beyond 8.75 in nested canvases fails) + if(desc.get_w()==0 || desc.get_h()==0) { if(cb && !cb->amount_complete(10000,10000)) return false; @@ -406,16 +422,17 @@ void Layer_PasteCanvas::get_times_vfunc(Node::time_set &set) const Node::time_set tset; if(canvas) tset = canvas->get_times(); - Node::time_set::iterator i = tset.begin(), - end = tset.end(); + Node::time_set::iterator i = tset.begin(), end = tset.end(); //Make sure we offset the time... - //TODO: SOMETHING STILL HAS TO BE DONE WITH THE OTHER DIRECTION - // (recursing down the tree needs to take this into account too...) + //! \todo: SOMETHING STILL HAS TO BE DONE WITH THE OTHER DIRECTION + // (recursing down the tree needs to take this into account too...) for(; i != end; ++i) - { - set.insert(*i + time_offset); - } + set.insert(*i +#ifdef ADJUST_WAYPOINTS_FOR_TIME_OFFSET // see node.h + - time_offset +#endif + ); Layer::get_times_vfunc(set); }