From 31d441f4093145d28504bed7f3e18656f1e01a37 Mon Sep 17 00:00:00 2001 From: hondres Date: Tue, 26 Jan 2016 14:26:11 +0100 Subject: [PATCH] update joystick demo with joy_connection_changed handling --- demos/misc/joysticks/joysticks.gd | 9 +++++++++ demos/misc/joysticks/joysticks.scn | Bin 4356 -> 4064 bytes 2 files changed, 9 insertions(+) diff --git a/demos/misc/joysticks/joysticks.gd b/demos/misc/joysticks/joysticks.gd index f5bc1bddad..f5466012e6 100644 --- a/demos/misc/joysticks/joysticks.gd +++ b/demos/misc/joysticks/joysticks.gd @@ -51,3 +51,12 @@ func _fixed_process(delta): func _ready(): set_fixed_process(true) + Input.connect("joy_connection_changed", self, "_on_joy_connection_changed") + +#Called whenever a joystick has been connected or disconnected. +func _on_joy_connection_changed(device_id, connected): + if device_id == cur_joy: + if connected: + get_node("joy_name").set_text(Input.get_joy_name(device_id)) + else: + get_node("joy_name").set_text("") diff --git a/demos/misc/joysticks/joysticks.scn b/demos/misc/joysticks/joysticks.scn index 3e0f326a0d42f9050e85b9532192a275151f7b5a..7fc283ca69233ccbc2c23866f84972e0e84b1e85 100644 GIT binary patch delta 1801 zcmZosdLSfub`CuZPOVOp#aY@#{yMBl;A)LZ z;A)LY;9@X-z^KrgFnJS8Ih#`|gQM!R$@;7^^>ZFD@U<;^z`%F#DB}l5$7v2?3@$BE zjd~3K7VKkSS-{TFkf7#NwLpQ9$H}Ff<^J+4I|ikTOd6j`64(!?IcT^}V~?GG*m;kg zkh23f`-b^Sp%gM&Tz@Wsyz`)MH#=s!Lz`($vz|5emz|6p@ zz&zQ8-BZ;e+aa7mNrBrToIy;1{eg5fgSvwH1NCYKc?DyIss{{U`z9Y?_td?vP{r`y ziQnR$SR-xcGIjpvU3R zBQO57V=)5*i=3y6V@O8h+v&dk((V!s>1lhvRoU;+VH1}(*t8%*Ab?@vyj3iLOT0o= zm$+GOTUGROV-UaXC;qBu^73Ci{Ca082QKBR@^DaX=!jmySZO%JG`o7geOgsPy+TWX z{P82Ew^#g@Nsm9f=lmP%_=3DVzCGs`ED+9^8laHj)VP3+leI}rgk#nN1|IomQcP`$ znX?vVy3Kjoemrlx{_^ZXUdG!+K8MYCt&bHj%RApZc5qtiT!F1O;#Y=fiQl$8AG~^1 zRIu&&>ghH28MZx^cU|^+*CLJMi+BApz5BU-?bXYdojDo>m>6%HVU>ar_C-gA;l zTVj-q_NA1VtwE`geT!DK1+q9WD6R?7TFyMJvS0qAo4~PS|Ni~k+3>t_;<_3CRNva@ zT$HL6W@=LS^8LI0Klz^w1H?>U2+L|TdR$gBIJbo^}>ITIeiMESnj3S|- z;o;$&YE1K2Oh4$Y&>-OU;(AqsQW%rS(me_c^4qqB=}kATpXsAD^-<+My@1tMCE7aO z7T>;odskk}oAt3w{C$t7c&To5?l~UGWg5lIBH&~y>$D(qmV!!JTAINzZ*T9fUY~9H zAMbei@?}lk`NBEZ6t>GR;5%%v?|tRG+ZH``zZIRGo#&r9*LQE%(_QN{x>^Lf7Rhrc z>YVQD?S1;W+TONGMZBJ?<-sx8eN(q{2Z$Us@YxtqA}`Y}P;{?PL8#@(Qqu#QbXp9~ z6*V`@J28lfiB-%ye!pD)Y?OTOuV&TYo4QZ=uPQIIuKRv&?$rBX-@bplr8mJxO0pg(372i1EG&HZ@ZsINt-HIs7irw9m;BJ1n0@@*$H2E0^}+ui-#n3L z;$$!I{MWatd?$rm!N_Uxc^}0uxeB-{O{}*F;ABWqV34n?i@W}H=H=bXGFR>6lD+V} zJaj_0!lKw$m&ESqHD+zyCBJj$&6#hGNHm9wvM4we_H|xZ|F`j%S*VVfsO!vGv%Hqe zU;bJ1ul-1W{Kxs+MJ253^1nQ@uQjSKtS6X_&@0xTnL@QOo zt$ty^4jYx0n>l9FPw!kO-RmYFEwfsa(TU@jgkp!b1Q6 delta 2151 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 hU#fJ%>|*0h3zopr7#M