Module: synfig/synfig Branch: genete_width_outline Commit: b33a451877bb9fcc396cbedb7ed3f0da2c847306 URL: http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig/synfig;a=commit;h=b33a451877bb9fcc396cbedb7ed3f0da2c847306
Author: Carlos Lopez <[email protected]> Date: Sun Jan 23 18:02:14 2011 +0100 Store the bline handle in the ValueNode_WPList --- .../src/modules/mod_geometry/advanced_outline.cpp | 27 +++++-------------- synfig-core/src/synfig/valuenode_wplist.cpp | 15 ++++++++++- synfig-core/src/synfig/valuenode_wplist.h | 7 +++++ 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/synfig-core/src/modules/mod_geometry/advanced_outline.cpp b/synfig-core/src/modules/mod_geometry/advanced_outline.cpp index 9734987..335a9e3 100644 --- a/synfig-core/src/modules/mod_geometry/advanced_outline.cpp +++ b/synfig-core/src/modules/mod_geometry/advanced_outline.cpp @@ -50,10 +50,12 @@ #include <synfig/valuenode_composite.h> #include <synfig/valuenode_blinecalcvertex.h> + #endif using namespace etl; + /* === M A C R O S ========================================================= */ #define SAMPLES 50 #define ROUND_END_FACTOR (4) @@ -423,9 +425,9 @@ Advanced_Outline::connect_bline_to_wplist(etl::loose_handle<ValueNode> x) synfig::info("Not a list"); return false; } - if(ValueNode_DynamicList::Handle::cast_static(x)->get_contained_type() != ValueBase::TYPE_BLINEPOINT) + if((*x)(Time(0)).get_list().front().get_type() != ValueBase::TYPE_BLINEPOINT) { - synfig::info("Not blinepoints!"); + synfig::info("No blinepoints!"); return false; } ValueNode::LooseHandle vnode; @@ -435,29 +437,14 @@ Advanced_Outline::connect_bline_to_wplist(etl::loose_handle<ValueNode> x) synfig::warning("WPList doesn't exists yet"); return false; } - ValueNode_WPList::LooseHandle wplist(ValueNode_WPList::Handle::cast_dynamic(iter->second)); + ValueNode_WPList::Handle wplist(ValueNode_WPList::Handle::cast_dynamic(iter->second)); if(!wplist) { synfig::info("WPList is not ready: NULL"); return false; } - int i; if(!wplist->link_count()) - { - synfig::info("WPList::link_count()=0"); - return false; - } - for(i=0;i<wplist->link_count();i++) - { - ValueNode_Composite::LooseHandle compo(ValueNode_Composite::Handle::cast_dynamic(wplist->get_link(i))); - ValueNode::LooseHandle hidden_vertex(compo->get_link("hidden_vertex")); - if(!hidden_vertex) - { - synfig::warning("Unable to retrieve WPList::hidden vertex Handle!"); - return false; - } - if(!ValueNode_BLineCalcVertex::Handle::cast_dynamic(hidden_vertex)) - synfig::info("hidden vertex reached, not converted"); - } + synfig::warning("Advanced_Outline::connect_bline_to_wplist: WPList::link_count()=0"); + wplist->set_bline(ValueNode::Handle(x)); return true; } diff --git a/synfig-core/src/synfig/valuenode_wplist.cpp b/synfig-core/src/synfig/valuenode_wplist.cpp index 9ae3f7b..82de581 100644 --- a/synfig-core/src/synfig/valuenode_wplist.cpp +++ b/synfig-core/src/synfig/valuenode_wplist.cpp @@ -160,7 +160,7 @@ ValueNode_WPList::create_list_entry(Real position, Time time) } ValueNode_WPList::ListEntry -ValueNode_WPList::create_list_entry(int index, Time /*time*/, Real /*origin*/) +ValueNode_WPList::create_list_entry(int /*index*/, Time /*time*/, Real /*origin*/) { // Initially all the width points are created at 0.0 // TODO: take the decision on what to call on valuenodedynamiclistinsert action @@ -355,3 +355,16 @@ ValueNode_WPList::interpolate(WidthPoint& prev, WidthPoint& next, Real position) return rw; } + +ValueNode::LooseHandle +ValueNode_WPList::get_bline() +{ + return bline_; +} + +void +ValueNode_WPList::set_bline(ValueNode::Handle b) +{ + bline_=b; + // TODO: sync the wplist with the new bline +} diff --git a/synfig-core/src/synfig/valuenode_wplist.h b/synfig-core/src/synfig/valuenode_wplist.h index b99320a..6888862 100644 --- a/synfig-core/src/synfig/valuenode_wplist.h +++ b/synfig-core/src/synfig/valuenode_wplist.h @@ -55,10 +55,13 @@ synfig::ValueBase convert_bline_to_wplist(const ValueBase& bline); */ class ValueNode_WPList : public ValueNode_DynamicList { +private: + ValueNode::RHandle bline_; public: typedef etl::handle<ValueNode_WPList> Handle; typedef etl::handle<const ValueNode_WPList> ConstHandle; + typedef etl::handle<const ValueNode_WPList> LooseHandle; ValueNode_WPList(); public: @@ -95,6 +98,10 @@ public: //! \param position the position to interpolate between prev and next //! \return the interpolated width based on surrounding width points and its values Real interpolate(WidthPoint& prev, WidthPoint& next, Real position)const; + //! Gets the bline RHandle + ValueNode::LooseHandle get_bline(); + //! Sets the bline RHandle + void set_bline(ValueNode::Handle b); protected: ------------------------------------------------------------------------------ Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d _______________________________________________ Synfig-devl mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/synfig-devl
