projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo: 'staticly' -> 'statically'.
[synfig.git]
/
synfig-core
/
trunk
/
src
/
modules
/
mod_filter
/
halftone2.cpp
diff --git
a/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp
b/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp
index
cc5872c
..
b6cad89
100644
(file)
--- a/
synfig-core/trunk/src/modules/mod_filter/halftone2.cpp
+++ b/
synfig-core/trunk/src/modules/mod_filter/halftone2.cpp
@@
-2,10
+2,11
@@
/*! \file halftone2.cpp
** \brief blehh
**
/*! \file halftone2.cpp
** \brief blehh
**
-** $Id
: halftone2.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp
$
+** $Id$
**
** \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
**
** 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
@@
-53,10
+54,10
@@
using namespace etl;
SYNFIG_LAYER_INIT(Halftone2);
SYNFIG_LAYER_SET_NAME(Halftone2,"halftone2");
SYNFIG_LAYER_INIT(Halftone2);
SYNFIG_LAYER_SET_NAME(Halftone2,"halftone2");
-SYNFIG_LAYER_SET_LOCAL_NAME(Halftone2,_("Halftone2"));
+SYNFIG_LAYER_SET_LOCAL_NAME(Halftone2,_("Halftone
2"));
SYNFIG_LAYER_SET_CATEGORY(Halftone2,_("Filters"));
SYNFIG_LAYER_SET_VERSION(Halftone2,"0.0");
SYNFIG_LAYER_SET_CATEGORY(Halftone2,_("Filters"));
SYNFIG_LAYER_SET_VERSION(Halftone2,"0.0");
-SYNFIG_LAYER_SET_CVS_ID(Halftone2,"$Id
: halftone2.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp
$");
+SYNFIG_LAYER_SET_CVS_ID(Halftone2,"$Id$");
/* === P R O C E D U R E S ================================================= */
/* === P R O C E D U R E S ================================================= */
@@
-70,7
+71,7
@@
Halftone2::Halftone2():
halftone.size=(synfig::Vector(0.25,0.25));
halftone.angle=(Angle::zero());
halftone.type=TYPE_SYMMETRIC;
halftone.size=(synfig::Vector(0.25,0.25));
halftone.angle=(Angle::zero());
halftone.type=TYPE_SYMMETRIC;
-
+
set_blend_method(Color::BLEND_STRAIGHT);
}
set_blend_method(Color::BLEND_STRAIGHT);
}
@@
-85,21
+86,21
@@
Halftone2::color_func(const Point &point, float supersample,const Color& color)c
else if(amount>=1.0f)
halfcolor=color_light;
else
else if(amount>=1.0f)
halfcolor=color_light;
else
- halfcolor=Color::blend(color_light,color_dark,amount,Color::BLEND_STRAIGHT);
-
+ halfcolor=Color::blend(color_light,color_dark,amount,Color::BLEND_STRAIGHT);
+
halfcolor.set_a(color.get_a());
return halfcolor;
}
inline float
halfcolor.set_a(color.get_a());
return halfcolor;
}
inline float
-Halftone2::calc_supersample(const synfig::Point &
x, float pw,float ph
)const
+Halftone2::calc_supersample(const synfig::Point &
/*x*/, float pw,float /*ph*/
)const
{
return abs(pw/(halftone.size).mag());
}
synfig::Layer::Handle
{
return abs(pw/(halftone.size).mag());
}
synfig::Layer::Handle
-Halftone2::hit_check(synfig::Context
context, const synfig::Point &point
)const
+Halftone2::hit_check(synfig::Context
/*context*/, const synfig::Point &/*point*/
)const
{
return const_cast<Halftone2*>(this);
}
{
return const_cast<Halftone2*>(this);
}
@@
-114,8
+115,8
@@
Halftone2::set_param(const String & param, const ValueBase &value)
IMPORT_AS(halftone.type,"type");
IMPORT_AS(halftone.angle,"angle");
IMPORT_AS(halftone.offset,"offset");
IMPORT_AS(halftone.type,"type");
IMPORT_AS(halftone.angle,"angle");
IMPORT_AS(halftone.offset,"offset");
-
- return Layer_Composite::set_param(param,value);
+
+ return Layer_Composite::set_param(param,value);
}
ValueBase
}
ValueBase
@@
-128,18
+129,18
@@
Halftone2::get_param(const String & param)const
EXPORT(color_dark);
EXPORT(color_light);
EXPORT(color_dark);
EXPORT(color_light);
-
+
EXPORT_NAME();
EXPORT_VERSION();
EXPORT_NAME();
EXPORT_VERSION();
-
- return Layer_Composite::get_param(param);
+
+ return Layer_Composite::get_param(param);
}
Layer::Vocab
Halftone2::get_param_vocab()const
{
Layer::Vocab ret(Layer_Composite::get_param_vocab());
}
Layer::Vocab
Halftone2::get_param_vocab()const
{
Layer::Vocab ret(Layer_Composite::get_param_vocab());
-
+
ret.push_back(ParamDesc("offset")
.set_local_name(_("Mask Offset"))
.set_is_distance()
ret.push_back(ParamDesc("offset")
.set_local_name(_("Mask Offset"))
.set_is_distance()
@@
-168,7
+169,7
@@
Halftone2::get_param_vocab()const
.add_enum_value(TYPE_DIAMOND,"diamond",_("Diamond"))
.add_enum_value(TYPE_STRIPE,"stripe",_("Stripe"))
);
.add_enum_value(TYPE_DIAMOND,"diamond",_("Diamond"))
.add_enum_value(TYPE_STRIPE,"stripe",_("Stripe"))
);
-
+
return ret;
}
return ret;
}
@@
-193,7
+194,7
@@
Halftone2::accelerated_render(Context context,Surface *surface,int quality, cons
return false;
if(get_amount()==0)
return true;
return false;
if(get_amount()==0)
return true;
-
+
const Real pw(renddesc.get_pw()),ph(renddesc.get_ph());
const Point tl(renddesc.get_tl());
const int w(surface->get_w());
const Real pw(renddesc.get_pw()),ph(renddesc.get_ph());
const Point tl(renddesc.get_tl());
const int w(surface->get_w());
@@
-203,7
+204,7
@@
Halftone2::accelerated_render(Context context,Surface *surface,int quality, cons
Surface::pen pen(surface->begin());
Point pos;
int x,y;
Surface::pen pen(surface->begin());
Point pos;
int x,y;
-
+
if(is_solid_color())
{
for(y=0,pos[1]=tl[1];y<h;y++,pen.inc_y(),pen.dec_x(x),pos[1]+=ph)
if(is_solid_color())
{
for(y=0,pos[1]=tl[1];y<h;y++,pen.inc_y(),pen.dec_x(x),pos[1]+=ph)
@@
-233,7
+234,7
@@
Halftone2::accelerated_render(Context context,Surface *surface,int quality, cons
)
);
}
)
);
}
-
+
// Mark our progress as finished
if(cb && !cb->amount_complete(10000,10000))
return false;
// Mark our progress as finished
if(cb && !cb->amount_complete(10000,10000))
return false;