diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-02-07 14:12:05 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-02-07 14:12:05 +1000 |
| commit | f0873bde35750e8f49c1a3238fa36956c86ddd4e (patch) | |
| tree | c48a70fab94b2ef41080e87832a2eb7d80e565c1 /src/ginput | |
| parent | f26581dc7e85f77393143a44c0c3eb3eef0da8b4 (diff) | |
| parent | 3c6df9a4a1b810411d9207fd2da39c3378bb9657 (diff) | |
| download | uGFX-f0873bde35750e8f49c1a3238fa36956c86ddd4e.tar.gz uGFX-f0873bde35750e8f49c1a3238fa36956c86ddd4e.tar.bz2 uGFX-f0873bde35750e8f49c1a3238fa36956c86ddd4e.zip | |
Merge branch 'master' into freertos
Diffstat (limited to 'src/ginput')
| -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; |