projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove assert(o) call because this function
[synfig.git]
/
synfig-core
/
trunk
/
src
/
modules
/
mod_filter
/
halftone3.cpp
diff --git
a/synfig-core/trunk/src/modules/mod_filter/halftone3.cpp
b/synfig-core/trunk/src/modules/mod_filter/halftone3.cpp
index
3677591
..
a2a4283
100644
(file)
--- a/
synfig-core/trunk/src/modules/mod_filter/halftone3.cpp
+++ b/
synfig-core/trunk/src/modules/mod_filter/halftone3.cpp
@@
-1,11
+1,12
@@
/* === S Y N F I G ========================================================= */
/*! \file halftone3.cpp
/* === S Y N F I G ========================================================= */
/*! \file halftone3.cpp
-** \brief
blehh
+** \brief
Implementation of the "Halftone 3" layer
**
** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** 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
@@
-53,8
+54,8
@@
using namespace etl;
SYNFIG_LAYER_INIT(Halftone3);
SYNFIG_LAYER_SET_NAME(Halftone3,"halftone3");
SYNFIG_LAYER_INIT(Halftone3);
SYNFIG_LAYER_SET_NAME(Halftone3,"halftone3");
-SYNFIG_LAYER_SET_LOCAL_NAME(Halftone3,
_("Halftone
3"));
-SYNFIG_LAYER_SET_CATEGORY(Halftone3,_("Filters"));
+SYNFIG_LAYER_SET_LOCAL_NAME(Halftone3,
N_("Halftone
3"));
+SYNFIG_LAYER_SET_CATEGORY(Halftone3,
N
_("Filters"));
SYNFIG_LAYER_SET_VERSION(Halftone3,"0.0");
SYNFIG_LAYER_SET_CVS_ID(Halftone3,"$Id$");
SYNFIG_LAYER_SET_VERSION(Halftone3,"0.0");
SYNFIG_LAYER_SET_CVS_ID(Halftone3,"$Id$");
@@
-74,7
+75,7
@@
Halftone3::Halftone3()
{
tone[i].size=size;
tone[i].type=type;
{
tone[i].size=size;
tone[i].type=type;
- tone[i].o
ffset
=(synfig::Point(0,0));
+ tone[i].o
rigin
=(synfig::Point(0,0));
tone[i].angle=Angle::deg(30.0)*(float)i;
}
tone[i].angle=Angle::deg(30.0)*(float)i;
}
@@
-229,13
+230,13
@@
Halftone3::color_func(const Point &point, float supersample,const Color& in_colo
}
inline float
}
inline float
-Halftone3::calc_supersample(const synfig::Point &
x, float pw,float ph
)const
+Halftone3::calc_supersample(const synfig::Point &
/*x*/, float pw,float /*ph*/
)const
{
return abs(pw/(tone[0].size).mag());
}
synfig::Layer::Handle
{
return abs(pw/(tone[0].size).mag());
}
synfig::Layer::Handle
-Halftone3::hit_check(synfig::Context
context, const synfig::Point &point
)const
+Halftone3::hit_check(synfig::Context
/*context*/, const synfig::Point &/*point*/
)const
{
return const_cast<Halftone3*>(this);
}
{
return const_cast<Halftone3*>(this);
}
@@
-253,13
+254,17
@@
Halftone3::set_param(const String & param, const ValueBase &value)
IMPORT_PLUS(subtractive,sync());
IMPORT(tone[0].angle);
IMPORT_PLUS(subtractive,sync());
IMPORT(tone[0].angle);
- IMPORT(tone[0].o
ffset
);
+ IMPORT(tone[0].o
rigin
);
IMPORT(tone[1].angle);
IMPORT(tone[1].angle);
- IMPORT(tone[1].o
ffset
);
+ IMPORT(tone[1].o
rigin
);
IMPORT(tone[2].angle);
IMPORT(tone[2].angle);
- IMPORT(tone[2].offset);
+ IMPORT(tone[2].origin);
+
+ IMPORT_AS(tone[0].origin,"tone[0].offset");
+ IMPORT_AS(tone[1].origin,"tone[1].offset");
+ IMPORT_AS(tone[2].origin,"tone[2].offset");
return Layer_Composite::set_param(param,value);
}
return Layer_Composite::set_param(param,value);
}
@@
-277,13
+282,13
@@
Halftone3::get_param(const String & param)const
EXPORT(subtractive);
EXPORT(tone[0].angle);
EXPORT(subtractive);
EXPORT(tone[0].angle);
- EXPORT(tone[0].o
ffset
);
+ EXPORT(tone[0].o
rigin
);
EXPORT(tone[1].angle);
EXPORT(tone[1].angle);
- EXPORT(tone[1].o
ffset
);
+ EXPORT(tone[1].o
rigin
);
EXPORT(tone[2].angle);
EXPORT(tone[2].angle);
- EXPORT(tone[2].o
ffset
);
+ EXPORT(tone[2].o
rigin
);
EXPORT_NAME();
EXPORT_VERSION();
EXPORT_NAME();
EXPORT_VERSION();
@@
-320,13
+325,13
@@
Halftone3::get_param_vocab()const
.set_local_name(chan_name+_(" Color"))
);
.set_local_name(chan_name+_(" Color"))
);
- ret.push_back(ParamDesc(strprintf("tone[%d].o
ffset
",i))
- .set_local_name(chan_name+_(" Mask O
ffset
"))
+ ret.push_back(ParamDesc(strprintf("tone[%d].o
rigin
",i))
+ .set_local_name(chan_name+_(" Mask O
rigin
"))
.set_is_distance()
);
ret.push_back(ParamDesc(strprintf("tone[%d].angle",i))
.set_local_name(chan_name+_(" Mask Angle"))
.set_is_distance()
);
ret.push_back(ParamDesc(strprintf("tone[%d].angle",i))
.set_local_name(chan_name+_(" Mask Angle"))
- .set_origin(strprintf("tone[%d].o
ffset
",i))
+ .set_origin(strprintf("tone[%d].o
rigin
",i))
);
}
);
}