projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename all 'offset' parameters to 'origin'.
[synfig.git]
/
synfig-core
/
trunk
/
src
/
modules
/
mod_gradient
/
curvegradient.cpp
diff --git
a/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp
b/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp
index
b0c0c35
..
7a489b7
100644
(file)
--- a/
synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp
+++ b/
synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp
@@
-203,7
+203,7
@@
CurveGradient::sync()
CurveGradient::CurveGradient():
CurveGradient::CurveGradient():
- o
ffset
(0,0),
+ o
rigin
(0,0),
width(0.25),
gradient(Color::black(), Color::white()),
loop(false),
width(0.25),
gradient(Color::black(), Color::white()),
loop(false),
@@
-251,7
+251,7
@@
CurveGradient::color_func(const Point &point_, int quality, float supersample)co
else
{
float t;
else
{
float t;
- Point point(point_-o
ffset
);
+ Point point(point_-o
rigin
);
std::vector<synfig::BLinePoint>::const_iterator iter,next;
std::vector<synfig::BLinePoint>::const_iterator iter,next;
@@
-362,14
+362,14
@@
CurveGradient::color_func(const Point &point_, int quality, float supersample)co
const Real mag(diff.inv_mag());
supersample=supersample*mag;
diff*=mag*mag;
const Real mag(diff.inv_mag());
supersample=supersample*mag;
diff*=mag*mag;
- dist=((point_-o
ffset
)*diff-p1*diff);
+ dist=((point_-o
rigin
)*diff-p1*diff);
}
}
else // not perpendicular
{
if (edge_case)
{
}
}
else // not perpendicular
{
if (edge_case)
{
- diff=(p1-(point_-o
ffset
));
+ diff=(p1-(point_-o
rigin
));
if(diff*tangent.perp()<0) diff=-diff;
diff=diff.norm()*thickness*width;
}
if(diff*tangent.perp()<0) diff=-diff;
diff=diff.norm()*thickness*width;
}
@@
-380,7
+380,7
@@
CurveGradient::color_func(const Point &point_, int quality, float supersample)co
const Real mag(diff.inv_mag());
supersample=supersample*mag;
diff*=mag*mag;
const Real mag(diff.inv_mag());
supersample=supersample*mag;
diff*=mag*mag;
- dist=((point_-o
ffset
)*diff-p1*diff);
+ dist=((point_-o
rigin
)*diff-p1*diff);
}
if(loop)
}
if(loop)
@@
-440,7
+440,7
@@
CurveGradient::set_param(const String & param, const ValueBase &value)
{
{
- IMPORT(o
ffset
);
+ IMPORT(o
rigin
);
IMPORT(perpendicular);
IMPORT(fast);
IMPORT(perpendicular);
IMPORT(fast);
@@
-457,13
+457,16
@@
CurveGradient::set_param(const String & param, const ValueBase &value)
IMPORT(gradient);
IMPORT(loop);
IMPORT(zigzag);
IMPORT(gradient);
IMPORT(loop);
IMPORT(zigzag);
+
+ IMPORT_AS(origin,"offset");
+
return Layer_Composite::set_param(param,value);
}
ValueBase
CurveGradient::get_param(const String & param)const
{
return Layer_Composite::set_param(param,value);
}
ValueBase
CurveGradient::get_param(const String & param)const
{
- EXPORT(o
ffset
);
+ EXPORT(o
rigin
);
EXPORT(bline);
EXPORT(gradient);
EXPORT(loop);
EXPORT(bline);
EXPORT(gradient);
EXPORT(loop);
@@
-483,8
+486,8
@@
CurveGradient::get_param_vocab()const
{
Layer::Vocab ret(Layer_Composite::get_param_vocab());
{
Layer::Vocab ret(Layer_Composite::get_param_vocab());
- ret.push_back(ParamDesc("o
ffset
")
- .set_local_name(_("O
ffset
")));
+ ret.push_back(ParamDesc("o
rigin
")
+ .set_local_name(_("O
rigin
")));
ret.push_back(ParamDesc("width")
.set_is_distance()
ret.push_back(ParamDesc("width")
.set_is_distance()
@@
-492,7
+495,7
@@
CurveGradient::get_param_vocab()const
ret.push_back(ParamDesc("bline")
.set_local_name(_("Vertices"))
ret.push_back(ParamDesc("bline")
.set_local_name(_("Vertices"))
- .set_origin("o
ffset
")
+ .set_origin("o
rigin
")
.set_hint("width")
.set_description(_("A list of BLine Points")));
.set_hint("width")
.set_description(_("A list of BLine Points")));