diff --git a/src/TouchLib.c b/src/TouchLib.c old mode 100755 new mode 100644 index ebd2c9d..bef9e53 --- a/src/TouchLib.c +++ b/src/TouchLib.c @@ -1,180 +1,180 @@ -#include "TouchLib.h" - -void TL_getTouchXY(TL_Point *p) -{ - int coordonnesX[TL_GET_TOUCH_ROUND]; - int coordonnesY[TL_GET_TOUCH_ROUND]; - int i = 0; - - for(i=0; ix = TL_average(coordonnesX, TL_GET_TOUCH_ROUND); - p->y = TL_average(coordonnesY, TL_GET_TOUCH_ROUND); -} - -void TL_waitTouchXY(int Xmin, int Xmax, int Ymin, int Ymax) -{ - TL_Point p; - - p.x = p.y = -1; - - while(p.x < Xmin || p.x > Xmax || p.y < Ymin || p.y > Ymax) - { - TL_getTouchXY(&p); - Sleep(10); - } -} - -/*TL_Point *TL_getSeveralTouchs(int nbPoints) -{ - int i = 0, x = -1, y = -1; - TL_Point *points; - - points = malloc(nbPoints * sizeof(TL_Point)); - - do - { - TL_getTouchXY(&x, &y); - if(x >= 0) - { - if(i == 0) - { - points[i].x = x; - points[i].y = y; - i++; - } - else - { - if(x != points[i-1].x && y != points[i-1].y) - { - points[i].x = x; - points[i].y = y; - i++; - } - } - } - }while(i originX_max || p.y < originY_min || p.y > originY_max) TL_getTouchXY(&p); - - p2.x = p.x; - p2.x = p.y; - i = speed; - - while(i>0) - { - TL_getTouchXY(&p); - - if(p.x < 0) - { - i--; - } - else - { - i = speed; - depX = p.x-p2.x; - depY = p.y-p2.y; - } - - if(depX >= displacementX_min && depX <= displacementX_max && depY >= displacementY_min && depY <= displacementY_max) return; - } - } -} - -void TL_getGesture(int *originX, int *originY, int *displacementX, int *displacementY, int speed) -{ - TL_Point p, p2; - int i; - - p.x = p.y = p2.x = p2.y = -1; - i = speed; - - while(p.x < 0) TL_getTouchXY(&p); - *originX = p.x; - *originY = p.x; - - while(i > 0) - { - TL_getTouchXY(&p2); - - if(p.x < 0) - { - i--; - } - else - { - i = speed; - *displacementX = p2.x-p.x; - *displacementY = p2.y-p.y; - } - } - return; -} - -int TL_average(int *tableau, int taille) -{ - int somme = 0, i=0; - - if(tableau[0] < 0) return -1; - - for(i=0; ix = TL_average(coordonnesX, TL_GET_TOUCH_ROUND); + p->y = TL_average(coordonnesY, TL_GET_TOUCH_ROUND); +} + +void TL_waitTouchXY(int Xmin, int Xmax, int Ymin, int Ymax) +{ + TL_Point p; + + p.x = p.y = -1; + + while(p.x < Xmin || p.x > Xmax || p.y < Ymin || p.y > Ymax) + { + TL_getTouchXY(&p); + Sleep(10); + } +} + +/*TL_Point *TL_getSeveralTouchs(int nbPoints) +{ + int i = 0, x = -1, y = -1; + TL_Point *points; + + points = malloc(nbPoints * sizeof(TL_Point)); + + do + { + TL_getTouchXY(&x, &y); + if(x >= 0) + { + if(i == 0) + { + points[i].x = x; + points[i].y = y; + i++; + } + else + { + if(x != points[i-1].x && y != points[i-1].y) + { + points[i].x = x; + points[i].y = y; + i++; + } + } + } + }while(i originX_max || p.y < originY_min || p.y > originY_max) TL_getTouchXY(&p); + + p2.x = p.x; + p2.y = p.y; + i = speed; + + while(i>0) + { + TL_getTouchXY(&p); + + if(p.x < 0) + { + i--; + } + else + { + i = speed; + depX = p.x-p2.x; + depY = p.y-p2.y; + } + + if(depX >= displacementX_min && depX <= displacementX_max && depY >= displacementY_min && depY <= displacementY_max) return; + } + } +} + +void TL_getGesture(int *originX, int *originY, int *displacementX, int *displacementY, int speed) +{ + TL_Point p, p2; + int i; + + p.x = p.y = p2.x = p2.y = -1; + i = speed; + + while(p.x < 0) TL_getTouchXY(&p); + *originX = p.x; + *originY = p.x; + + while(i > 0) + { + TL_getTouchXY(&p2); + + if(p.x < 0) + { + i--; + } + else + { + i = speed; + *displacementX = p2.x-p.x; + *displacementY = p2.y-p.y; + } + } + return; +} + +int TL_average(int *tableau, int taille) +{ + int somme = 0, i=0; + + if(tableau[0] < 0) return -1; + + for(i=0; i