Merge pull request #33 from osudrl/onetruetimeline

A single timeline cycle still visually loop, see #29
osudrl · Aug 31, 2018 · 86a016c · 86a016c
2 parents 7c2572b + 6e6f846
commit 86a016c
Show file tree

Hide file tree

Showing 6 changed files with 253 additions and 82 deletions.
diff --git a/src/control.c b/src/control.c
@@ -168,6 +168,33 @@ void control_key_event(traj_info_t* traj_info, int key, int mods)
             traj_info->time_frozen -= 1000000;
         if (key == GLFW_KEY_UP)
             traj_info->time_frozen += 1000000;
+        if( key==GLFW_KEY_PAGE_UP)
+        {
+            SEL.joint_cycle_list_index = (SEL.joint_cycle_list_index + 1) % SEL.joint_cycle_list_size;
+            if(SEL.node_type == NODE_JOINTID)
+                REVISUALIZE;
+        }
+        else if( key==GLFW_KEY_PAGE_DOWN)
+        {
+            SEL.joint_cycle_list_index = (SEL.joint_cycle_list_index - 1 + SEL.joint_cycle_list_size) % SEL.joint_cycle_list_size;
+            if(SEL.node_type == NODE_JOINTID)
+                REVISUALIZE;
+        }
+    }
+    else if (!(*traj_info->paused) && !(mods & GLFW_MOD_CONTROL))
+    {
+        if( key==GLFW_KEY_PAGE_UP)
+        {
+            SEL.joint_cycle_list_index = (SEL.joint_cycle_list_index + 1) % SEL.joint_cycle_list_size;
+            if(SEL.node_type == NODE_JOINTID)
+                REVISUALIZE;
+        }
+        else if( key==GLFW_KEY_PAGE_DOWN)
+        {
+            SEL.joint_cycle_list_index = (SEL.joint_cycle_list_index - 1 + SEL.joint_cycle_list_size) % SEL.joint_cycle_list_size;
+            if(SEL.node_type == NODE_JOINTID)
+                REVISUALIZE;
+        }
     }
     else if (mods & GLFW_MOD_CONTROL)
     {
@@ -202,21 +229,6 @@ void control_key_event(traj_info_t* traj_info, int key, int mods)
             traj_info->time_start -= traj_info->time_start*(.2) - traj_time_in_micros()*(.2);
         }
     }
-    else
-    {
-        if( key==GLFW_KEY_PAGE_UP)
-        {
-            SEL.joint_cycle_list_index = (SEL.joint_cycle_list_index + 1) % SEL.joint_cycle_list_size;
-            if(SEL.node_type == NODE_JOINTID)
-                REVISUALIZE;
-        }
-        else if( key==GLFW_KEY_PAGE_DOWN)
-        {
-            SEL.joint_cycle_list_index = (SEL.joint_cycle_list_index - 1 + SEL.joint_cycle_list_size) % SEL.joint_cycle_list_size;
-            if(SEL.node_type == NODE_JOINTID)
-                REVISUALIZE;
-        }
-    }
 
     if(key== GLFW_KEY_C)
     {

diff --git a/src/main.h b/src/main.h
@@ -11,9 +11,11 @@
 #define XMLNODECOUNT 50
 #define NODECOUNT (traj_info->selection.nodecount)
 #define FILENAME_STEP_DATA "stepdata.bin" //used in simulate.c : reset_traj_info()
-#define DECOR_BUF_SIZE 400
+#define LOOP_TRAJECTORY 2
 #define IK_STEP_CUTOFF 1500
 
+#define DECOR_BUF_SIZE 400
+
 struct _qpos_t_
 {
     double q[CASSIE_QPOS_SIZE];
@@ -28,7 +30,11 @@ enum node_type_e
     NODE_JOINTMOVE
 };
 
+#if (LOOP_TRAJECTORY == 1)
 #define NODE_TYPE_E_COUNT 3
+#else
+#define NODE_TYPE_E_COUNT 1
+#endif
 
 enum scale_type_e
 {
@@ -40,7 +46,8 @@ enum scale_type_e
 
 struct _timeline_t_
 {
-    int numposes;
+    int numframes;
+    int numnoloopframes;
     double duration;
     qpos_t* qposes;
     enum node_type_e node_type;