-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
/*! \file halftone2.cpp
-** \brief blehh
+** \brief Implementation of the "Halftone 2" layer
**
-** $Id: halftone2.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $
+** $Id$
**
** \legal
-** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007 Chris Moore
**
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+** This package is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License as
+** published by the Free Software Foundation; either version 2 of
+** the License, or (at your option) any later version.
**
-** You may not copy, print, publish, or in any
-** other way distribute this software without
-** a prior written agreement with
-** the copyright holder.
+** This package is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+** General Public License for more details.
** \endlegal
*/
/* ========================================================================= */
#include "halftone2.h"
#include "halftone.h"
-#include <sinfg/string.h>
-#include <sinfg/time.h>
-#include <sinfg/context.h>
-#include <sinfg/paramdesc.h>
-#include <sinfg/renddesc.h>
-#include <sinfg/surface.h>
-#include <sinfg/value.h>
-#include <sinfg/valuenode.h>
+#include <synfig/string.h>
+#include <synfig/time.h>
+#include <synfig/context.h>
+#include <synfig/paramdesc.h>
+#include <synfig/renddesc.h>
+#include <synfig/surface.h>
+#include <synfig/value.h>
+#include <synfig/valuenode.h>
#endif
/* === M A C R O S ========================================================= */
-using namespace sinfg;
+using namespace synfig;
using namespace std;
using namespace etl;
/* === G L O B A L S ======================================================= */
-SINFG_LAYER_INIT(Halftone2);
-SINFG_LAYER_SET_NAME(Halftone2,"halftone2");
-SINFG_LAYER_SET_LOCAL_NAME(Halftone2,_("Halftone2"));
-SINFG_LAYER_SET_CATEGORY(Halftone2,_("Filters"));
-SINFG_LAYER_SET_VERSION(Halftone2,"0.0");
-SINFG_LAYER_SET_CVS_ID(Halftone2,"$Id: halftone2.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $");
+SYNFIG_LAYER_INIT(Halftone2);
+SYNFIG_LAYER_SET_NAME(Halftone2,"halftone2");
+SYNFIG_LAYER_SET_LOCAL_NAME(Halftone2,N_("Halftone 2"));
+SYNFIG_LAYER_SET_CATEGORY(Halftone2,N_("Filters"));
+SYNFIG_LAYER_SET_VERSION(Halftone2,"0.0");
+SYNFIG_LAYER_SET_CVS_ID(Halftone2,"$Id$");
/* === P R O C E D U R E S ================================================= */
color_dark(Color::black()),
color_light(Color::white())
{
- halftone.offset=(sinfg::Point(0,0));
- halftone.size=(sinfg::Vector(0.25,0.25));
+ halftone.origin=(synfig::Point(0,0));
+ halftone.size=(synfig::Vector(0.25,0.25));
halftone.angle=(Angle::zero());
halftone.type=TYPE_SYMMETRIC;
-
+
set_blend_method(Color::BLEND_STRAIGHT);
}
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
-Halftone2::calc_supersample(const sinfg::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());
}
-sinfg::Layer::Handle
-Halftone2::hit_check(sinfg::Context context, const sinfg::Point &point)const
+synfig::Layer::Handle
+Halftone2::hit_check(synfig::Context /*context*/, const synfig::Point &/*point*/)const
{
return const_cast<Halftone2*>(this);
}
IMPORT_AS(halftone.size,"size");
IMPORT_AS(halftone.type,"type");
IMPORT_AS(halftone.angle,"angle");
- IMPORT_AS(halftone.offset,"offset");
-
- return Layer_Composite::set_param(param,value);
+ IMPORT_AS(halftone.origin,"origin");
+
+ IMPORT_AS(halftone.origin,"offset");
+
+ return Layer_Composite::set_param(param,value);
}
ValueBase
EXPORT_AS(halftone.size,"size");
EXPORT_AS(halftone.type,"type");
EXPORT_AS(halftone.angle,"angle");
- EXPORT_AS(halftone.offset,"offset");
+ EXPORT_AS(halftone.origin,"origin");
EXPORT(color_dark);
EXPORT(color_light);
-
+
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());
-
- ret.push_back(ParamDesc("offset")
- .set_local_name(_("Mask Offset"))
+
+ ret.push_back(ParamDesc("origin")
+ .set_local_name(_("Mask Origin"))
.set_is_distance()
);
ret.push_back(ParamDesc("angle")
.set_local_name(_("Mask Angle"))
- .set_origin("offset")
+ .set_origin("origin")
);
ret.push_back(ParamDesc("size")
.set_local_name(_("Mask Size"))
.set_is_distance()
- .set_origin("offset")
+ .set_origin("origin")
);
ret.push_back(ParamDesc("color_light")
.set_local_name(_("Light Color"))
.add_enum_value(TYPE_DIAMOND,"diamond",_("Diamond"))
.add_enum_value(TYPE_STRIPE,"stripe",_("Stripe"))
);
-
+
return ret;
}
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());
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)
)
);
}
-
+
// Mark our progress as finished
if(cb && !cb->amount_complete(10000,10000))
return false;