From 23fcaa1bab210c0ab494685c4a3de197dd8268f4 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Wed, 1 Oct 2014 20:24:40 -0700
Subject: [PATCH] Add axis scaling support

---
 libs/limelight-common.jar                     | Bin 418136 -> 418537 bytes
 .../binding/input/ControllerHandler.java      |  25 ++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/libs/limelight-common.jar b/libs/limelight-common.jar
index 4cfafd60d8b25ffab78f8455023f9b7df4d4972f..0348acc13d669b6fa12132b3e7c66957bb28fe05 100644
GIT binary patch
delta 1949
zcmYk7c~p{V8^+;P-YoO85ERLBDfhxm+%OUe+-1nEatUfwL?_g;Mfr?0Q*(<XeKofn
z(8~PMR7T6wC}X*6Zq>LiH6^3DWM-O<L#J~*-}9X7kNbC>=f0l*u0Q`!m%dO}qPxh+
zqhJaO3b2u1?P8V0N^mVNxyAxJ=%5#z%JZJ~P&tmWbs+;0lKCWZgZH=Y9i@h1@qwZc
zBr>UNUl8QbfQ2gJGx@=lbg9dKhh7gRuAgbXnJ-nV_q={6pSA(p5d5PeuIE;5HNM_e
zn=`<@@}XeadYMzOzSzv5^gGyEKcL-h9GE<#Rc;azMYIf)-_{-|6g^0RKMRlGwJK1O
z5kk+74`O%sPF!$;U<O$E=eTayD4HFs(b&_?#Ou;WB2Q@5A(LHzkIo4?dynY~MS^3o
z@wFtkc@K;JIMYY(A^fgCrmu1gR0QOse7+<?#p-kyeDGy=06IUwz~Am=VL4#kobk#H
zDIcQY>YDl*)AICKa?@?BoHg%>`$Ex#8%@sD(L4;O$}W`<8k$5X=QqzsnDMtf(;jP{
zbUvr2bGDKeml=IaY(&q^OSPZWHdNW;ahr0$-o_8Ff0S*w6Wig~)1w`T@j5i^E$JXx
zW*1fD#Xh9$*K<H0tkZJ~Ds78b^KeX$7X|C7CL3)1Ou<CveI5E~#*{~O_oez&#}Nc?
z$k0+{p4Vcu_7<^Wz@e%D%nS1V^7n0|sIy&k=V;u$%!-?|6kQ9fc~;8SmV^TT?CLnY
z=M(0I_PB~S2l>|>MyzoB&NpW1D>qOqvAw*FfjiL}gH~xhS(HE}*v~0e`}QghPW4Wv
zdb^*P0mRPK=SLo8@gfu4N`7v@fBe)sQIUF&HB7a@qS^7t`M*+@Q_bpFl+~+uFuEz9
zwU^97Tt!+-btJbWyi<}`yj|^%XJ;xpb%4(e(6c?zOM21NtP?|Vb2Z!B8&xvUWbPq;
zo?|4)+bO+FWqFHK`sL3z9j?OiPyO8jn&u8ub@dWWaLQkJEx4zoDE$M>4&43r5Uq06
zbFqD;rY5~QXnOdC5<f#Aoh97nbp>C<$jdce6cX<RrRm%WHJN?_w72XqbXd$jBD5-k
zszpyTOiHVO3t#um3h%1PO`wk|nsj!ui?xjB0$2N;j19&Vfg8PL-bkt0sz#Hj_E)Bk
zP<U;j`#z8Kv6n}^hFi_>&W}XA8g3Fe9+%!BEm8H1>E&TID#W3tmhEFZq<SM{C%S(u
zA*OF4KX5MTGdd=%=X%*;#(wqv+$h#cUB{Oi*WfL}T5DF2{HK|UCpPzTF8xo0KG$^E
z)^IA@1&7P5^l@bgX9oyKhip^A)vSfOWWoR&;Js??LNazGDHWvnXH_en5S3s#;OJQi
zXIxd0gWyz+Uu51y%)v)PCA%B)Rc8=?SB`VWV^r6+%|BG_n6za|%Hj1KNf@l2E!h&Q
ze6m8hwmELS;hAd3CtiD;vYh7QaoGHjZ@A_&k4A^sF)rM)GB<gwuJ+{DWbXBHyYstw
z2Uj$6rX$W1CCBww&u5S;Fkst6sHEU1r@2sxojX)4+BN*KO(i)yHPLxcx<_tr2$y`c
zenD&UvL;3AYk$#SX^xfZw))tC<oDG@Q`}?kR8duhv<Rgyw=mkRk*nMDz_Rr#mzw7y
z2gk(rPP}Do@!Gf7jtktGUHISaJ+A!3BkFgp64R9kHTI=rZ{JZahH5k>y+uu8BqS$H
zc3<#k18gQKLSWFXzQ>_-G82F2t<&-%a$DXRYS~+qu`tb}jDL~#*!}hSWOSdz(3_?|
z7#G^!F%1{xcor_RN^6Lpj_hNNln2ykR&gyIm7~MHsm>yv`G2@Jnq~Zwr>)N$wYxcD
z!`tY|ifm#AYj8^F&)FSo*0()hly&LoDlHZ-My?&MJz{ijx4l2UPbzfD&LITP-9ujd
zsG!2Ynspd#B$E2SWGC#QSJf1UR_3R3=+;vs+eJBVm^<xI%=gGk2HySSe5H((n7C7;
z?~tyz#&>NNdWacZu3jNI#he#VxojF!Nn^M&)5`jmZk*ciaDLQxmL_^F-9<C-I#c@e
z!f(#^y>!}dG@}B8EF7j3z{K!Ei*9u4OC#E_SL&>J{|e!mi)Hs(E=uT&DH+1sUAjEX
zHG2HYo}Dq<b7`%9boukO9LeeQ8^6rXcIsGJO+V6&%4JjTYCh>-=fP#|utmWpCT7bL
z0tO2dM2zl+H2mP&P?#^MmPqh{%LK?ICzE^)!3Xh8Dkp1^8Y>D2ss2Y+BGk>diqMD;
z7y(52LfQ;a9pY2r;P)+dfWZI%2+<F&22J^bM!;$2Cf)%N{XilR8t{WC{|wiJ?o+`X
z&~rZ!3q*x%Vhps?A2bED!Z(Q;6zLBh1o#(!ka~YvV1Cr5jf4)I0<C~QqkoXAr)0L-
zwaozm4adS!(8l*H1VfhfAnm*72M`4ij{%wk@Y~RD4A25tybaAVKs+#$3GHKoB%mY=
z3S!E>{4fnFmd$btWDtt619hNnr$M8A5mXR{W3eOIEKb<DK)MS8gvkzFcGY*oU{7T(
G4E8T&F=V>{

delta 1526
zcmV<S1qu4;#TnSb84XZN0|XQR2nYxOF@rpT4YdscAXSsCFc6b(i5r)YMF9|(saysO
zf0dQ(QrkuphR<SS8%G2OZ~}$2q-j%Q3U0pIrjUUA1qQ`-Y+-O|>&iwL1!1K^&P@L0
zLV5}P(=?_tolY*G7uEFLwJekrI#V&@J<r*rbN0NuTK@X`k2gegn@++s#AvZ)9j8p=
zST~LKp_A%7KXGhbJ5Cv$XI&?iu{w@zf0?Fkm$lZB?u04GDDj`K6!>pHno(#YCuegN
zMnijPMnP3BD2y(Z<;+%2ZK(Bfju9&`8bzHGN9#B>&Fty{EN=?$%8k4tuOp%gPmJJ6
z3lC_H)9!%QIMw^~_U%hhc)L89B*thYTiPjl4s<=D<npTLKu^(1VSVGw6F~~af2+oL
z#)^kSz>%^d*S+u<9BDM=Ip)x%Qf*|EGuIkim3Lh)8BJ8nxlBP;8tH9SEqQAUqQvF0
zTvtkRwxQ&T>*@wna&_x7PcVy|&938EoxG{FPe7)A;Hb9IZtFHy4b3H+Z<6PV@_?#i
zw2pTDP{*qxa4_W~%tcmOrqMB+e@Bc0iTN6KGGp!QBUt1&5)D&`TPqTUDa2?@F*<s&
zd)(A*Rco3$qjAM*X=Y8c4bHAJwBja=CaURl70-MvN&!ksv`QINNEGI4Ja0~-B^u?{
zx<o1Zf?EX%=T}%;65Z*~K9=Zi-zrITuWvn(=st}inR94Bos{yw4*N1Be|M}M!`92%
z3)9l}8BHaWr`mHZ)iJD8`h}yXy9Wolz06m-L-jC0x$$=bO7^~POY|-6A(>K8RVCNR
z6|)7o$Y@gecj$7IzNbc*e!$T<r;<cJlE!G*;<1bt66d9uKX;8haZ93og7^Wn%V;{W
zm%cc*Ezuzv*n7lQ4=vl_f8AFvjz8kLO&)YXQd|PfCZqTTlVfe&y*3oR({>KUQN!I3
zty*2XrRNQPYU1zj(GpKaH?Y_IdzhhVejH&<^TQ~{2=S8;<=;JB0!uXN@n!Isk7M8~
zJ{|{8_;?Z=_wiNmH6Krbr+xeZXvW90;OjpA5d4vk=fF37{4w~Ze~&)_f9m5~;Lm)V
z0MGk43109q@BecjFX9&;7x4$5mKbll;~m$3*B$S<<9#s(q3f6Q6*7GdYJvH4GZy+Y
zQV+zUYCRI0RDYufuH$F59*%9pvHYtj{1Cslurau4u}vdb*k$~MA^tc7oq$l+Aj}mA
zkfKN84Sox+ikqGne|!T^gfBiBoBEyP<V=sU$=M#|lh=E+k&Fj>w3&<#_ee>`Lp>@c
z<KZ5a->>};wO3Jl4I3|GW7F8I3^pJOQF9O{FKSo%l`vLClS@J}CM+)6kg&LH0bz0B
zg2Lj`4GW8l7ZMhiFO0WU+ID++jSM`;?!qgoozizZ7$2Nce{*Lc`I@q)bRdlUDLoa&
z#=zJdOeq7SI55h>cty)R%~{t==#^*_{cNFQ1&84=6fWY3l(51wVxFMq3aE<fOcmW<
z?XS)2ewU7^BmN^=^vvyGQ7};;Hv5ZLEF@gJB8k+Wc9SsrNkrNI08mQ@2;(FZPh<oD
z0E-9!08mQ<mzG@tIF?-o7l+GR0f)<50*A|61Bc671h>mu1^ej(F@rp}$wda27MEa1
z1_TP@Boj|$1ONbw2$ybL25|!DS(o8l24DgLT$iC*1|OF{Tm}V~XI%z70?=NUp;`tX
zm!Dh)3YX4Z20a4WVwZ7V1~HdDUIsA&=xCR5UIt<Uk8YQ7UIs9i1z!d*0{?WEab5-@
zm(F$p4wvan1`wBbUj`Zi40xAuUIr_dzF!770!Mk5fmsF_mkoOX7ndkt1}XxgftP_<
z1{s%aU<N}17>t*JSq2%G-i-knm+4Ff443d=1|9;ek(Ur*1~me3l9xwe1~vj>lb3&C
z1~dX&l$W((20#K8ZkP9A20a2AjF&cI20#N~K?au&Lk1$3n_>nkB;Z2^04`@~bZKX9
cZ*pZ&O9ci10000`08juK9RL6+L<Rr=09EIuqW}N^

diff --git a/src/com/limelight/binding/input/ControllerHandler.java b/src/com/limelight/binding/input/ControllerHandler.java
index 26d47a18..471ff411 100644
--- a/src/com/limelight/binding/input/ControllerHandler.java
+++ b/src/com/limelight/binding/input/ControllerHandler.java
@@ -47,6 +47,9 @@ public class ControllerHandler {
 	
 	public ControllerHandler(NvConnection conn) {
 		this.conn = conn;
+		
+		// We want limelight-common to scale the axis values to match Xinput values
+		ControllerPacket.enableAxisScaling = true;
 	}
 	
 	private ControllerMapping createMappingForDevice(InputDevice dev) {
@@ -135,6 +138,15 @@ public class ControllerHandler {
 			InputDevice.MotionRange lsYRange = dev.getMotionRange(mapping.leftStickYAxis);
 			if (lsXRange != null && lsYRange != null) {
 				mapping.leftStickDeadzoneRadius = Math.max(lsXRange.getFlat(), lsYRange.getFlat());
+				
+				// If there isn't a (reasonable) deadzone at all, use 20%
+				if (mapping.leftStickDeadzoneRadius < 0.02f) {
+					mapping.leftStickDeadzoneRadius = 0.20f;
+				}
+				// Check that the deadzone is 10% at minimum
+				else if (mapping.leftStickDeadzoneRadius < 0.10f) {
+					mapping.leftStickDeadzoneRadius = 0.10f;
+				}
 			}
 		}
 		
@@ -143,6 +155,15 @@ public class ControllerHandler {
 			InputDevice.MotionRange rsYRange = dev.getMotionRange(mapping.rightStickYAxis);
 			if (rsXRange != null && rsYRange != null) {
 				mapping.rightStickDeadzoneRadius = Math.max(rsXRange.getFlat(), rsYRange.getFlat());
+				
+				// If there isn't a (reasonable) deadzone at all, use 20%
+				if (mapping.rightStickDeadzoneRadius < 0.02f) {
+					mapping.rightStickDeadzoneRadius = 0.20f;
+				}
+				// Check that the deadzone is 10% at minimum
+				else if (mapping.rightStickDeadzoneRadius < 0.10f) {
+					mapping.rightStickDeadzoneRadius = 0.10f;
+				}
 			}
 		}
 		
@@ -242,7 +263,7 @@ public class ControllerHandler {
 			// Scale the input based on the distance from the deadzone
 			inputVector.getNormalized(normalizedInputVector);
 			normalizedInputVector.scalarMultiply((inputVector.getMagnitude() - deadzoneRadius) / (1.0f - deadzoneRadius));
-			
+		
 			// Bound the X value to -1.0 to 1.0
 			if (normalizedInputVector.getX() > 1.0f) {
 				normalizedInputVector.setX(1.0f);
@@ -284,7 +305,7 @@ public class ControllerHandler {
 					event.getAxisValue(mapping.rightStickYAxis), mapping.rightStickDeadzoneRadius);
 			
 			rightStickX = (short)(rightStickVector.getX() * 0x7FFE);
-			rightStickY = (short)(-rightStickVector.getY() * 0x7FFE);	
+			rightStickY = (short)(-rightStickVector.getY() * 0x7FFE);
 		}
 		
 		// Handle controllers with analog triggers