Author: Carlos Lopez <[email protected]>
Date: Sun Aug 12 12:16:59 2012 +0200
Checkerboard Layer: place the checker in the correct place and render the
correct tiles (top left and bottom right).
---
.../src/modules/mod_geometry/checkerboard.cpp | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/synfig-core/src/modules/mod_geometry/checkerboard.cpp
b/synfig-core/src/modules/mod_geometry/checkerboard.cpp
index bb81100..6c61447 100644
--- a/synfig-core/src/modules/mod_geometry/checkerboard.cpp
+++ b/synfig-core/src/modules/mod_geometry/checkerboard.cpp
@@ -230,9 +230,11 @@ CheckerBoard::accelerated_cairorender(Context
context,cairo_surface_t *surface,i
const Real pw = (br[0] - tl[0]) / w;
const Real ph = (br[1] - tl[1]) / h;
- // These are translation values
+ // These are translation and scale values
const double tx(-tl[0]/pw);
const double ty(-tl[1]/ph);
+ const double sx(1/pw);
+ const double sy(1/ph);
Point newsize(size);
if(newsize[0] <0.0) newsize[0]=-newsize[0];
@@ -256,7 +258,7 @@ CheckerBoard::accelerated_cairorender(Context
context,cairo_surface_t *surface,i
cairo_translate(subcr, subtx , subty);
cairo_scale(subcr, subsx, subsy);
cairo_set_source_rgba(subcr, r, g, b, a);
- cairo_rectangle(subcr, origin[0]-newsize[0], origin[1]-newsize[1],
newsize[0], newsize[1]);
+ cairo_rectangle(subcr, origin[0]-newsize[0], origin[1], newsize[0],
newsize[1]);
cairo_clip(subcr);
cairo_paint_with_alpha(subcr, get_amount());
cairo_restore(subcr);
@@ -264,14 +266,14 @@ CheckerBoard::accelerated_cairorender(Context
context,cairo_surface_t *surface,i
cairo_translate(subcr, subtx , subty);
cairo_scale(subcr, subsx, subsy);
cairo_set_source_rgba(subcr, r, g, b, a);
- cairo_rectangle(subcr, origin[0], origin[1], newsize[0], newsize[1]);
+ cairo_rectangle(subcr, origin[0], origin[1]-newsize[1], newsize[0],
newsize[1]);
cairo_clip(subcr);
cairo_paint_with_alpha(subcr, get_amount());
cairo_restore(subcr);
cairo_t* cr=cairo_create(surface);
cairo_save(cr);
- cairo_translate(cr, tx , ty);
+ cairo_translate(cr, tx+origin[0]*sx , ty+origin[1]*sy);
cairo_pattern_t* pattern=cairo_pattern_create_for_surface(subimage);
cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
cairo_set_source(cr, pattern);
@@ -280,7 +282,7 @@ CheckerBoard::accelerated_cairorender(Context
context,cairo_surface_t *surface,i
else
cairo_set_operator(cr, CAIRO_OPERATOR_OVER); // TODO this has
to be the real operator
cairo_paint_with_alpha(cr, get_amount());
-
+ cairo_restore(cr);
cairo_surface_destroy(subimage);
cairo_pattern_destroy(pattern);
cairo_destroy(subcr);
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
