X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_animated.cpp;h=c2d70a1425b4808d052b0818a7f23c0aae9d8648;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=a2d42e7493f1dd6eefda6605a67fa2144517d4a0;hpb=e802271c263e2a49ab4edb3660f89c27e642d123;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_animated.cpp b/synfig-core/trunk/src/synfig/valuenode_animated.cpp
index a2d42e7..c2d70a1 100644
--- a/synfig-core/trunk/src/synfig/valuenode_animated.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_animated.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file valuenode_animated.cpp
-**	\brief Template File
+**	\brief Implementation of the "Animated" valuenode conversion.
 **
 **	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -160,6 +161,7 @@ struct is_angle_type
 	}
 };
 
+#ifdef ANGLES_USE_LINEAR_INTERPOLATION
 template <>
 struct is_angle_type<Angle>
 {
@@ -168,6 +170,7 @@ struct is_angle_type<Angle>
 		return true;
 	}
 };
+#endif	// ANGLES_USE_LINEAR_INTERPOLATION
 
 /* === G L O B A L S ======================================================= */
 
@@ -374,34 +377,36 @@ public:
 						}
 						else
 						{
+							const Real& t(iter->get_tension());		// Tension
+							const Real& c(iter->get_continuity());	// Continuity
+							const Real& b(iter->get_bias());		// Bias
 
-						const Real& t(iter->get_tension());		// Tension
-						const Real& c(iter->get_continuity());	// Continuity
-						const Real& b(iter->get_bias());			// Bias
+							// The following line works where the previous line fails.
+							value_type Pp; Pp=curve_list.back().second.p1();	// P_{i-1}
 
-						// The folloing line works where the previous line fails.
-						value_type Pp; Pp=curve_list.back().second.p1();	// P_{i-1}
+							const value_type& Pc(curve.second.p1());	// P_i
+							const value_type& Pn(curve.second.p2());	// P_{i+1}
 
-						const value_type& Pc(curve.second.p1());	// P_i
-						const value_type& Pn(curve.second.p2());	// P_{i+1}
+							// TCB
+							value_type vect(static_cast<value_type>
+											(subtract_func(Pc,Pp) *
+											           (((1.0-t) * (1.0+c) * (1.0+b)) / 2.0) +
+											 (Pn-Pc) * (((1.0-t) * (1.0-c) * (1.0-b)) / 2.0)));
 
-						// TCB
-						value_type vect(static_cast<value_type>(subtract_func(Pc,Pp)*(((1.0-t)*(1.0+c)*(1.0+b))/2.0)+(Pn-Pc)*(((1.0-t)*(1.0-c)*(1.0-b))/2.0)));
-
-						// Tension Only
-						//value_type vect=(value_type)((Pn-Pp)*(1.0-t));
+							// Tension Only
+							//value_type vect=(value_type)((Pn-Pp)*(1.0-t));
 
-						// Linear
-						//value_type vect=(value_type)(Pn-Pc);
+							// Linear
+							//value_type vect=(value_type)(Pn-Pc);
 
-						// Debugging stuff
-						//synfig::info("%d:t1: %s",i,tangent_info(Pp,Pn,vect).c_str());
+							// Debugging stuff
+							//synfig::info("%d:t1: %s",i,tangent_info(Pp,Pn,vect).c_str());
 
-						// Adjust for time
-						//vect=value_type(vect*(curve.second.get_dt()*2.0)/(curve.second.get_dt()+curve_list.back().second.get_dt()));
-						//vect=value_type(vect*(curve.second.get_dt())/(curve_list.back().second.get_dt()));
+							// Adjust for time
+							//vect=value_type(vect*(curve.second.get_dt()*2.0)/(curve.second.get_dt()+curve_list.back().second.get_dt()));
+							//vect=value_type(vect*(curve.second.get_dt())/(curve_list.back().second.get_dt()));
 
-						curve.second.t1()=vect;
+							curve.second.t1()=vect;
 						}
 					}
 					else if(
@@ -461,24 +466,24 @@ public:
 					// if this isn't the first curve
 					else if(iter_get_after != INTERPOLATION_LINEAR && !curve_list.empty())
 						// adjust it for the curve that came before it
-						curve.second.t1() *=
+						curve.second.t1() = static_cast<T>(curve.second.t1() * // cast to prevent warning
 							//                  (time span of this curve) * 1.5
 							// -----------------------------------------------------------------
 							// ((time span of this curve) * 0.5) + (time span of previous curve)
-							(curve.second.get_dt()*(timeadjust+1)) /
-							(curve.second.get_dt()*timeadjust + curve_list.back().second.get_dt());
+							  (curve.second.get_dt()*(timeadjust+1)) /
+							  (curve.second.get_dt()*timeadjust + curve_list.back().second.get_dt()));
 
 					if(next_get_before==INTERPOLATION_HALT)
 						curve.second.t2()*=0;
 					// if this isn't the last curve
 					else if(next_get_before != INTERPOLATION_LINEAR && after_next!=waypoint_list_.end())
 						// adjust it for the curve that came after it
-						curve.second.t2() *=
+						curve.second.t2() = static_cast<T>(curve.second.t2() * // cast to prevent warning
 							//                (time span of this curve) * 1.5
 							// -------------------------------------------------------------
 							// ((time span of this curve) * 0.5) + (time span of next curve)
-							(curve.second.get_dt()*(timeadjust+1)) /
-							(curve.second.get_dt()*timeadjust+(after_next->get_time()-next->get_time()));
+							  (curve.second.get_dt()*(timeadjust+1)) /
+							  (curve.second.get_dt()*timeadjust+(after_next->get_time()-next->get_time())));
 				} // not CONSTANT
 			}
 
@@ -1049,7 +1054,7 @@ synfig::ValueNode_Animated::create(ValueBase::Type type)
 		default:
 			throw
 				Exception::BadType(strprintf(_("%s: You cannot use a %s in an animated ValueNode"),"synfig::ValueNode_Animated::create()",
-					ValueBase::type_name(type).c_str())
+					ValueBase::type_local_name(type).c_str())
 				);
 			break;
 	}