Merge pull request #6253 from mozilla/bitecs-fix-move-permissions

bitECS: Fix move permissions
Hubs-Foundation · Sep 28, 2023 · c01d792 · c01d792
2 parents 2b999e9 + 5dc6fa3
commit c01d792
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/src/systems/hold-system.js b/src/systems/hold-system.js
@@ -15,6 +15,7 @@ import {
   AEntity
 } from "../bit-components";
 import { canMove } from "../utils/permissions-utils";
+import { canMove as canMoveEntity } from "../utils/bit-permissions-utils";
 import { isPinned } from "../bit-systems/networking";
 
 const GRAB_REMOTE_RIGHT = paths.actions.cursor.right.grab;
@@ -27,8 +28,11 @@ const GRAB_HAND_LEFT = paths.actions.leftHand.grab;
 const DROP_HAND_LEFT = paths.actions.leftHand.drop;
 
 function hasPermissionToGrab(world, eid) {
-  if (!hasComponent(world, AEntity, eid)) return true;
-  return canMove(world.eid2obj.get(eid).el);
+  if (hasComponent(world, AEntity, eid)) {
+    return canMove(world.eid2obj.get(eid).el);
+  } else {
+    return canMoveEntity(eid);
+  }
 }
 
 export function isAEntityPinned(world, eid) {

diff --git a/src/systems/userinput/devices/app-aware-touchscreen.js b/src/systems/userinput/devices/app-aware-touchscreen.js
@@ -2,12 +2,12 @@ import { paths } from "../paths";
 import { Pose } from "../pose";
 import { touchIsAssigned, jobIsAssigned, assign, unassign, findByJob, findByTouch } from "./touchscreen/assignments";
 import { findRemoteHoverTarget } from "../../../components/cursor-controller";
-// import { canMove } from "../../../utils/permissions-utils";
 import ResizeObserver from "resize-observer-polyfill";
 import { hasComponent } from "bitecs";
 import { AEntity, HeldRemoteRight, OffersRemoteConstraint, SingleActionButton, Static } from "../../../bit-components";
 import { anyEntityWith } from "../../../utils/bit-utils";
 import { isPinned } from "../../../bit-systems/networking";
+import { canMove } from "../../../utils/bit-permissions-utils";
 
 const MOVE_CURSOR_JOB = "MOVE CURSOR";
 const MOVE_CAMERA_JOB = "MOVE CAMERA";
@@ -68,9 +68,12 @@ function shouldMoveCursor(touch, rect, raycaster) {
   // TODO isStatic is likely a superfluous check for things matched via OffersRemoteConstraint
   const isStatic = hasComponent(APP.world, Static, remoteHoverTarget);
   return (
-    isSingleActionButton || (isInteractable && (isSceneFrozen || !isPinned(remoteHoverTarget)) && !isStatic)
-    // TODO check canMove
-    //&& (remoteHoverTarget && canMove(remoteHoverTarget))
+    isSingleActionButton ||
+    (isInteractable &&
+      (isSceneFrozen || !isPinned(remoteHoverTarget)) &&
+      !isStatic &&
+      remoteHoverTarget &&
+      canMove(remoteHoverTarget))
   );
 }
 

diff --git a/src/utils/bit-permissions-utils.js b/src/utils/bit-permissions-utils.js
@@ -0,0 +1,11 @@
+import { hasComponent } from "bitecs";
+import { HoldableButton } from "../bit-components";
+import { isPinned } from "../bit-systems/networking";
+
+export function canMove(eid) {
+  // Add support to pen/emojis when those are migrated to bitECS
+  return (
+    hasComponent(APP.world, HoldableButton, eid) ||
+    (APP.hubChannel.can("spawn_and_move_media") && (!isPinned(eid) || APP.hubChannel.can("pin_objects")))
+  );
+}