spawn pen near hand when user is determined to be using 6-dof

Author: InfiniteLee

src/components/super-spawner.js

@@ -55,14 +55,19 @@ AFRAME.registerComponent("super-spawner", {
     centerSpawnedObject: { default: false },
 
     /**
-     * Optional event to listen for to spawn an object on the defaultHand
+     * Optional event to listen for to spawn an object on the preferred superHand
      */
     spawnEvent: { type: "string" },
 
     /**
-     * The hand to use if an object is spawned via spawnEvent
+     * The superHand to use if an object is spawned via spawnEvent
      */
-    defaultHand: { type: "selector" }
+    superHand: { type: "selector" },
+
+    /**
+     * The cursor superHand to use if an object is spawned via spawnEvent
+     */
+    cursorSuperHand: { type: "selector" }
   },
 
   init() {
@@ -103,31 +108,38 @@ AFRAME.registerComponent("super-spawner", {
     this.heldEntities.clear();
   },
 
-  async onSpawnEvent() {
-    const hand = this.data.defaultHand;
+  onSpawnEvent: (() => {
+    const spawnOffset = new THREE.Vector3();
+    return async function() {
+      const controllerCount = this.el.sceneEl.components["input-configurator"].controllerQueue.length;
+      const using6DOF = controllerCount > 1 && this.el.sceneEl.is("vr-mode");
+      const hand = using6DOF ? this.data.superHand : this.data.cursorSuperHand;
 
-    if (this.cooldownTimeout || !hand) {
-      return;
-    }
+      if (this.cooldownTimeout || !hand) {
+        return;
+      }
 
-    const entity = addMedia(this.data.src, this.data.template, ObjectContentOrigins.SPAWNER).entity;
+      const entity = addMedia(this.data.src, this.data.template, ObjectContentOrigins.SPAWNER).entity;
 
-    entity.object3D.position.copy(hand.object3D.position);
-    entity.object3D.rotation.copy(hand.object3D.rotation);
-    entity.object3D.scale.copy(this.data.useCustomSpawnScale ? this.data.spawnScale : this.el.object3D.scale);
+      hand.object3D.getWorldPosition(entity.object3D.position);
+      hand.object3D.getWorldQuaternion(entity.object3D.quaternion);
+      if (this.data.useCustomSpawnScale) {
+        entity.object3D.scale.copy(this.data.spawnScale);
+      }
 
-    this.activateCooldown();
+      this.activateCooldown();
 
-    await waitForEvent("body-loaded", entity);
+      await waitForEvent("body-loaded", entity);
 
-    if (this.data.centerSpawnedObject) {
-      entity.body.position.copy(hand.object3D.position);
-    }
+      hand.object3D.getWorldPosition(entity.object3D.position);
 
-    for (let i = 0; i < this.data.grabEvents.length; i++) {
-      hand.emit(this.data.grabEvents[i], { targetEntity: entity });
-    }
-  },
+      if (!using6DOF) {
+        for (let i = 0; i < this.data.grabEvents.length; i++) {
+          hand.emit(this.data.grabEvents[i], { targetEntity: entity });
+        }
+      }
+    };
+  })(),
 
   async onGrabStart(e) {
     if (this.cooldownTimeout) {

src/hub.html

@@ -174,7 +174,7 @@
                     super-networked-interactable="counter: #pen-counter;"
                     body="type: dynamic; shape: none; mass: 1;"
                     grabbable-toggle="maxGrabbers: 1;"
-                    sticky-object="autoLockOnRelease: true;"
+                    sticky-object="autoLockOnRelease: true; autoLockOnLoad: true;"
                     hoverable
                     activatable__draw-hand="buttonStartEvents: secondary_hand_grab; buttonEndEvents: secondary_hand_release;"
                     activatable__draw-cursor="buttonStartEvents: secondary-cursor-grab; buttonEndEvents: secondary-cursor-release;"
@@ -440,11 +440,9 @@
         super-spawner="
             template: #pen-interactable; 
             src: https://asset-bundles-prod.reticulum.io/interactables/DrawingPen/DrawingPen-484ae5682f.gltf;
-            centerSpawnedObject: true;
-            spawnEvent: spawn_pen; 
-            defaultHand: #cursor;
-            useCustomSpawnScale: true;
-            spawnScale: 0.5 0.5 0.5;" 
+            spawnEvent: spawn_pen;
+            superHand: #player-right-controller;
+            cursorSuperHand: #cursor;"
         ></a-entity>
     </a-scene>