X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_draw.cpp;h=8a0a1fe8c7614d95f42e0d54e46e44a798858d79;hb=e1d49ec4e60734d4e4f06e5fc522c0bc0d7762db;hp=a2b2a760dd4c5faf0dd20f30acb504dbff8001f5;hpb=c4b515f0ac0728ef173e6028c73c26137c91f579;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/state_draw.cpp b/synfig-studio/trunk/src/gtkmm/state_draw.cpp index a2b2a76..8a0a1fe 100644 --- a/synfig-studio/trunk/src/gtkmm/state_draw.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_draw.cpp @@ -675,21 +675,20 @@ StateDraw_Context::new_bline(std::list bline,bool loop_bline Vector shift_offset_vector; bool join_start_no_extend=false,join_finish_no_extend=false; synfigapp::ValueDesc start_duck_value_desc,finish_duck_value_desc; + bool extend_start=false,extend_finish=false,complete_loop=false; + bool extend_start_join_same=false,extend_start_join_different=false; + bool extend_finish_join_same=false,extend_finish_join_different=false; + int start_duck_index,finish_duck_index; + ValueNode_BLine::Handle start_duck_value_node_bline=NULL,finish_duck_value_node_bline=NULL; // Find any ducks at the start or end that we might attach to // (this used to only run if we aren't a loop - ie. !loop_bline_flag // but having loops auto-connect can be useful as well) if(get_auto_connect_flag()) { - bool extend_start=false,extend_finish=false,complete_loop=false; - bool extend_start_join_same=false,extend_start_join_different=false,extend_finish_join_same=false,extend_finish_join_different=false; - int start_duck_index,finish_duck_index; - etl::handle start_duck(get_work_area()->find_duck(bline.front().get_vertex(),radius,Duck::TYPE_VERTEX)); etl::handle finish_duck(get_work_area()->find_duck(bline.back().get_vertex(),radius,Duck::TYPE_VERTEX)); - ValueNode_BLine::Handle start_duck_value_node_bline=NULL,finish_duck_value_node_bline=NULL; - // check whether the start of the new line extends an // existing line. this is only the case if the new // line isn't a self-contained loop, and if the new @@ -705,7 +704,11 @@ StateDraw_Context::new_bline(std::list bline,bool loop_bline // don't extend looped blines if(start_duck_value_node_bline&&!start_duck_value_node_bline->get_loop()&& (start_duck_index==0||start_duck_index==start_duck_value_node_bline->link_count()-1)) + { extend_start=true; + shift_offset=true; + shift_offset_vector=start_duck->get_origin(); + } }while(0); // check whether the end of the new line extends an @@ -730,8 +733,11 @@ StateDraw_Context::new_bline(std::list bline,bool loop_bline // of the same bline, only extend the one we started on if(start_duck_value_node_bline==finish_duck_value_node_bline) complete_loop=extend_finish=true; - }else + }else{ extend_finish=true; + shift_offset=true; + shift_offset_vector=finish_duck->get_origin(); + } }while(0); // if the new line's start didn't extend an existing line, @@ -743,6 +749,8 @@ StateDraw_Context::new_bline(std::list bline,bool loop_bline start_duck_value_desc=synfigapp::ValueDesc(LinkableValueNode::Handle::cast_dynamic(start_duck_value_desc.get_value_node()),0); // fall through case synfig::ValueBase::TYPE_VECTOR: + if (shift_offset && shift_offset_vector != start_duck->get_origin()) + break; shift_offset = true; shift_offset_vector = start_duck->get_origin(); get_canvas_interface()->auto_export(start_duck_value_desc); @@ -782,74 +790,12 @@ StateDraw_Context::new_bline(std::list bline,bool loop_bline // fall through default:break; } - - Smach::event_result result; - synfig::ValueNode_DynamicList::ListEntry source; - int target_index; - - // the new line's start extends an existing line - if(extend_start) - { - if(complete_loop)bline.pop_back(); - bline.pop_front(); - if(start_duck_index==0) - { // We need to reverse the BLine first. - reverse_bline(bline); - result=extend_bline_from_begin(start_duck_value_node_bline,bline,complete_loop); - source=start_duck_value_node_bline->list.front(); - target_index=bline.size()+finish_duck_index; - } - else - { - result=extend_bline_from_end(start_duck_value_node_bline,bline,complete_loop); - source=start_duck_value_node_bline->list.back(); - target_index=finish_duck_index; - } - - if(extend_start_join_different) - LinkableValueNode::Handle::cast_dynamic(source.value_node)-> - set_link(0,finish_duck_value_desc.get_value_node()); - else if(extend_start_join_same) - LinkableValueNode::Handle::cast_dynamic(source.value_node)-> - set_link(0,synfigapp::ValueDesc(LinkableValueNode::Handle::cast_dynamic(start_duck_value_node_bline-> - list[target_index].value_node),0).get_value_node()); - return result; - } - - // the new line's end extends an existing line - if(extend_finish) - { // SPECIAL CASE -- EXTENSION - bline.pop_back(); - if(finish_duck_index==0) - { - result=extend_bline_from_begin(finish_duck_value_node_bline,bline,false); - source=finish_duck_value_node_bline->list.front(); - target_index=bline.size()+start_duck_index; - } - else - { // We need to reverse the BLine first. - reverse_bline(bline); - result=extend_bline_from_end(finish_duck_value_node_bline,bline,false); - source=finish_duck_value_node_bline->list.back(); - target_index=start_duck_index; - } - - if(extend_finish_join_different) - LinkableValueNode::Handle::cast_dynamic(source.value_node)-> - set_link(0,start_duck_value_desc.get_value_node()); - else if(extend_finish_join_same) - LinkableValueNode::Handle::cast_dynamic(source.value_node)-> - set_link(0,synfigapp::ValueDesc(LinkableValueNode::Handle::cast_dynamic(finish_duck_value_node_bline-> - list[target_index].value_node),0).get_value_node()); - return result; - } } - //ValueNode_BLine::Handle value_node(ValueNode_BLine::create(synfig::ValueBase(bline,loop_bline_flag))); ValueNode_BLine::Handle value_node; + std::list trans_bline; { - std::list trans_bline; std::list::iterator iter; const synfig::TransformStack& transform(get_canvas_view()->get_curr_transform_stack()); @@ -871,9 +817,7 @@ StateDraw_Context::new_bline(std::list bline,bool loop_bline ); if (shift_offset) - { - new_vertex = new_vertex - shift_offset_vector; - } + new_vertex=new_vertex-shift_offset_vector; bline_point.set_vertex(new_vertex); @@ -882,17 +826,74 @@ StateDraw_Context::new_bline(std::list bline,bool loop_bline value_node=ValueNode_BLine::create(synfig::ValueBase(trans_bline,loop_bline_flag)); } + Smach::event_result result; + synfig::ValueNode_DynamicList::ListEntry source; + int target_index; + + // the new line's start extends an existing line + if(extend_start) + { + if(complete_loop)trans_bline.pop_back(); + trans_bline.pop_front(); + if(start_duck_index==0) + { // We need to reverse the BLine first. + reverse_bline(trans_bline); + result=extend_bline_from_begin(start_duck_value_node_bline,trans_bline,complete_loop); + source=start_duck_value_node_bline->list.front(); + target_index=trans_bline.size()+finish_duck_index; + } + else + { + result=extend_bline_from_end(start_duck_value_node_bline,trans_bline,complete_loop); + source=start_duck_value_node_bline->list.back(); + target_index=finish_duck_index; + } + + if(extend_start_join_different) + LinkableValueNode::Handle::cast_dynamic(source.value_node)-> + set_link(0,finish_duck_value_desc.get_value_node()); + else if(extend_start_join_same) + LinkableValueNode::Handle::cast_dynamic(source.value_node)-> + set_link(0,synfigapp::ValueDesc(LinkableValueNode::Handle::cast_dynamic(start_duck_value_node_bline-> + list[target_index].value_node),0).get_value_node()); + return result; + } + + // the new line's end extends an existing line + if(extend_finish) + { // SPECIAL CASE -- EXTENSION + trans_bline.pop_back(); + if(finish_duck_index==0) + { + result=extend_bline_from_begin(finish_duck_value_node_bline,trans_bline,false); + source=finish_duck_value_node_bline->list.front(); + target_index=trans_bline.size()+start_duck_index; + } + else + { // We need to reverse the BLine first. + reverse_bline(trans_bline); + result=extend_bline_from_end(finish_duck_value_node_bline,trans_bline,false); + source=finish_duck_value_node_bline->list.back(); + target_index=start_duck_index; + } + + if(extend_finish_join_different) + LinkableValueNode::Handle::cast_dynamic(source.value_node)-> + set_link(0,start_duck_value_desc.get_value_node()); + else if(extend_finish_join_same) + LinkableValueNode::Handle::cast_dynamic(source.value_node)-> + set_link(0,synfigapp::ValueDesc(LinkableValueNode::Handle::cast_dynamic(finish_duck_value_node_bline-> + list[target_index].value_node),0).get_value_node()); + return result; + } + if (join_start_no_extend) - { - LinkableValueNode::Handle::cast_dynamic(value_node->list.front().value_node)-> - set_link(0,start_duck_value_desc.get_value_node()); - } + LinkableValueNode::Handle::cast_dynamic(value_node->list.front().value_node)-> + set_link(0,start_duck_value_desc.get_value_node()); if (join_finish_no_extend) - { - LinkableValueNode::Handle::cast_dynamic(value_node->list.back().value_node)-> - set_link(0,finish_duck_value_desc.get_value_node()); - } + LinkableValueNode::Handle::cast_dynamic(value_node->list.back().value_node)-> + set_link(0,finish_duck_value_desc.get_value_node()); // Create the layer { @@ -1311,10 +1312,8 @@ StateDraw_Context::extend_bline_from_begin(ValueNode_BLine::Handle value_node,st } std::list::reverse_iterator iter; - iter=bline.rbegin(); - for(;!(iter==bline.rend());++iter) + for(iter=bline.rbegin();!(iter==bline.rend());++iter) { - //iter->reverse(); ValueNode_Composite::Handle composite(ValueNode_Composite::create(*iter)); synfigapp::Action::Handle action(synfigapp::Action::create("value_node_dynamic_list_insert")); @@ -1364,8 +1363,7 @@ StateDraw_Context::extend_bline_from_end(ValueNode_BLine::Handle value_node,std: } std::list::iterator iter; - iter=bline.begin(); - for(;iter!=bline.end();++iter) + for(iter=bline.begin();iter!=bline.end();++iter) { ValueNode_Composite::Handle composite(ValueNode_Composite::create(*iter));