X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Fsrc%2Fgtkmm%2Fduck.cpp;h=da571f6c5ca0d5cf4fec87317c169a11ae533339;hb=96b814d7b04e228bf69cea0ba4a2da0295d83fda;hp=da328977369b5818a2f9864a0829dbeda005ae00;hpb=1b0547169603e911e37bf1f3d56ceb023b87cc91;p=synfig.git

diff --git a/synfig-studio/src/gtkmm/duck.cpp b/synfig-studio/src/gtkmm/duck.cpp
index da32897..da571f6 100644
--- a/synfig-studio/src/gtkmm/duck.cpp
+++ b/synfig-studio/src/gtkmm/duck.cpp
@@ -217,13 +217,13 @@ Duck::set_sub_trans_point(const synfig::Point &x, const synfig::Time &time)
 		Angle change = get_point().angle() - old_angle;
 		while (change < Angle::deg(-180)) change += Angle::deg(360);
 		while (change > Angle::deg(180)) change -= Angle::deg(360);
-		int old_halves = round_to_int(Angle::deg(rotations).get()/180);
+		//int old_halves = round_to_int(Angle::deg(rotations).get()/180);
 		rotations += change;
-		int new_halves = round_to_int(Angle::deg(rotations).get()/180);
-		if (old_halves != new_halves &&
+		//int new_halves = round_to_int(Angle::deg(rotations).get()/180);
+		/*if (old_halves != new_halves &&
 			(new_halves > 1 || new_halves < -1 ||
 			 old_halves > 1 || old_halves < -1))
-			synfig::info("rotation: %.2f turns", new_halves/2.0);
+			synfig::info("rotation: %.2f turns", new_halves/2.0)*/;
 	} else if(get_type() == Duck::TYPE_VERTEX || get_type() == Duck::TYPE_POSITION)
 	{
 		set_point((x-get_sub_trans_origin())/get_scalar());
@@ -251,56 +251,6 @@ Duck::set_sub_trans_point(const synfig::Point &x, const synfig::Time &time)
 	else set_point((x-get_sub_trans_origin())/get_scalar());
 }
 
-//! Updates width and tangent ducks that change when the origin moves
-void
-Duck::update(const synfig::Time &time)
-{
-	if((get_type() == Duck::TYPE_TANGENT || get_type() == Duck::TYPE_WIDTH || get_type() == Duck::TYPE_ANGLE) && origin_duck)
-	{
-		ValueNode_BLineCalcVertex::Handle bline_vertex;
-		ValueNode_Composite::Handle composite;
-		if ((bline_vertex = ValueNode_BLineCalcVertex::Handle::cast_dynamic(origin_duck->get_value_desc().get_value_node())) ||
-			((composite = ValueNode_Composite::Handle::cast_dynamic(origin_duck->get_value_desc().get_value_node())) &&
-			 composite->get_type() == ValueBase::TYPE_BLINEPOINT &&
-			 (bline_vertex = ValueNode_BLineCalcVertex::Handle::cast_dynamic(composite->get_link("point")))))
-		{
-			synfig::Real radius = 0.0;
-			ValueNode_BLine::Handle bline(ValueNode_BLine::Handle::cast_dynamic(bline_vertex->get_link(bline_vertex->get_link_index_from_name("bline"))));
-			Real amount = synfig::find_closest_point((*bline)(time), origin_duck->get_point(), radius, bline->get_loop());
-
-			int vertex_amount_index(bline_vertex->get_link_index_from_name("amount"));
-			ValueNode::Handle vertex_amount_value_node(bline_vertex->get_link(vertex_amount_index));
-
-
-			if (ValueNode_BLineCalcTangent::Handle bline_tangent = ValueNode_BLineCalcTangent::Handle::cast_dynamic(get_value_desc().get_value_node()))
-			{
-				switch (bline_tangent->get_type())
-				{
-				case ValueBase::TYPE_ANGLE:
-				{
-					Angle angle((*bline_tangent)(time, amount).get(Angle()));
-					set_point(Point(Angle::cos(angle).get(), Angle::sin(angle).get()));
-					rotations=synfig::Angle::deg(0); //hack: rotations are a relative value
-					break;
-				}
-				case ValueBase::TYPE_REAL:
-					set_point(Point((*bline_tangent)(time, amount).get(Real()), 0));
-					break;
-				case ValueBase::TYPE_VECTOR:
-					set_point((*bline_tangent)(time, amount).get(Vector()));
-					break;
-				default:
-					break;
-				}
-			}
-			else if (ValueNode_BLineCalcWidth::Handle bline_width = ValueNode_BLineCalcWidth::Handle::cast_dynamic(get_value_desc().get_value_node()))
-					set_point(Point((*bline_width)(time, amount).get(Real()), 0));
-		}
-
-	}
-}
-
-
 void
 Duck::set_sub_trans_point(const synfig::Point &x)
 {
@@ -312,13 +262,13 @@ Duck::set_sub_trans_point(const synfig::Point &x)
 		Angle change = get_point().angle() - old_angle;
 		while (change < Angle::deg(-180)) change += Angle::deg(360);
 		while (change > Angle::deg(180)) change -= Angle::deg(360);
-		int old_halves = round_to_int(Angle::deg(rotations).get()/180);
+		//int old_halves = round_to_int(Angle::deg(rotations).get()/180);
 		rotations += change;
-		int new_halves = round_to_int(Angle::deg(rotations).get()/180);
-		if (old_halves != new_halves &&
+		//int new_halves = round_to_int(Angle::deg(rotations).get()/180);
+		/*if (old_halves != new_halves &&
 			(new_halves > 1 || new_halves < -1 ||
 			 old_halves > 1 || old_halves < -1))
-			synfig::info("rotation: %.2f turns", new_halves/2.0);
+			synfig::info("rotation: %.2f turns", new_halves/2.0);*/
 	}
 	else set_point((x-get_sub_trans_origin())/get_scalar());
 }