X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Frenderer_ducks.cpp;h=fdc648793ea9e8ceea3fe08c95b0ebf917bbab54;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=8c3dd3e0f249cad3360c349085cb7886ef2d5ab9;hpb=80031a8a28bb53f89ad750ec94a1b447b419d616;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp b/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp index 8c3dd3e..fdc6487 100644 --- a/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp +++ b/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp @@ -7,6 +7,7 @@ ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** Copyright (c) 2007, 2008 Chris Moore +** Copyright (c) 2008 Gerald Young ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -37,8 +38,6 @@ #include #include "widget_color.h" #include -#include -#include #include "app.h" #include "general.h" @@ -60,45 +59,6 @@ using namespace studio; /* === M E T H O D S ======================================================= */ -bool -restrict_blinevertex_duck(etl::handle duck, WorkArea& w_area, synfig::Point *point) -{ - synfig::Point sub_trans_origin(duck->get_sub_trans_origin()); - etl::handle origin_duck = duck->get_origin_duck(); - bool origin_changed = false; - if(origin_duck) - origin_changed = restrict_blinevertex_duck(origin_duck, w_area, &sub_trans_origin); - - if( ValueNode_BLineCalcVertex::Handle bline_vertex = - ValueNode_BLineCalcVertex::Handle::cast_dynamic(duck->get_value_desc().get_value_node()) - ) - { - synfig::Point closest_point = duck->get_point(); - synfig::Real radius = 0.0; - synfig::find_closest_point( - ( *bline_vertex->get_link(bline_vertex->get_link_index_from_name("bline")) )( w_area.get_time() ), - duck->get_point(), - radius, - ( *bline_vertex->get_link(bline_vertex->get_link_index_from_name("loop")) )( w_area.get_time() ).get(bool()), - &closest_point - ); - - if(closest_point != duck->get_point()) - { - *point = closest_point * duck->get_scalar() + sub_trans_origin; - return true; - } - } - - if(origin_changed) - { - *point = duck->get_point() * duck->get_scalar() + sub_trans_origin; - return true; - } - - return false; -} - Renderer_Ducks::~Renderer_Ducks() { } @@ -181,22 +141,11 @@ Renderer_Ducks::render_vfunc( // Render the beziers for(std::list >::const_iterator iter=bezier_list.begin();iter!=bezier_list.end();++iter) { - Point sub_trans_p1((*iter)->p1->get_sub_trans_point()); - Point sub_trans_p2((*iter)->p2->get_sub_trans_point()); - Point sub_trans_c1((*iter)->c1->get_sub_trans_point()); - Point sub_trans_c2((*iter)->c2->get_sub_trans_point()); - - WorkArea* w_area = get_work_area(); - restrict_blinevertex_duck((*iter)->p1, *w_area, &sub_trans_p1); - restrict_blinevertex_duck((*iter)->p2, *w_area, &sub_trans_p2); - restrict_blinevertex_duck((*iter)->c1, *w_area, &sub_trans_c1); - restrict_blinevertex_duck((*iter)->c2, *w_area, &sub_trans_c2); - Point window_start(window_startx,window_starty); - Point p1((*iter)->p1->get_transform_stack().perform(sub_trans_p1)-window_start); - Point p2((*iter)->p2->get_transform_stack().perform(sub_trans_p2)-window_start); - Point c1((*iter)->c1->get_transform_stack().perform(sub_trans_c1)-window_start); - Point c2((*iter)->c2->get_transform_stack().perform(sub_trans_c2)-window_start); + Point p1((*iter)->p1->get_trans_point()-window_start); + Point p2((*iter)->p2->get_trans_point()-window_start); + Point c1((*iter)->c1->get_trans_point()-window_start); + Point c2((*iter)->c2->get_trans_point()-window_start); p1[0]/=pw;p1[1]/=ph; p2[0]/=pw;p2[1]/=ph; c1[0]/=pw;c1[1]/=ph; @@ -263,20 +212,6 @@ Renderer_Ducks::render_vfunc( // Gdk::Rectangle area; Point sub_trans_point((*iter)->get_sub_trans_point()); Point sub_trans_origin((*iter)->get_sub_trans_origin()); - etl::handle origin_duck = (*iter)->get_origin_duck(); - - bool has_connect(false); - if((*iter)->get_tangent() || (*iter)->get_type()&Duck::TYPE_ANGLE) - { - has_connect=true; - } - if((*iter)->get_connect_duck()) - { - has_connect=true; - sub_trans_origin = (*iter)->get_connect_duck()->get_sub_trans_point(); - origin_duck = (*iter)->get_connect_duck(); - } - if (App::restrict_radius_ducks && (*iter)->is_radius()) @@ -287,17 +222,23 @@ Renderer_Ducks::render_vfunc( sub_trans_point[1] = sub_trans_origin[1]; } - WorkArea* w_area = get_work_area(); - restrict_blinevertex_duck((*iter), *w_area, &sub_trans_point); - if(origin_duck) - restrict_blinevertex_duck(origin_duck, *w_area, &sub_trans_origin); - Point point((*iter)->get_transform_stack().perform(sub_trans_point)); Point origin((*iter)->get_transform_stack().perform(sub_trans_origin)); point[0]=(point[0]-window_startx)/pw; point[1]=(point[1]-window_starty)/ph; + bool has_connect(false); + if((*iter)->get_tangent() || (*iter)->get_type()&Duck::TYPE_ANGLE) + { + has_connect=true; + } + if((*iter)->get_connect_duck()) + { + has_connect=true; + origin=(*iter)->get_connect_duck()->get_trans_point(); + } + origin[0]=(origin[0]-window_startx)/pw; origin[1]=(origin[1]-window_starty)/ph; @@ -309,7 +250,9 @@ Renderer_Ducks::render_vfunc( if(get_work_area()->get_selected_value_node()) { synfigapp::ValueDesc value_desc((*iter)->get_value_desc()); - if(value_desc.is_valid() && value_desc.is_value_node() && get_work_area()->get_selected_value_node()==value_desc.get_value_node()) + if (value_desc.is_valid() && + ((value_desc.is_value_node() && get_work_area()->get_selected_value_node() == value_desc.get_value_node()) || + (value_desc.parent_is_value_node() && get_work_area()->get_selected_value_node() == value_desc.get_parent_value_node()))) { gc->set_function(Gdk::COPY); gc->set_rgb_fg_color(DUCK_COLOR_SELECTED);