From f7084a3419cc5597df217898918296e3776f1c71 Mon Sep 17 00:00:00 2001 From: Kousuke Kawahira Date: Sat, 2 May 2020 11:59:03 +0900 Subject: [PATCH 1/2] Update controller property for Oculus Quest --- src/components/oculus-touch-controls.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/oculus-touch-controls.js b/src/components/oculus-touch-controls.js index e21711f5602..9e3de425894 100644 --- a/src/components/oculus-touch-controls.js +++ b/src/components/oculus-touch-controls.js @@ -59,14 +59,14 @@ var CONTROLLER_PROPERTIES = { 'oculus-touch-v2': { left: { modelUrl: TOUCH_GEN2_CONTROLLER_MODEL_BASE_URL + 'gen2-left.gltf', - rayOrigin: {origin: {x: -0.01, y: 0, z: -0.02}, direction: {x: 0, y: -0.5, z: -1}}, - modelPivotOffset: new THREE.Vector3(0, 0, 0), + rayOrigin: {origin: {x: 0, y: 0, z: 0}, direction: {x: 0, y: 0, z: -1}}, + modelPivotOffset: new THREE.Vector3(0.01, 0.005, 0.03), modelPivotRotation: new THREE.Euler(0, 0, 0) }, right: { modelUrl: TOUCH_GEN2_CONTROLLER_MODEL_BASE_URL + 'gen2-right.gltf', - rayOrigin: {origin: {x: 0.01, y: 0, z: -0.02}, direction: {x: 0, y: -0.5, z: -1}}, - modelPivotOffset: new THREE.Vector3(0, 0, 0), + rayOrigin: {origin: {x: 0, y: 0, z: 0}, direction: {x: 0, y: 0, z: -1}}, + modelPivotOffset: new THREE.Vector3(-0.01, 0.005, 0.03), modelPivotRotation: new THREE.Euler(0, 0, 0) } } From 68d1d6857c574c7a182425b7c564387e31f8ef6b Mon Sep 17 00:00:00 2001 From: Kousuke Kawahira Date: Thu, 7 May 2020 18:46:42 +0900 Subject: [PATCH 2/2] Reset model offset --- src/components/oculus-touch-controls.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/oculus-touch-controls.js b/src/components/oculus-touch-controls.js index 9e3de425894..6d2d9747b35 100644 --- a/src/components/oculus-touch-controls.js +++ b/src/components/oculus-touch-controls.js @@ -60,13 +60,13 @@ var CONTROLLER_PROPERTIES = { left: { modelUrl: TOUCH_GEN2_CONTROLLER_MODEL_BASE_URL + 'gen2-left.gltf', rayOrigin: {origin: {x: 0, y: 0, z: 0}, direction: {x: 0, y: 0, z: -1}}, - modelPivotOffset: new THREE.Vector3(0.01, 0.005, 0.03), + modelPivotOffset: new THREE.Vector3(0, 0, 0), modelPivotRotation: new THREE.Euler(0, 0, 0) }, right: { modelUrl: TOUCH_GEN2_CONTROLLER_MODEL_BASE_URL + 'gen2-right.gltf', rayOrigin: {origin: {x: 0, y: 0, z: 0}, direction: {x: 0, y: 0, z: -1}}, - modelPivotOffset: new THREE.Vector3(-0.01, 0.005, 0.03), + modelPivotOffset: new THREE.Vector3(0, 0, 0), modelPivotRotation: new THREE.Euler(0, 0, 0) } }