From 9cd69dbb8f778ab75208691d19cc0d4a6801c621 Mon Sep 17 00:00:00 2001 From: Ivan Mahonin Date: Sat, 20 Feb 2016 18:59:53 +0600 Subject: [PATCH] Reset outline_grow value for root canvas while rendering. Allow to pass global outline_grow value via RendDesc while rendering, just for future. --- synfig-core/src/synfig/renddesc.h | 6 ++++++ synfig-core/src/synfig/target_scanline.cpp | 2 ++ synfig-core/src/synfig/target_tile.cpp | 2 ++ 3 files changed, 10 insertions(+) diff --git a/synfig-core/src/synfig/renddesc.h b/synfig-core/src/synfig/renddesc.h index 8f97c83eed9..f823e4a2f14 100644 --- a/synfig-core/src/synfig/renddesc.h +++ b/synfig-core/src/synfig/renddesc.h @@ -113,6 +113,8 @@ class RendDesc Time time_begin, time_end; //! Transformation matrix which should be applied for each primitive before rendering Matrix transformation_matrix; + //! Root outline grow value + Real outline_grow; public: //! Anti alias filers types. Seems never implemented @@ -143,6 +145,7 @@ class RendDesc frame_rate (24), time_begin (0), time_end (0), + outline_grow(0), AntialiasFilter(ANTIALIAS_UNIFORM) { } @@ -357,6 +360,9 @@ class RendDesc get_tl()[0], get_tl()[1], 1.0 ); } + Real get_outline_grow() const { return outline_grow; } + void set_outline_grow(Real x) { outline_grow = x; } + }; // END of class RendDesc //! This operator allows the combining of RendDesc::Lock flags using the '|' operator diff --git a/synfig-core/src/synfig/target_scanline.cpp b/synfig-core/src/synfig/target_scanline.cpp index bbcba051017..a69e3aaa9d2 100644 --- a/synfig-core/src/synfig/target_scanline.cpp +++ b/synfig-core/src/synfig/target_scanline.cpp @@ -174,6 +174,7 @@ synfig::Target_Scanline::render(ProgressCallback *cb) // Set the time that we wish to render if(!get_avoid_time_sync() || canvas->get_time()!=t) canvas->set_time(t); + canvas->set_outline_grow(desc.get_outline_grow()); #ifdef SYNFIG_OPTIMIZE_LAYER_TREE Canvas::Handle op_canvas; @@ -330,6 +331,7 @@ synfig::Target_Scanline::render(ProgressCallback *cb) // Set the time that we wish to render if(!get_avoid_time_sync() || canvas->get_time()!=t) canvas->set_time(t); + canvas->set_outline_grow(desc.get_outline_grow()); Context context; #ifdef SYNFIG_OPTIMIZE_LAYER_TREE diff --git a/synfig-core/src/synfig/target_tile.cpp b/synfig-core/src/synfig/target_tile.cpp index 686e4094f3b..feafcc66fa1 100644 --- a/synfig-core/src/synfig/target_tile.cpp +++ b/synfig-core/src/synfig/target_tile.cpp @@ -406,6 +406,7 @@ synfig::Target_Tile::render(ProgressCallback *cb) //if(!get_avoid_time_sync() || canvas->get_time()!=t) // Why the above line was commented here and not in TargetScaline? canvas->set_time(t); + canvas->set_outline_grow(desc.get_outline_grow()); #ifdef SYNFIG_OPTIMIZE_LAYER_TREE Canvas::Handle op_canvas; @@ -438,6 +439,7 @@ synfig::Target_Tile::render(ProgressCallback *cb) // Set the time that we wish to render //if(!get_avoid_time_sync() || canvas->get_time()!=t) canvas->set_time(t); + canvas->set_outline_grow(desc.get_outline_grow()); //synfig::info("2time_set_to %s",t.get_string().c_str());