projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add my copyright to files I've modified.
[synfig.git]
/
synfig-core
/
trunk
/
src
/
modules
/
mod_geometry
/
rectangle.cpp
diff --git
a/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp
b/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp
index
d5b861c
..
537f1ec
100644
(file)
--- a/
synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp
+++ b/
synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp
@@
-6,6
+6,7
@@
**
** \legal
** Copyright (c) 2002 Robert B. Quattlebaum Jr.
**
** \legal
** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+** 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
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-177,6
+178,15
@@
Rectangle::hit_check(synfig::Context context, const synfig::Point &pos)const
return context.hit_check(pos);
}
return context.hit_check(pos);
}
+bool
+Rectangle::is_solid_color()const
+{
+ return Layer_Composite::is_solid_color() ||
+ (get_blend_method() == Color::BLEND_COMPOSITE &&
+ get_amount() == 1.0f &&
+ color.get_a() == 1.0f);
+}
+
Color
Rectangle::get_color(Context context, const Point &pos)const
{
Color
Rectangle::get_color(Context context, const Point &pos)const
{
@@
-480,12
+490,6
@@
Rectangle::accelerated_render(Context context,Surface *surface,int quality, cons
right = std::min(w,right);
*/
right = std::min(w,right);
*/
- Surface::alpha_pen pen;
-
- // In the case where there is nothing to render...
- if (right < left || bottom < top)
- return true;
-
// optimisation - if the whole tile is covered by this rectangle,
// and the rectangle is a solid colour, we don't need to render
// what's behind us
// optimisation - if the whole tile is covered by this rectangle,
// and the rectangle is a solid colour, we don't need to render
// what's behind us
@@
-503,6
+507,12
@@
Rectangle::accelerated_render(Context context,Surface *surface,int quality, cons
return false;
}
return false;
}
+ // In the case where there is nothing to render...
+ if (right < left || bottom < top)
+ return true;
+
+ Surface::alpha_pen pen;
+
if(right-left>0&&bottom-top>0)
{
if(is_solid_color())
if(right-left>0&&bottom-top>0)
{
if(is_solid_color())