Diff: main.cpp

Revision:

4:9684b6f8b63c

Parent:

3:ebd94237935e

Child:

5:ad4ae6b65474

--- a/main.cpp	Wed Oct 28 13:15:43 2015 +0000
+++ b/main.cpp	Wed Oct 28 13:34:22 2015 +0000
@@ -198,7 +198,7 @@
 // counter
 double mt1 = 0;
 // time
-double T1 = 4, T2 = 8, T3 = 12, T4 = 16;
+double T1 = 4, T2 = T1 + 2, T3 = T2 + 6, T4 = T3 + 6, T5 = T4 + 2, T6 = T5 + 4;
 // x,y coordinates
 //double x1 = 55, y1 = -15;
 //double x2 = 55, y2 = 15;
@@ -209,7 +209,9 @@
 double x1 = 50, y1 = -37;
 double x2 = 60, y2 = -37;
 double x3 = 60, y3 = 30;
-double x4 = 60, y4 = -37;  
+double x4 = 60, y4 = -37;
+double x5 = 50, y5 = -37 ;
+double x6 = 50, y6 = 0;  
      
 ////////////////////////////////////////////////////////////////
 /////////////////// START OF SIDE FUNCTIONS ////////////////////
@@ -344,8 +346,8 @@
 {
     if (mt1 > 0 && mt1 < T1*controlfreq)     // horizontal movement from (65,-20) -> (55,-20)
     {
-        xx =  x4 + (x1-x4)*(mt1/(T1*controlfreq));
-        yy = y4 + (y1-y4)*(mt1/(T1*controlfreq));
+        xx = x6 + (x1-x6)*(mt1/(T1*controlfreq));
+        yy = y6 + (y1-y6)*(mt1/(T1*controlfreq));
     }
     else if  (mt1 >= T1*controlfreq && mt1 < T2*controlfreq) // vertical movement (55,-20) -> (55,20)
     {
@@ -362,11 +364,21 @@
         xx = x3 + (x4-x3)*(mt1-T3*controlfreq)/(T4*controlfreq-T3*controlfreq) ;
         yy = y3 + (y4-y3)*(mt1-T3*controlfreq)/(T4*controlfreq-T3*controlfreq) ;
     }
-    else if (mt1 >= T4*controlfreq)
+    else if  (mt1 >= T4*controlfreq && mt1 < T5*controlfreq) // vertical movement (65,20) -> (65,-20)
+    {
+        xx = x4 + (x5-x4)*(mt1-T4*controlfreq)/(T5*controlfreq-T4*controlfreq) ;
+        yy = y4 + (y5-y4)*(mt1-T4*controlfreq)/(T5*controlfreq-T4*controlfreq) ;
+    }
+    else if  (mt1 >= T5*controlfreq && mt1 < T6*controlfreq) // vertical movement (65,20) -> (65,-20)
+    {
+        xx = x5 + (x6-x5)*(mt1-T5*controlfreq)/(T6*controlfreq-T5*controlfreq) ;
+        yy = y5 + (y6-y5)*(mt1-T5*controlfreq)/(T6*controlfreq-T5*controlfreq) ;
+    }
+    else if (mt1 >= T6*controlfreq)
     {
         mt1 = 0;
-        xx = x4;
-        yy = y4;
+        xx = x6;
+        yy = y6;
     }
     mt1++;
 }