X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_animated.cpp;h=08bc6aa52ea295ce6fa77ac1985a90c8ad2bc92d;hb=db7314b44ea4867fedbcb7024414263f86205111;hp=733729f5766b111188bf95d2c9e24a00ee242d97;hpb=1d6869075fcc760af71dca8c9e57ecef76b66227;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/valuenode_animated.cpp b/synfig-core/trunk/src/synfig/valuenode_animated.cpp index 733729f..08bc6aa 100644 --- a/synfig-core/trunk/src/synfig/valuenode_animated.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_animated.cpp @@ -6,6 +6,7 @@ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007 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 { @@ -168,6 +170,7 @@ struct is_angle_type return true; } }; +#endif // ANGLES_USE_LINEAR_INTERPOLATION /* === G L O B A L S ======================================================= */ @@ -379,7 +382,7 @@ public: const Real& c(iter->get_continuity()); // Continuity const Real& b(iter->get_bias()); // Bias - // The folloing line works where the previous line fails. + // The following 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 @@ -428,7 +431,8 @@ public: value_type Pn; Pn=after_next->get_value().get(T()); // P_{i+1} // TCB - value_type vect(static_cast(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))); + value_type vect(static_cast(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)));