From db6ca639ca550955c085825ff6742a880b2abd81 Mon Sep 17 00:00:00 2001
From: johnshaughnessy <johnfshaughnessy@gmail.com>
Date: Tue, 13 Nov 2018 15:10:06 -0800
Subject: [PATCH] Failed attempts to fix the buttons in the freeze menu on
oculus touch.
---
src/components/pin-networked-object-button.js | 3 ---
src/hub.html | 4 ++--
src/systems/userinput/bindings/oculus-touch-user.js | 2 +-
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/components/pin-networked-object-button.js b/src/components/pin-networked-object-button.js
index 3b7ae88cc..c6e0fb129 100644
--- a/src/components/pin-networked-object-button.js
+++ b/src/components/pin-networked-object-button.js
@@ -1,8 +1,5 @@
AFRAME.registerComponent("pin-networked-object-button", {
schema: {
- // Selector for root of all UI that needs to be clickable when pinned
- uiSelector: { type: "string" },
-
// Selector for label to change when pinned/unpinned, must be sibling of this components element
labelSelector: { type: "string" },
diff --git a/src/hub.html b/src/hub.html
index 6f52eb4b6..d8a95dee9 100644
--- a/src/hub.html
+++ b/src/hub.html
@@ -189,7 +189,7 @@
emit-state-change__ungrabbed="state: grabbed; transform: falling; event: ungrabbed;"
emit-state-change__pinned="state: pinned; transform: rising; event: pinned;"
>
- <a-entity class="ui" stop-event-propagation__grab-start="event: grab-start" stop-event-propagation__grab-end="event: grab-end">
+ <a-entity class="ui interactable-ui" stop-event-propagation__grab-start="event: grab-start" stop-event-propagation__grab-end="event: grab-end">
<a-entity class="freeze-menu" visible-while-frozen="withinDistance: 10;">
<a-entity mixin="rounded-text-action-button" pin-networked-object-button="labelSelector:.pin-button-label; hideWhenPinnedSelector:.hide-when-pinned; uiSelector:.interactable-ui" position="0 0.125 0.01"> </a-entity>
<a-entity class="pin-button-label" text=" value:pin; width:1.75; align:center;" text-raycast-hack position="0 0.125 0.02"></a-entity>
@@ -206,7 +206,7 @@
super-networked-interactable="counter: #pen-counter;"
body="type: dynamic; shape: none; mass: 1;"
grabbable="maxGrabbers: 1"
- sticky-object="autoLockOnRelease: true; autoLockOnLoad: true;"
+ sticky-object="autoLockOnRelease: true; autoLockOnLoad: true; autoLockSpeedLimit:0;"
hoverable
scale="0.5 0.5 0.5"
sound__next_pen_color="src: #sound_asset-next_pen_color; on: next_pen_color; poolSize: 2;"
diff --git a/src/systems/userinput/bindings/oculus-touch-user.js b/src/systems/userinput/bindings/oculus-touch-user.js
index 9fb929fbc..b2dd95664 100644
--- a/src/systems/userinput/bindings/oculus-touch-user.js
+++ b/src/systems/userinput/bindings/oculus-touch-user.js
@@ -492,7 +492,7 @@ export const oculusTouchUserBindings = addSetsToBindings({
{
src: { value: rightTriggerPressed2 },
dest: { value: paths.actions.cursor.grab },
- xform: xforms.rising,
+ xform: xforms.falling,
priority: 2
}
],
--
GitLab