X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fduck.cpp;h=8500b89bdaae6266bf6ec7bd6fb999a4c19330c2;hb=8ef042c40521681cea99944097c4f90a5ac6cf74;hp=8b98d562c17245addd9aa06d6b7ab55a6dcacc2e;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/duck.cpp b/synfig-studio/trunk/src/gtkmm/duck.cpp
index 8b98d56..8500b89 100644
--- a/synfig-studio/trunk/src/gtkmm/duck.cpp
+++ b/synfig-studio/trunk/src/gtkmm/duck.cpp
@@ -2,7 +2,7 @@
 /*!	\file duck.cpp
 **	\brief Template File
 **
-**	$Id: duck.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -30,6 +30,9 @@
 #endif
 
 #include "duck.h"
+#include <ETL/misc>
+
+#include "general.h"
 
 #endif
 
@@ -64,6 +67,7 @@ int _DuckCounter::counter(0);
 /* === M E T H O D S ======================================================= */
 
 Duck::Duck():
+	rotations(synfig::Angle::deg(0)),
 	origin(0,0),
 	scalar(1),
 	editable(false),
@@ -74,6 +78,7 @@ Duck::Duck():
 Duck::Duck(const synfig::Point &point):
 	type_(TYPE_NONE),
 	point(point),
+	rotations(synfig::Angle::deg(0)),
 	origin(0,0),
 	scalar(1),
 	guid_(0),
@@ -84,6 +89,7 @@ Duck::Duck(const synfig::Point &point):
 
 Duck::Duck(const synfig::Point &point,const synfig::Point &origin):
 	point(point),
+	rotations(synfig::Angle::deg(0)),
 	origin(origin),
 	scalar(1),
 	guid_(0),
@@ -133,7 +139,7 @@ Duck::get_trans_point()const
 {
 	return transform_stack_.perform(get_sub_trans_point());
 }
-	
+
 void
 Duck::set_trans_point(const synfig::Point &x)
 {
@@ -184,7 +190,20 @@ Duck::get_sub_trans_point()const
 void
 Duck::set_sub_trans_point(const synfig::Point &x)
 {
-	set_point((x-get_sub_trans_origin())/get_scalar());
+	if (get_type() == Duck::TYPE_TANGENT ||
+		get_type() == Duck::TYPE_ANGLE)
+	{
+		Angle old_angle = get_point().angle();
+		set_point((x-get_sub_trans_origin())/get_scalar());
+		Angle new_angle = get_point().angle();
+		int old_quarters = round_to_int(Angle::deg(rotations).get()/90);
+		rotations += new_angle.dist(old_angle);
+		int new_quarters = round_to_int(Angle::deg(rotations).get()/90);
+		if (old_quarters != new_quarters)
+			synfig::info("rotation: %.2f turns", new_quarters/4.0);
+	}
+	else
+		set_point((x-get_sub_trans_origin())/get_scalar());
 }
 
 synfig::Point