X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_duplicate.cpp;h=d0020163d229d084d0dcef67d664724afd13ca0c;hb=bf32f3a9d74f10c68b33f298afef74860691e905;hp=bd1b44bdb6fd0c4715f1c94595fe62a9f9a6accb;hpb=2cebe3d764af3487fcd10869f627774fced70fe1;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/layer_duplicate.cpp b/synfig-core/trunk/src/synfig/layer_duplicate.cpp index bd1b44b..d002016 100644 --- a/synfig-core/trunk/src/synfig/layer_duplicate.cpp +++ b/synfig-core/trunk/src/synfig/layer_duplicate.cpp @@ -70,7 +70,6 @@ Layer_Duplicate::Layer_Duplicate(): Layer::Handle Layer_Duplicate::clone(const GUID& deriv_guid)const { - printf("cloning layer duplicate\n"); Layer::Handle ret = (Layer::Handle)Layer_Composite::clone(deriv_guid); const DynamicParamList &dpl = dynamic_param_list(); @@ -120,7 +119,23 @@ Layer_Duplicate::set_time(Context context, Time time, const Point &pos)const Color Layer_Duplicate::get_color(Context context, const Point &pos)const { - return context.get_color(pos); + handle duplicate_param = get_duplicate_param(); + if (!duplicate_param) return context.get_color(pos); + + Color::BlendMethod blend_method(get_blend_method()); + float amount(get_amount()); + Color color; + + Mutex::Lock lock(mutex); + duplicate_param->reset_index(time_cur); + do + { + context.set_time(time_cur+1); + context.set_time(time_cur); + color = Color::blend(context.get_color(pos),color,amount,blend_method); + } while (duplicate_param->step(time_cur)); + + return color; } Layer::Vocab