projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Write "operator()" instead of "operator ()", "operator&" instead of "operator &"...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
layer_shape.cpp
diff --git
a/synfig-core/trunk/src/synfig/layer_shape.cpp
b/synfig-core/trunk/src/synfig/layer_shape.cpp
index
8a90f19
..
e8f13a5
100644
(file)
--- a/
synfig-core/trunk/src/synfig/layer_shape.cpp
+++ b/
synfig-core/trunk/src/synfig/layer_shape.cpp
@@
-6,7
+6,7
@@
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-** Copyright (c) 2007 Chris Moore
+** Copyright (c) 2007
, 2008
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
@@
-245,11
+245,13
@@
struct MonoSegment
//assumes that the rect culled away anything that would be beyond the edges
if(ydir > 0)
{
//assumes that the rect culled away anything that would be beyond the edges
if(ydir > 0)
{
- while(y > (*++p)[1]);
+ while(y > (*++p)[1])
+ ;
}
else
{
}
else
{
- while(y < (*++p)[1]);
+ while(y < (*++p)[1])
+ ;
}
//for the loop to break there must have been a slope (straight line would do nothing)
}
//for the loop to break there must have been a slope (straight line would do nothing)
@@
-335,7
+337,7
@@
struct CurveArray
if( (y > ymax && y > p[1][1]) || (y < ymin && y < p[1][1]) ) return 0;
//degenerate line max
if( (y > ymax && y > p[1][1]) || (y < ymin && y < p[1][1]) ) return 0;
//degenerate line max
- if(ymin == ymax == p[1][1])
+ if(ymin == ymax
&& ymax
== p[1][1])
return 0;
//degenerate accept - to the right and crossing the base line
return 0;
//degenerate accept - to the right and crossing the base line
@@
-945,7
+947,7
@@
struct PenMark
void setcover(Real c, Real a) { cover = c; area = a; }
void addcover(Real c, Real a) { cover += c; area += a; }
void setcover(Real c, Real a) { cover = c; area = a; }
void addcover(Real c, Real a) { cover += c; area += a; }
- bool operator
<
(const PenMark &rhs) const
+ bool operator
<
(const PenMark &rhs) const
{
return y == rhs.y ? x < rhs.x : y < rhs.y;
}
{
return y == rhs.y ? x < rhs.x : y < rhs.y;
}
@@
-1149,7
+1151,9
@@
Layer_Shape::clear()
bool
Layer_Shape::set_param(const String & param, const ValueBase &value)
{
bool
Layer_Shape::set_param(const String & param, const ValueBase &value)
{
- IMPORT(color);
+ IMPORT_PLUS(color, { if (color.get_a() == 0) { if (converted_blend_) {
+ set_blend_method(Color::BLEND_ALPHA_OVER);
+ color.set_a(1); } else transparent_color_ = true; } });
IMPORT(offset);
IMPORT(invert);
IMPORT(antialias);
IMPORT(offset);
IMPORT(invert);
IMPORT(antialias);
@@
-1187,7
+1191,7
@@
Layer_Shape::get_param_vocab()const
.set_description(_("Layer_Shape Color"))
);
ret.push_back(ParamDesc("offset")
.set_description(_("Layer_Shape Color"))
);
ret.push_back(ParamDesc("offset")
- .set_local_name(_("
Position
"))
+ .set_local_name(_("
Offset
"))
);
ret.push_back(ParamDesc("invert")
.set_local_name(_("Invert"))
);
ret.push_back(ParamDesc("invert")
.set_local_name(_("Invert"))
@@
-1291,7
+1295,7
@@
Layer_Shape::get_color(Context context, const Point &p)const
//************** SCANLINE RENDERING *********************
void Layer_Shape::PolySpan::line_to(Real x, Real y)
{
//************** SCANLINE RENDERING *********************
void Layer_Shape::PolySpan::line_to(Real x, Real y)
{
- Real n[4];
+ Real n[4]
= {0,0,0,0}
;
bool afterx = false;
const Real xin(x), yin(y);
bool afterx = false;
const Real xin(x), yin(y);
@@
-2477,8
+2481,8
@@
Layer_Shape::accelerated_render(Context context,Surface *surface,int quality, co
Rect nrect;
Rect nrect;
- Real pixelfeatherx = abs(feather/pw),
- pixelfeathery = abs(feather/ph);
+ Real pixelfeatherx =
quality == 10 ? 0 :
abs(feather/pw),
+ pixelfeathery =
quality == 10 ? 0 :
abs(feather/ph);
nrect.set_point((aabb.minx - tl[0])/pw,(aabb.miny - tl[1])/ph);
nrect.expand((aabb.maxx - tl[0])/pw,(aabb.maxy - tl[1])/ph);
nrect.set_point((aabb.minx - tl[0])/pw,(aabb.miny - tl[1])/ph);
nrect.expand((aabb.maxx - tl[0])/pw,(aabb.maxy - tl[1])/ph);
@@
-2519,7
+2523,7
@@
Layer_Shape::accelerated_render(Context context,Surface *surface,int quality, co
if(cb && !cb->amount_complete(10000,10001+renddesc.get_h())) return false;
if(cb && !cb->amount_complete(10000,10001+renddesc.get_h())) return false;
- if(feather)
+ if(feather
&& quality != 10
)
{
//we have to blur rather than be crappy
{
//we have to blur rather than be crappy
@@
-2859,7
+2863,7
@@
Layer_Shape::render_shape(Surface *surface,bool useblend,int /*quality*/,
}
bool
}
bool
-Layer_Shape::render_shape(surface<float> *surface,int /*quality*/,
+Layer_Shape::render_shape(
etl::
surface<float> *surface,int /*quality*/,
const RendDesc &renddesc, ProgressCallback */*cb*/)const
{
// If our amount is set to zero, no need to render anything
const RendDesc &renddesc, ProgressCallback */*cb*/)const
{
// If our amount is set to zero, no need to render anything