From 04e571f43b501e65b79e484c135cb85216dc3eda Mon Sep 17 00:00:00 2001 From: "Theston E. Fox" Date: Sun, 26 Jun 2016 17:10:53 +0100 Subject: [PATCH] feat(Presence): add toggle to reset position on headset collision A new parameter has been added to the Player Presence script to determine if the CameraRig position should be reset to a good known position if the user's headset collides with another game object. It is now possible with the `resetPositionOnCollision` parameter to determine whether this action of position reset happens or not. --- .../Examples/Resources/Prefabs/Ball.prefab | Bin 9532 -> 3640 bytes .../Scripts/VRTK_PlayerPresence.cs | 3 ++- README.md | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Assets/SteamVR_Unity_Toolkit/Examples/Resources/Prefabs/Ball.prefab b/Assets/SteamVR_Unity_Toolkit/Examples/Resources/Prefabs/Ball.prefab index 9b946a53aa4d39af1499568965168bf61e72f5a2..a23622f48fc084842bed227530533ca6b7428eb6 100644 GIT binary patch literal 3640 zcmd5_ zvb_}T27w_BXNL3m=An(UnXHcjpOD$;`1lx4 ziT8;FVH8hBSF~oI(?40JXCu$6AMEor&)H=~i+1MuhJ2^kmZo=9F`;{Q@B5ZlEI9|3 zzXm*s&`b$h&0fxl@54X*Az#ZBrxpLk@-IxaT#A_&8S#az8!13P8glGK0|n8EA5Q|5 zKK8z;Ss#W;dEl8 z>W3Tp%#;hxEyQrPXqgu!uW~^D%=`ThW6igwoE4?=NSV7j7hd8&Zy2x4Dsv0-?!|B7p1;aGDRt8_O^oN2JkcV`<51_deBQl znTxEHZ{*RSDiKCyO&g~V$_F~wBfI~yyCNxsRO}WC58`ks)uN#jEZYv_os6V5v=@4qbR*K^*2Lh?6cU&E(4TfBh&bJ?T#P;re)y< zG6w9ENfbn26uwS_ljzhxIr7rIHwtfPh3aZ(^gG>VXxeFqr@RG>q$$nC^E-H#c9yAs}Uklo7On*m8i*ND=O92{UnfAAVz0JWfT~m>p z>A$y(Ixnq-2Tr0%bFFDsE?HJm;ozS$q-{#*@aW~tgJh#A4eoNkNT>i<>zF7s8L)$~dnK z|DIE>_QDuyuU~ve>joASW|D&I2q<`Cy|+{HKV1sl&M@fT{fJ81jpDE`Bd(3Pdv*G5 zBV5s(ci5f!A-RBpLLGw;*#&Ud@bQZTBIUkIM%Moygy`M7mokUi&Fq2;He--?i@5z> vI`k7+hGJm3*(s5}Vzqo^`R-fDox!qVzP)-wUk!I$iT-gLPugLg5psV6Z_H6J literal 9532 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