moonlight-stream/moonlight-embedded
1
0 Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2026-10-26 05:50:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to solve gamepad range integer overflows

Browse Source
This commit is contained in:
Iwan Timmer committed 2015-03-09 12:57:26 +01:00
1 parent 9e717a4dac
commit 88e5a190d7
1 file changed
+6 -7
Download Patch File Download Diff File Expand all files Collapse all files
src/com/limelight/input/EvdevAbsolute.java
+6 -7
View File
@@ -12,6 +12,7 @@ public class EvdevAbsolute {
public final static int UP = 1, DOWN = -1, NONE = 0; public final static int UP = 1, DOWN = -1, NONE = 0;
private final static int ABS_OFFSET = 0x40; private final static int ABS_OFFSET = 0x40;
private final static int UNSIGNED_BYTE_MAX_VALUE = 0xFF;
private int min, max; private int min, max;
private int avg; private int avg;
@@ -53,9 +54,7 @@ public class EvdevAbsolute {
return reverse?Short.MAX_VALUE:Short.MIN_VALUE; return reverse?Short.MAX_VALUE:Short.MIN_VALUE;
else { else {
value += value<avg?flat:-flat; value += value<avg?flat:-flat;
return (short) ((value-avg) * Short.MAX_VALUE / (reverse?-range-flat:range-flat) - (reverse?1:0));
// Divide the value by the range before multiplying to avoid overflowing
return (short) (((value-avg) / (float)(reverse?flat-range:range-flat)) * 0x7FFE);
} }
} }
@@ -68,12 +67,12 @@ public class EvdevAbsolute {
if (Math.abs(value-min)<flat) if (Math.abs(value-min)<flat)
return 0; return 0;
else if (value>max) else if (value>max)
return reverse?0:(byte) 0xFF; return reverse?0:(byte) UNSIGNED_BYTE_MAX_VALUE;
else if (value<min) else if (value<min)
return reverse?(byte) 0xFF:0; return reverse?(byte) UNSIGNED_BYTE_MAX_VALUE:0;
else { else {
value -= -flat; value -= flat;
return (byte) ((value-min) * 0xFF / (reverse?flat-diff:diff-flat)); return (byte) (((reverse?max-value:value-min)) * UNSIGNED_BYTE_MAX_VALUE / (diff-flat));
} }
} }