Skip to content

Commit 924d930

Browse files
authored
Remove quest 2 controller offsets (#5141)
* Remove quest 2 controller offsets * Re-orient the target rays for quest 2 and quest pro controllers
1 parent 88e8db1 commit 924d930

File tree

1 file changed

+20
-8
lines changed

1 file changed

+20
-8
lines changed

src/components/oculus-touch-controls.js

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,27 +71,39 @@ var CONTROLLER_PROPERTIES = {
7171
'oculus-touch-v3': {
7272
left: {
7373
modelUrl: TOUCH_CONTROLLER_MODEL_BASE_URL + 'v3-left.glb',
74-
rayOrigin: {origin: {x: 0.015, y: 0.005, z: 0}, direction: {x: 0, y: 0, z: -1}},
75-
modelPivotOffset: new THREE.Vector3(0.01, -0.01, 0.05),
76-
modelPivotRotation: new THREE.Euler(Math.PI / 4, 0, 0)
74+
rayOrigin: {
75+
origin: {x: 0.0065, y: -0.0186, z: -0.05},
76+
direction: {x: 0.12394785839500175, y: -0.5944043672340157, z: -0.7945567170519814}
77+
},
78+
modelPivotOffset: new THREE.Vector3(0, 0, 0),
79+
modelPivotRotation: new THREE.Euler(0, 0, 0)
7780
},
7881
right: {
7982
modelUrl: TOUCH_CONTROLLER_MODEL_BASE_URL + 'v3-right.glb',
80-
rayOrigin: {origin: {x: -0.015, y: 0.005, z: 0}, direction: {x: 0, y: 0, z: -1}},
81-
modelPivotOffset: new THREE.Vector3(-0.01, -0.01, 0.05),
82-
modelPivotRotation: new THREE.Euler(Math.PI / 4, 0, 0)
83+
rayOrigin: {
84+
origin: {x: -0.0065, y: -0.0186, z: -0.05},
85+
direction: {x: -0.12394785839500175, y: -0.5944043672340157, z: -0.7945567170519814}
86+
},
87+
modelPivotOffset: new THREE.Vector3(0, 0, 0),
88+
modelPivotRotation: new THREE.Euler(0, 0, 0)
8389
}
8490
},
8591
'meta-quest-touch-pro': {
8692
left: {
8793
modelUrl: META_CONTROLLER_MODEL_BASE_URL + 'quest-touch-pro-left.glb',
88-
rayOrigin: {origin: {x: 0.015, y: 0.005, z: 0}, direction: {x: 0, y: 0, z: -1}},
94+
rayOrigin: {
95+
origin: {x: 0.0065, y: -0.0186, z: -0.05},
96+
direction: {x: 0.12394785839500175, y: -0.5944043672340157, z: -0.7945567170519814}
97+
},
8998
modelPivotOffset: new THREE.Vector3(0, 0, 0),
9099
modelPivotRotation: new THREE.Euler(0, 0, 0)
91100
},
92101
right: {
93102
modelUrl: META_CONTROLLER_MODEL_BASE_URL + 'quest-touch-pro-right.glb',
94-
rayOrigin: {origin: {x: -0.015, y: 0.005, z: 0}, direction: {x: 0, y: 0, z: -1}},
103+
rayOrigin: {
104+
origin: {x: -0.0065, y: -0.0186, z: -0.05},
105+
direction: {x: -0.12394785839500175, y: -0.5944043672340157, z: -0.7945567170519814}
106+
},
95107
modelPivotOffset: new THREE.Vector3(0, 0, 0),
96108
modelPivotRotation: new THREE.Euler(0, 0, 0)
97109
}

0 commit comments

Comments
 (0)