Revision: 2166
http://synfig.svn.sourceforge.net/synfig/?rev=2166&view=rev
Author: dooglus
Date: 2008-11-07 17:17:30 +0000 (Fri, 07 Nov 2008)
Log Message:
-----------
Using 'width' for the perpendicular scaling factor causes the parameter to be
initialised from the toolbox. This isn't ideal, so I renamed the parameter in
the code.
Modified Paths:
--------------
synfig-core/trunk/src/modules/lyr_std/curvewarp.cpp
synfig-core/trunk/src/modules/lyr_std/curvewarp.h
Modified: synfig-core/trunk/src/modules/lyr_std/curvewarp.cpp
===================================================================
--- synfig-core/trunk/src/modules/lyr_std/curvewarp.cpp 2008-11-07 16:58:35 UTC
(rev 2165)
+++ synfig-core/trunk/src/modules/lyr_std/curvewarp.cpp 2008-11-07 17:17:30 UTC
(rev 2166)
@@ -159,7 +159,7 @@
CurveWarp::CurveWarp():
origin(0,0),
- width(1),
+ perp_width(1),
start_point(-3,-1),
end_point(3,1),
fast(true)
@@ -306,7 +306,7 @@
synfig::BLinePoint start(bline[0]);
// Point a(start.get_vertex());
tangent = start.get_tangent1().norm();
- diff = tangent.perp()*thickness*width;
+ diff = tangent.perp()*thickness*perp_width;
len = (point_-origin - p1)*tangent;
}
else
@@ -315,7 +315,7 @@
iter=bline.end();
iter--;
tangent = iter->get_tangent2().norm();
- diff = tangent.perp()*thickness*width;
+ diff = tangent.perp()*thickness*perp_width;
len = (point_-origin - p1)*tangent + curve_length_;
}
}
@@ -323,10 +323,10 @@
{
diff=(p1-(point_-origin));
if(diff*tangent.perp()<0) diff=-diff;
- diff=diff.norm()*thickness*width;
+ diff=diff.norm()*thickness*perp_width;
}
else
- diff=tangent.perp()*thickness*width;
+ diff=tangent.perp()*thickness*perp_width;
const Real mag(diff.inv_mag());
supersample=supersample*mag;
@@ -357,7 +357,7 @@
IMPORT(start_point);
IMPORT(end_point);
IMPORT(fast);
- IMPORT(width);
+ IMPORT(perp_width);
if(param=="bline" && value.get_type()==ValueBase::TYPE_LIST)
{
@@ -380,7 +380,7 @@
EXPORT(end_point);
EXPORT(bline);
EXPORT(fast);
- EXPORT(width);
+ EXPORT(perp_width);
EXPORT_NAME();
EXPORT_VERSION();
@@ -396,7 +396,7 @@
ret.push_back(ParamDesc("origin")
.set_local_name(_("Origin")));
- ret.push_back(ParamDesc("width")
+ ret.push_back(ParamDesc("perp_width")
.set_local_name(_("Width")));
ret.push_back(ParamDesc("start_point")
Modified: synfig-core/trunk/src/modules/lyr_std/curvewarp.h
===================================================================
--- synfig-core/trunk/src/modules/lyr_std/curvewarp.h 2008-11-07 16:58:35 UTC
(rev 2165)
+++ synfig-core/trunk/src/modules/lyr_std/curvewarp.h 2008-11-07 17:17:30 UTC
(rev 2166)
@@ -53,7 +53,7 @@
std::vector<synfig::BLinePoint> bline;
Point origin;
- Real width;
+ Real perp_width;
Point start_point;
Point end_point;
Real curve_length_;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
