diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-02-07 14:09:21 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-02-07 14:09:21 +1000 |
| commit | da122c6d48433f360cf9ca5b80962099c27186a1 (patch) | |
| tree | 6954dbcb5db0cf8b46a0d320629729c937622023 /src | |
| parent | 010e0f0d626b0f03cec9e8dd876762acb38fafc3 (diff) | |
| parent | b0eb3095c0fa84fb1cdaf264dfa888596cacae3a (diff) | |
| download | uGFX-da122c6d48433f360cf9ca5b80962099c27186a1.tar.gz uGFX-da122c6d48433f360cf9ca5b80962099c27186a1.tar.bz2 uGFX-da122c6d48433f360cf9ca5b80962099c27186a1.zip | |
Merge branch 'master' into gfile
Diffstat (limited to 'src')
| -rw-r--r-- | src/ginput/mouse.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/ginput/mouse.c b/src/ginput/mouse.c index 4c66426f..8bee3499 100644 --- a/src/ginput/mouse.c +++ b/src/ginput/mouse.c @@ -109,7 +109,7 @@ static struct MouseConfig_t { float dx, dx0, dx1, dx2, dy0, dy1, dy2; /* Compute all the required determinants */ - dx = ((float)(points[0].x - points[2].x)) * ((float)(points[1].y - points[2].y)) + dx = ((float)(points[0].x - points[2].x)) * ((float)(points[1].y - points[2].y)) - ((float)(points[1].x - points[2].x)) * ((float)(points[0].y - points[2].y)); dx0 = ((float)(cross[0].x - cross[2].x)) * ((float)(points[1].y - points[2].y)) @@ -119,18 +119,18 @@ static struct MouseConfig_t { - ((float)(cross[0].x - cross[2].x)) * ((float)(points[1].x - points[2].x)); dx2 = cross[0].x * ((float)points[1].x * (float)points[2].y - (float)points[2].x * (float)points[1].y) - - cross[1].x * ((float)points[0].x * (float)points[2].y - (float)points[2].x * (float)points[0].y) + - cross[2].x * ((float)points[0].x * (float)points[1].y - (float)points[1].x * (float)points[0].y); + cross[1].x * ((float)points[0].x * (float)points[2].y - (float)points[2].x * (float)points[0].y) + + cross[2].x * ((float)points[0].x * (float)points[1].y - (float)points[1].x * (float)points[0].y); - dy0 = ((float)(cross[0].y - cross[2].y)) * ((float)(points[1].y - points[2].y)) - - ((float)(cross[1].y - cross[2].y)) * ((float)(points[0].y - points[2].y)); + dy0 = ((float)(cross[0].y - cross[2].y)) * ((float)(points[1].y - points[2].y)) + - ((float)(cross[1].y - cross[2].y)) * ((float)(points[0].y - points[2].y)); - dy1 = ((float)(cross[1].y - cross[2].y)) * ((float)(points[0].x - points[2].x)) + dy1 = ((float)(cross[1].y - cross[2].y)) * ((float)(points[0].x - points[2].x)) - ((float)(cross[0].y - cross[2].y)) * ((float)(points[1].x - points[2].x)); - dy2 = cross[0].y * ((float)points[1].x * (float)points[2].y - (float)points[2].x * (float)points[1].y) - - cross[1].y * ((float)points[0].x * (float)points[2].y - (float)points[2].x * (float)points[0].y) + - cross[2].y * ((float)points[0].x * (float)points[1].y - (float)points[1].x * (float)points[0].y); + dy2 = cross[0].y * ((float)points[1].x * (float)points[2].y - (float)points[2].x * (float)points[1].y) - + cross[1].y * ((float)points[0].x * (float)points[2].y - (float)points[2].x * (float)points[0].y) + + cross[2].y * ((float)points[0].x * (float)points[1].y - (float)points[1].x * (float)points[0].y); /* Now, calculate all the required coefficients */ c->ax = dx0 / dx; |