@threlte/xr 1.0.5 → 1.0.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -169,29 +169,43 @@ export const setupPointerControls = (context, handContext, fixedStep = 1 / 40) =
|
|
|
169
169
|
fixedStep,
|
|
170
170
|
autoStart: false
|
|
171
171
|
});
|
|
172
|
-
watch(controller, (input) => {
|
|
172
|
+
watch([controller, handContext.enabled], ([input, enabled]) => {
|
|
173
173
|
if (input === undefined)
|
|
174
174
|
return;
|
|
175
|
-
|
|
176
|
-
input.targetRay.addEventListener('selectend', handlePointerUp);
|
|
177
|
-
input.targetRay.addEventListener('select', handleClick);
|
|
178
|
-
return () => {
|
|
175
|
+
const removeHandlers = () => {
|
|
179
176
|
input.targetRay.removeEventListener('selectstart', handlePointerDown);
|
|
180
177
|
input.targetRay.removeEventListener('selectend', handlePointerUp);
|
|
181
178
|
input.targetRay.removeEventListener('select', handleClick);
|
|
182
179
|
};
|
|
180
|
+
if (enabled) {
|
|
181
|
+
input.targetRay.addEventListener('selectstart', handlePointerDown);
|
|
182
|
+
input.targetRay.addEventListener('selectend', handlePointerUp);
|
|
183
|
+
input.targetRay.addEventListener('select', handleClick);
|
|
184
|
+
return removeHandlers;
|
|
185
|
+
}
|
|
186
|
+
else {
|
|
187
|
+
removeHandlers();
|
|
188
|
+
return;
|
|
189
|
+
}
|
|
183
190
|
});
|
|
184
|
-
watch(hand, (input) => {
|
|
191
|
+
watch([hand, handContext.enabled], ([input, enabled]) => {
|
|
185
192
|
if (input === undefined)
|
|
186
193
|
return;
|
|
187
|
-
|
|
188
|
-
input.hand.addEventListener('pinchend', handlePointerUp);
|
|
189
|
-
input.hand.addEventListener('pinchend', handleClick);
|
|
190
|
-
return () => {
|
|
194
|
+
const removeHandlers = () => {
|
|
191
195
|
input.hand.removeEventListener('pinchstart', handlePointerDown);
|
|
192
196
|
input.hand.removeEventListener('pinchend', handlePointerUp);
|
|
193
197
|
input.hand.removeEventListener('pinchend', handleClick);
|
|
194
198
|
};
|
|
199
|
+
if (enabled) {
|
|
200
|
+
input.hand.addEventListener('pinchstart', handlePointerDown);
|
|
201
|
+
input.hand.addEventListener('pinchend', handlePointerUp);
|
|
202
|
+
input.hand.addEventListener('pinchend', handleClick);
|
|
203
|
+
return removeHandlers;
|
|
204
|
+
}
|
|
205
|
+
else {
|
|
206
|
+
removeHandlers();
|
|
207
|
+
return;
|
|
208
|
+
}
|
|
195
209
|
});
|
|
196
210
|
watch([useXR().isPresenting, handContext.enabled], ([isPresenting, enabled]) => {
|
|
197
211
|
if (isPresenting && enabled) {
|
package/package.json
CHANGED