diff --git a/synfig-core/src/synfig/valuenodes/valuenode_animatedinterface.cpp b/synfig-core/src/synfig/valuenodes/valuenode_animatedinterface.cpp index c3df71f..dd9197d 100644 --- a/synfig-core/src/synfig/valuenodes/valuenode_animatedinterface.cpp +++ b/synfig-core/src/synfig/valuenodes/valuenode_animatedinterface.cpp @@ -631,8 +631,8 @@ public: curve.first.set_rs(iter->get_time(), next->get_time()); curve.first.p1()=iter->get_time(); curve.first.p2()=next->get_time(); - curve.first.t1()=(curve.first.p2()-curve.first.p1())*(1.0f-iter->get_temporal_tension()); - curve.first.t2()=(curve.first.p2()-curve.first.p1())*(1.0f-next->get_temporal_tension()); + curve.first.t1()=(curve.first.p2()-curve.first.p1())*(1.0-iter->get_temporal_tension()); + curve.first.t2()=(curve.first.p2()-curve.first.p1())*(1.0-next->get_temporal_tension()); curve.first.sync(); diff --git a/synfig-core/src/synfig/waypoint.cpp b/synfig-core/src/synfig/waypoint.cpp index e5c8161..7f827ef 100644 --- a/synfig-core/src/synfig/waypoint.cpp +++ b/synfig-core/src/synfig/waypoint.cpp @@ -56,10 +56,10 @@ Waypoint::Waypoint(ValueBase value, Time time): after(INTERPOLATION_TCB), value_node(ValueNode_Const::create(value)), time(time), - tension(0.0), - continuity(0.0), + tension(0), + continuity(0), bias(0), - time_tension(0.0f) + time_tension(0) { //!Writeme if(value.get_type()==type_angle) @@ -72,10 +72,10 @@ Waypoint::Waypoint(etl::handle value_node, Time time): after(INTERPOLATION_TCB), value_node(value_node), time(time), - tension(0.0), + tension(0), continuity(0), bias(0), - time_tension(0.0f) + time_tension(0) { if(value_node->get_type()==type_angle) after=before=INTERPOLATION_LINEAR; @@ -88,7 +88,7 @@ Waypoint::Waypoint(): tension(0), continuity(0), bias(0), - time_tension(0.0f) + time_tension(0) { } diff --git a/synfig-core/src/synfig/waypoint.h b/synfig-core/src/synfig/waypoint.h index bb4dd79..8fc44dc 100644 --- a/synfig-core/src/synfig/waypoint.h +++ b/synfig-core/src/synfig/waypoint.h @@ -193,8 +193,7 @@ private: Real continuity; Real bias; - //! Shouldn't be Real? - float time_tension; + Real time_tension; /* -- ** -- C O N S T R U C T O R S --------------------------------------------- @@ -272,9 +271,9 @@ public: bool is_static()const; //!! Gets temporal tension - float get_temporal_tension()const { return time_tension; } + Real get_temporal_tension()const { return time_tension; } //!! Sets temporal tension - void set_temporal_tension(const float& x) { time_tension=x; } + void set_temporal_tension(const Real& x) { time_tension=x; } //! True if the current waypoint's time is earlier than the compared waypoint's time bool operator<(const Waypoint &rhs)const