New version 0.2 of the Time Loop layer. It uses the same parameters as the recently...

git-svn-id: http://svn.voria.com/code@1243 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-core/trunk/src/modules/lyr_std/timeloop.cpp b/synfig-core/trunk/src/modules/lyr_std/timeloop.cpp
index 9c4b2b5..63cffcf 100644 (file)
--- a/synfig-core/trunk/src/modules/lyr_std/timeloop.cpp
+++ b/synfig-core/trunk/src/modules/lyr_std/timeloop.cpp
@@ -33,6 +33,9 @@
 #endif
 
 #include "timeloop.h"
+#include <synfig/valuenode.h>
+#include <synfig/valuenode_const.h>
+#include <synfig/valuenode_subtract.h>
 #include <synfig/time.h>
 #include <synfig/context.h>
 #include <synfig/paramdesc.h>
@@ -53,7 +56,7 @@ SYNFIG_LAYER_INIT(Layer_TimeLoop);
 SYNFIG_LAYER_SET_NAME(Layer_TimeLoop,"timeloop");
 SYNFIG_LAYER_SET_LOCAL_NAME(Layer_TimeLoop,N_("Time Loop"));
 SYNFIG_LAYER_SET_CATEGORY(Layer_TimeLoop,N_("Other"));
-SYNFIG_LAYER_SET_VERSION(Layer_TimeLoop,"0.1");
+SYNFIG_LAYER_SET_VERSION(Layer_TimeLoop,"0.2");
 SYNFIG_LAYER_SET_CVS_ID(Layer_TimeLoop,"$Id$");
 
 /* === P R O C E D U R E S ================================================= */
@@ -62,8 +65,9 @@ SYNFIG_LAYER_SET_CVS_ID(Layer_TimeLoop,"$Id$");
 
 Layer_TimeLoop::Layer_TimeLoop()
 {
-       start_time=0;
-       end_time=1;
+       link_time=0;
+       local_time=0;
+       duration=1;
 }
 
 Layer_TimeLoop::~Layer_TimeLoop()
@@ -73,16 +77,27 @@ Layer_TimeLoop::~Layer_TimeLoop()
 bool
 Layer_TimeLoop::set_param(const String & param, const ValueBase &value)
 {
-       IMPORT(start_time);
-       IMPORT(end_time);
+       if(old_version)
+       {
+               IMPORT(start_time);
+               IMPORT(end_time);
+       }
+       else
+       {
+               IMPORT(local_time);
+               IMPORT(link_time);
+               IMPORT(duration);
+       }
+
        return Layer::set_param(param,value);
 }
 
 ValueBase
 Layer_TimeLoop::get_param(const String & param)const
 {
-       EXPORT(start_time);
-       EXPORT(end_time);
+       EXPORT(link_time);
+       EXPORT(local_time);
+       EXPORT(duration);
        EXPORT_NAME();
        EXPORT_VERSION();
 
@@ -94,24 +109,108 @@ Layer_TimeLoop::get_param_vocab()const
 {
        Layer::Vocab ret(Layer::get_param_vocab());
 
-       ret.push_back(ParamDesc("start_time")
-               .set_local_name(_("Start Time"))
+       ret.push_back(ParamDesc("link_time")
+               .set_local_name(_("Link Time"))
+       );
+
+       ret.push_back(ParamDesc("local_time")
+               .set_local_name(_("Local Time"))
        );
 
-       ret.push_back(ParamDesc("end_time")
-               .set_local_name(_("End Time"))
+       ret.push_back(ParamDesc("duration")
+               .set_local_name(_("Duration"))
        );
 
        return ret;
 }
 
+bool
+Layer_TimeLoop::set_version(const String &ver)
+{
+       if (ver=="0.1")
+               old_version = true;
+
+       return true;
+}
+
+void
+Layer_TimeLoop::reset_version()
+{
+       // if we're not converting from an old version of the layer, there's nothing to do
+       if (!old_version)
+               return;
+
+       old_version = false;
+
+       // these are the conversions to go from 0.1 to 0.2:
+       //
+       //       local_time = start_time
+       //       duration = end_time - start_time
+       //       if (time < start_time)
+       //         link_time = -duration : if we want to reproduce the old behaviour - do we?
+       //       else
+       //               link_time = 0
+
+       // convert the static parameters
+       local_time = start_time;
+       duration = end_time - start_time;
+       //! \todo layer version 0.1 acted differently before start_time was reached - possibly due to a bug
+       link_time = 0;
+
+       // convert the dynamic parameters
+       const DynamicParamList &dpl = dynamic_param_list();
+
+       // if neither start_time nor end_time are dynamic, there's nothing more to do
+       if (dpl.count("start_time") == 0 && dpl.count("end_time") == 0)
+               return;
+
+       etl::rhandle<ValueNode> start_time_value_node, end_time_value_node;
+       LinkableValueNode* duration_value_node;
+
+       if (dpl.count("start_time"))
+       {
+               start_time_value_node = dpl.find("start_time")->second;
+               disconnect_dynamic_param("start_time");
+       }
+       else
+               start_time_value_node = ValueNode_Const::create(start_time);
+
+       if (dpl.count("end_time"))
+       {
+               end_time_value_node = dpl.find("end_time")->second;
+               disconnect_dynamic_param("end_time");
+       }
+       else
+               end_time_value_node = ValueNode_Const::create(end_time);
+
+       duration_value_node = ValueNode_Subtract::create(Time(0));
+       duration_value_node->set_link("lhs", end_time_value_node);
+       duration_value_node->set_link("rhs", start_time_value_node);
+
+       connect_dynamic_param("local_time", start_time_value_node);
+       connect_dynamic_param("duration",   duration_value_node);
+       connect_dynamic_param("link_time",  ValueNode_Const::create(Time(0)));
+}
+
 void
-Layer_TimeLoop::set_time(Context context, Time time)const
+Layer_TimeLoop::set_time(Context context, Time t)const
 {
-       Real diff(end_time-start_time);
-       if(diff>0)
-               time-=int(Real(time-start_time)/diff)*diff+start_time;
-       context.set_time(time);
+       if (duration == 0)
+               t = link_time;
+       else if (duration > 0)
+       {
+               t -= local_time;
+               t -= floor(t / duration) * duration;
+               t  = link_time + t;
+       }
+       else
+       {
+               t -= local_time;
+               t -= floor(t / -duration) * -duration;
+               t  = link_time - t;
+       }
+
+       context.set_time(t);
 }
 
 Color

diff --git a/synfig-core/trunk/src/modules/lyr_std/timeloop.h b/synfig-core/trunk/src/modules/lyr_std/timeloop.h
index 66982b9..e1c9afa 100644 (file)
--- a/synfig-core/trunk/src/modules/lyr_std/timeloop.h
+++ b/synfig-core/trunk/src/modules/lyr_std/timeloop.h
@@ -43,8 +43,13 @@ class Layer_TimeLoop : public synfig::Layer
        SYNFIG_LAYER_MODULE_EXT
 
 private:
+       synfig::Time    link_time;
+       synfig::Time    local_time;
+       synfig::Time    duration;
+
        synfig::Time    start_time;
        synfig::Time    end_time;
+       bool                    old_version;
 
 protected:
        Layer_TimeLoop();
@@ -57,6 +62,8 @@ public:
        virtual synfig::ValueBase get_param(const synfig::String & param)const;
 
        virtual Vocab get_param_vocab()const;
+       virtual bool set_version(const synfig::String &ver);
+       virtual void reset_version();
        virtual synfig::Color get_color(synfig::Context context, const synfig::Point &pos)const;
 
        virtual void set_time(synfig::Context context, synfig::Time time)const;