Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
misc.c
Log Message:
Improve sliding.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/misc.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- misc.c 28 Dec 2004 23:46:46 -0000 1.61
+++ misc.c 22 Jan 2005 17:36:41 -0000 1.62
@@ -113,6 +113,34 @@
return (double)sec + (((double)usec) / 1000000);
}
+#include <math.h>
+
+static float
+ETimeCurve(int k1, int k2, float k, int mode, float slope __UNUSED__)
+{
+ float x, l;
+
+ if (k >= k2 || mode == 0)
+ return k;
+
+ l = k2 - k1;
+ x = k - k1;
+
+ switch (mode)
+ {
+ case 1: /* Sinuoidal - half cycle */
+ x = x / l - 0.5; /* x: -0.5 -> 0.5 */
+ x = 0.5 * (1. + sin(x * M_PI));
+ break;
+ case 2: /* Sinuoidal - quarter cycle */
+ x = x / l; /* x: 0 -> 1 */
+ x = sin(x * M_PI / 2);
+ break;
+ }
+
+ return k1 + x * l;
+}
+
void
ETimedLoopInit(int k1, int k2, int speed)
{
@@ -124,12 +152,16 @@
etl_fac = (k2 - k1) * speed / 1000.;
gettimeofday(&etl_tv_start, NULL);
+ ecore_x_sync();
}
int
ETimedLoopNext(void)
{
- double tm;
+ double tm, y;
+
+ /* Is this portable? */
+ usleep(5000);
/* Find elapsed time since loop start */
tm = ETimeElapsed(&etl_tv_start);
@@ -137,11 +169,12 @@
Eprintf("ETimedLoopNext k=%4f tm=%.3f\n", etl_k, tm);
#endif
etl_k = etl_k1 + tm * etl_fac;
+ y = ETimeCurve(etl_k1, etl_k2, etl_k, 2, 1.0);
ecore_x_sync();
CheckEvent();
- return etl_k;
+ return y;
}
/*
-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
