From 5865d3c81e6c6fd7ad8e6a485b6ddff59635a759 Mon Sep 17 00:00:00 2001 From: Jarrad Whitaker Date: Fri, 27 Nov 2015 22:53:37 +1100 Subject: [PATCH] update Android client to use [0,UINT16_MAX) as its range of values --- .../src/main/java/at/bitfire/gfxtablet/CanvasView.java | 9 +++++---- .../app/src/main/java/at/bitfire/gfxtablet/NetEvent.java | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app-android/app/src/main/java/at/bitfire/gfxtablet/CanvasView.java b/app-android/app/src/main/java/at/bitfire/gfxtablet/CanvasView.java index 74c72d1..388e58b 100644 --- a/app-android/app/src/main/java/at/bitfire/gfxtablet/CanvasView.java +++ b/app-android/app/src/main/java/at/bitfire/gfxtablet/CanvasView.java @@ -124,17 +124,18 @@ public class CanvasView extends View implements SharedPreferences.OnSharedPrefer return false; } - + // these overflow and wrap around to negative short values, but thankfully Java will continue + // on regardless, so we can just ignore Java's interpretation of them and send them anyway. short normalizeX(float x) { - return (short)(Math.min(Math.max(0, x), maxX) * Short.MAX_VALUE/maxX); + return (short)(Math.min(Math.max(0, x), maxX) * 2*Short.MAX_VALUE/maxX); } short normalizeY(float x) { - return (short)(Math.min(Math.max(0, x), maxY) * Short.MAX_VALUE/maxY); + return (short)(Math.min(Math.max(0, x), maxY) * 2*Short.MAX_VALUE/maxY); } short normalizePressure(float x) { - return (short)(Math.min(Math.max(0, x), 2.0) * Short.MAX_VALUE/2.0); + return (short)(Math.min(Math.max(0, x), 2.0) * Short.MAX_VALUE); } } diff --git a/app-android/app/src/main/java/at/bitfire/gfxtablet/NetEvent.java b/app-android/app/src/main/java/at/bitfire/gfxtablet/NetEvent.java index e8efa59..334ac89 100644 --- a/app-android/app/src/main/java/at/bitfire/gfxtablet/NetEvent.java +++ b/app-android/app/src/main/java/at/bitfire/gfxtablet/NetEvent.java @@ -15,7 +15,7 @@ public class NetEvent { TYPE_DISCONNECT } static final String signature = "GfxTablet"; - static final short protocol_version = 1; + static final short protocol_version = 2; final Type type; short x, y, pressure;