X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_animated.cpp;h=e965418feda7b274166dd59c42a0c34bc3bfb042;hb=b494445bc3ba5344e65869c7c6bab2b008438f1c;hp=85ee4284db02c8ffac6168568045b4424f3b73f9;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/valuenode_animated.cpp b/synfig-core/trunk/src/synfig/valuenode_animated.cpp index 85ee428..e965418 100644 --- a/synfig-core/trunk/src/synfig/valuenode_animated.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_animated.cpp @@ -1,20 +1,21 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_animated.cpp ** \brief Template File ** ** $Id: valuenode_animated.cpp,v 1.1.1.1 2005/01/04 01:23:15 darco Exp $ ** ** \legal -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. ** \endlegal */ /* ========================================================================= */ @@ -56,7 +57,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -173,7 +174,7 @@ struct is_angle_type /* === C L A S S E S ======================================================= */ template -class _Hermite : public sinfg::ValueNode_Animated +class _Hermite : public synfig::ValueNode_Animated { public: typedef T value_type; @@ -394,7 +395,7 @@ public: //value_type vect=(value_type)(Pn-Pc); // Debugging stuff - //sinfg::info("%d:t1: %s",i,tangent_info(Pp,Pn,vect).c_str()); + //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())); @@ -436,7 +437,7 @@ public: //value_type vect=(value_type)(Pc-Pp); // Debugging stuff - //sinfg::info("%d:t2: %s",i,tangent_info(Pp,Pn,vect).c_str()); + //synfig::info("%d:t2: %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()+(after_next->get_time()-next->get_time()))); @@ -507,7 +508,7 @@ public: template -class _Constant : public sinfg::ValueNode_Animated +class _Constant : public synfig::ValueNode_Animated { public: typedef T value_type; @@ -605,7 +606,7 @@ public: } }; -class _AnimBool : public sinfg::ValueNode_Animated +class _AnimBool : public synfig::ValueNode_Animated { public: typedef bool value_type; @@ -855,8 +856,8 @@ ValueNode_Animated::new_waypoint_at_time(const Time& time)const } waypoint.set_time(time); waypoint.set_parent_value_node(const_cast(this)); -// sinfg::info("waypoint.get_after()=set to %d",waypoint.get_after()); -// sinfg::info("waypoint.get_before()=set to %d",waypoint.get_before()); +// synfig::info("waypoint.get_after()=set to %d",waypoint.get_after()); +// synfig::info("waypoint.get_before()=set to %d",waypoint.get_before()); return waypoint; } @@ -1006,7 +1007,7 @@ ValueNode_Animated::set_type(ValueBase::Type t) } ValueNode_Animated::Handle -sinfg::ValueNode_Animated::create(ValueBase::Type type) +synfig::ValueNode_Animated::create(ValueBase::Type type) { switch(type) { @@ -1033,7 +1034,7 @@ sinfg::ValueNode_Animated::create(ValueBase::Type type) return ValueNode_Animated::Handle(new _Constant); default: throw - Exception::BadType(strprintf(_("%s: You cannot use a %s in an animated ValueNode"),"sinfg::ValueNode_Animated::create()", + Exception::BadType(strprintf(_("%s: You cannot use a %s in an animated ValueNode"),"synfig::ValueNode_Animated::create()", ValueBase::type_name(type).c_str()) ); break;