From 6ccf86e3e9d41b516d76b82e5ee307b6eb0ebd9e Mon Sep 17 00:00:00 2001 From: Marko Kudjerski Date: Tue, 13 Sep 2016 11:10:36 -0700 Subject: [PATCH 1/2] remove qtaudio_windows.dll on Windows before installing the new version --- cmake/templates/NSIS.template.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index 65e801d321..a80367cee1 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -600,6 +600,9 @@ Section "-Core installation" Delete "$INSTDIR\version" Delete "$INSTDIR\xinput1_3.dll" + ;Delete old Qt files + Delete "$INSTDIR\audio\qtaudio_windows.dll" + ; Delete old desktop shortcuts before they were renamed during Sandbox rename Delete "$DESKTOP\@PRE_SANDBOX_INTERFACE_SHORTCUT_NAME@.lnk" Delete "$DESKTOP\@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@.lnk" From aefe2242150a66da6dcbd176efd909303c4641af Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Mon, 19 Sep 2016 10:51:46 -0700 Subject: [PATCH 2/2] Fix for jittery far-grab at low update rates Clamp the blendFactor used to smooth out the motion of the far-grabbed object. This prevents the newTargetPosition from over shooting it's goal. --- scripts/system/controllers/handControllerGrab.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js index 734ef9e6eb..d095b61006 100644 --- a/scripts/system/controllers/handControllerGrab.js +++ b/scripts/system/controllers/handControllerGrab.js @@ -1750,8 +1750,13 @@ function MyController(hand) { var newRadialVelocity = Vec3.dot(lastVelocity, delta); var VELOCITY_AVERAGING_TIME = 0.016; - this.grabRadialVelocity = (deltaObjectTime / VELOCITY_AVERAGING_TIME) * newRadialVelocity + - (1.0 - (deltaObjectTime / VELOCITY_AVERAGING_TIME)) * this.grabRadialVelocity; + var blendFactor = deltaObjectTime / VELOCITY_AVERAGING_TIME; + if (blendFactor < 0.0) { + blendFactor = 0.0; + } else if (blendFactor > 1.0) { + blendFactor = 1.0; + } + this.grabRadialVelocity = blendFactor * newRadialVelocity + (1.0 - blendFactor) * this.grabRadialVelocity; var RADIAL_GRAB_AMPLIFIER = 10.0; if (Math.abs(this.grabRadialVelocity) > 0.0) {