Author: Carlos Lopez <[email protected]>
Date: Mon Feb 28 11:48:17 2011 +0100
Add two new functions to convert between bezier and bline positions
---
.../src/modules/mod_geometry/advanced_outline.cpp | 22 +++++++++++++++++--
.../src/modules/mod_geometry/advanced_outline.h | 2 +
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/synfig-core/src/modules/mod_geometry/advanced_outline.cpp
b/synfig-core/src/modules/mod_geometry/advanced_outline.cpp
index 61e84ec..ea5eb30 100644
--- a/synfig-core/src/modules/mod_geometry/advanced_outline.cpp
+++ b/synfig-core/src/modules/mod_geometry/advanced_outline.cpp
@@ -319,8 +319,8 @@ Advanced_Outline::sync()
{
Real s(witer->get_norm_position());
Real e(wnext->get_norm_position());
- Real start((s-biter_pos)/bezier_size);
- Real end((e-biter_pos)/bezier_size);
+ Real start(bline_to_bezier(s, biter_pos,
bezier_size));
+ Real end(bline_to_bezier(e, biter_pos,
bezier_size));
Real distance=end-start;
Real increase=distance/SAMPLES;
if(increase < EPSILON) continue;
@@ -328,7 +328,9 @@ Advanced_Outline::sync()
{
const Vector d(deriv(n).perp().norm());
const Vector p(curve(n));
- const float
w(width_*0.5*synfig::widthpoint_interpolate(*witer, *wnext,
biter_pos+n*bezier_size));
+// synfig::info("pos = %f, biter_pos=%f,
bezier_size=%f", n, biter_pos, bezier_size);
+// synfig::info("bline pos = %f",
bezier_to_bline(n, biter_pos, bezier_size));
+ const float
w(width_*0.5*synfig::widthpoint_interpolate(*witer, *wnext, bezier_to_bline(n,
biter_pos, bezier_size)));
side_a.push_back(p+d*w);
side_b.push_back(p-d*w);
}
@@ -562,3 +564,17 @@
Advanced_Outline::connect_bline_to_wplist(etl::loose_handle<ValueNode> x)
synfig::info("set bline success");
return true;
}
+
+
+Real
+Advanced_Outline::bline_to_bezier(Real bline_pos, Real origin, Real
bezier_size)
+{
+ if(bezier_size)
+ return (bline_pos-origin)/bezier_size;
+ return bline_pos;
+}
+Real
+Advanced_Outline::bezier_to_bline(Real bezier_pos, Real origin, Real
bezier_size)
+{
+ return origin+bezier_pos*bezier_size;
+}
diff --git a/synfig-core/src/modules/mod_geometry/advanced_outline.h
b/synfig-core/src/modules/mod_geometry/advanced_outline.h
index d982a93..cb88fe9 100644
--- a/synfig-core/src/modules/mod_geometry/advanced_outline.h
+++ b/synfig-core/src/modules/mod_geometry/advanced_outline.h
@@ -74,6 +74,8 @@ public:
private:
bool connect_bline_to_wplist(etl::loose_handle<ValueNode> x);
+ Real bline_to_bezier(Real bline_pos, Real origin, Real bezier_size);
+ Real bezier_to_bline(Real bezier_pos, Real origin, Real bezier_size);
};
/* === E N D =============================================================== */
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in
Real-Time with Splunk. Collect, index and harness all the fast moving IT data
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business
insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl