/* === S Y N F I G ========================================================= */
/*! \file layer_pastecanvas.cpp
-** \brief Template Header
+** \brief Implementation of the "Paste Canvas" layer
**
-** $Id: layer_pastecanvas.cpp,v 1.3 2005/01/24 03:08:18 darco Exp $
+** $Id$
**
** \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
#define MAX_DEPTH 10
+#define SYNFIG_CLIP_PASTECANVAS
+
//#ifdef __APPLE__
-//#define SYNFIG_NO_CLIP
+//#undef SYNFIG_CLIP_PASTECANVAS
//#endif
/* === C L A S S E S ======================================================= */
/* === G L O B A L S ======================================================= */
SYNFIG_LAYER_INIT(Layer_PasteCanvas);
-SYNFIG_LAYER_SET_NAME(Layer_PasteCanvas,"PasteCanvas");
-SYNFIG_LAYER_SET_LOCAL_NAME(Layer_PasteCanvas,_("Paste Canvas"));
-SYNFIG_LAYER_SET_CATEGORY(Layer_PasteCanvas,_("Default"));
+SYNFIG_LAYER_SET_NAME(Layer_PasteCanvas,"PasteCanvas"); // todo: use paste_canvas
+SYNFIG_LAYER_SET_LOCAL_NAME(Layer_PasteCanvas,N_("Paste Canvas"));
+SYNFIG_LAYER_SET_CATEGORY(Layer_PasteCanvas,N_("Other"));
SYNFIG_LAYER_SET_VERSION(Layer_PasteCanvas,"0.1");
-SYNFIG_LAYER_SET_CVS_ID(Layer_PasteCanvas,"$Id: layer_pastecanvas.cpp,v 1.3 2005/01/24 03:08:18 darco Exp $");
+SYNFIG_LAYER_SET_CVS_ID(Layer_PasteCanvas,"$Id$");
/* === M E T H O D S ======================================================= */
time_offset(0)
{
children_lock=false;
- do_not_muck_with_time_=false;
+ muck_with_time_=true;
curr_time=Time::begin();
}
{
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);
+ //! \todo this introduces bug 1844764 if enabled; it was introduced in r954, but I can't see if it's useful
+#if 0
+ 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;
+ }
+#else
+ IMPORT(time_offset);
+#endif
+
IMPORT(children_lock);
IMPORT(zoom);
- IMPORT(time_offset);
return Layer_Composite::set_param(param,value);
}
void
Layer_PasteCanvas::set_sub_canvas(etl::handle<synfig::Canvas> 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()))
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()))
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();
}
{
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<Layer_PasteCanvas*>(this);
}
- return const_cast<Layer_PasteCanvas*>(this);
}
- else
- return context.hit_check(pos);
+ return context.hit_check(pos);
}
Color
if(cb && !cb->amount_complete(0,10000)) return false;
if(depth==MAX_DEPTH)
- {
- DEBUGPOINT();
// if we are at the extent of our depth,
// then we should just return whatever is under us.
return context.accelerated_render(surface,quality,renddesc,cb);
- }
+
depth_counter counter(depth);
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);
- }
SuperCallback stageone(cb,0,4500,10000);
SuperCallback stagetwo(cb,4500,9000,10000);
desc.set_br((desc.get_br()-canvas->rend_desc().get_focus()-origin)*zoomfactor+canvas->rend_desc().get_focus());
desc.set_flags(RendDesc::PX_ASPECT);
- if(is_solid_color() || context->empty())
+ if (is_solid_color() || context->empty())
{
surface->set_wh(renddesc.get_w(),renddesc.get_h());
surface->clear();
}
- else if(!context.accelerated_render(surface,quality,renddesc,&stageone))
+ else if (!context.accelerated_render(surface,quality,renddesc,&stageone))
return false;
- Color::BlendMethod blend_method(get_blend_method());
+ Color::BlendMethod blend_method(get_blend_method());
const Rect full_bounding_rect(canvas->get_context().get_full_bounding_rect());
- if(context->empty())
- {
- if(Color::is_onto(blend_method))
- return true;
-
- if(blend_method==Color::BLEND_COMPOSITE)
- blend_method=Color::BLEND_STRAIGHT;
- }
- else
- if(!etl::intersect(context.get_full_bounding_rect(),full_bounding_rect+origin))
+ if(context->empty() ||
+ !etl::intersect(context.get_full_bounding_rect(),full_bounding_rect+origin))
{
- if(Color::is_onto(blend_method))
- return true;
-
- if(blend_method==Color::BLEND_COMPOSITE)
- blend_method=Color::BLEND_STRAIGHT;
+ if (Color::is_onto(blend_method)) return true;
+ if (blend_method==Color::BLEND_COMPOSITE) blend_method=Color::BLEND_STRAIGHT;
}
-#ifndef SYNFIG_NO_CLIP
- {
- //synfig::info("PasteCanv Clip");
- Rect area(desc.get_rect()&full_bounding_rect);
-
- Point min(area.get_min());
- Point max(area.get_max());
-
- if(desc.get_tl()[0]>desc.get_br()[0])
- swap(min[0],max[0]);
- if(desc.get_tl()[1]>desc.get_br()[1])
- swap(min[1],max[1]);
+#ifdef SYNFIG_CLIP_PASTECANVAS
+ Rect area(desc.get_rect() & full_bounding_rect);
- const int
- x(floor_to_int((min[0]-desc.get_tl()[0])/desc.get_pw())),
- y(floor_to_int((min[1]-desc.get_tl()[1])/desc.get_ph())),
- w(ceil_to_int((max[0]-desc.get_tl()[0])/desc.get_pw())-x),
- h(ceil_to_int((max[1]-desc.get_tl()[1])/desc.get_ph())-y);
-
- desc.set_subwindow(x,y,w,h);
-
- Surface pastesurface;
-
- if(area.area()<=0.000001 || desc.get_w()==0 || desc.get_h()==0)
- {
- if(cb && !cb->amount_complete(10000,10000)) return false;
-
- return true;
- }
+ Point min(area.get_min());
+ Point max(area.get_max());
- if(!canvas->get_context().accelerated_render(&pastesurface,quality,desc,&stagetwo))
- return false;
+ if (desc.get_tl()[0] > desc.get_br()[0]) swap(min[0], max[0]);
+ if (desc.get_tl()[1] > desc.get_br()[1]) swap(min[1], max[1]);
- Surface::alpha_pen apen(surface->get_pen(x,y));
+ const int x(floor_to_int((min[0] - desc.get_tl()[0]) / desc.get_pw()));
+ const int y(floor_to_int((min[1] - desc.get_tl()[1]) / desc.get_ph()));
+ const int w( ceil_to_int((max[0] - desc.get_tl()[0]) / desc.get_pw()) - x);
+ const int h( ceil_to_int((max[1] - desc.get_tl()[1]) / desc.get_ph()) - y);
- apen.set_alpha(get_amount());
- apen.set_blend_method(blend_method);
+ desc.set_subwindow(x,y,w,h);
- pastesurface.blit_to(apen);
- }
-#else
+ // \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)
{
- Surface pastesurface;
+ if(cb && !cb->amount_complete(10000,10000)) return false;
+ return true;
+ }
+#endif // SYNFIG_CLIP_PASTECANVAS
- if(!canvas->get_context().accelerated_render(&pastesurface,quality,desc,&stagetwo))
- return false;
+ // render the canvas to be pasted onto pastesurface
+ Surface pastesurface;
+ if(!canvas->get_context().accelerated_render(&pastesurface,quality,desc,&stagetwo))
+ return false;
- Surface::alpha_pen apen(surface->begin());
+#ifdef SYNFIG_CLIP_PASTECANVAS
+ Surface::alpha_pen apen(surface->get_pen(x,y));
+#else // SYNFIG_CLIP_PASTECANVAS
+ Surface::alpha_pen apen(surface->begin());
+#endif // SYNFIG_CLIP_PASTECANVAS
- apen.set_alpha(get_amount());
- apen.set_blend_method(blend_method);
-
- pastesurface.blit_to(apen);
- }
-#endif
+ apen.set_alpha(get_amount());
+ apen.set_blend_method(blend_method);
+ pastesurface.blit_to(apen);
if(cb && !cb->amount_complete(10000,10000)) return false;
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);
}
projects / synfig.git / blobdiff