diff --git a/src/components/grabbable-toggle.js b/src/components/grabbable-toggle.js
deleted file mode 100644
index 5a11d5698d5ba53cbafeab63286bf142b1699bfb..0000000000000000000000000000000000000000
--- a/src/components/grabbable-toggle.js
+++ /dev/null
@@ -1,185 +0,0 @@
-/* global AFRAME, THREE */
-const inherit = AFRAME.utils.extendDeep;
-const physicsCore = require("super-hands/reaction_components/prototypes/physics-grab-proto.js");
-const buttonsCore = require("super-hands/reaction_components/prototypes/buttons-proto.js");
-// new object with all core modules
-const base = inherit({}, physicsCore, buttonsCore);
-AFRAME.registerComponent(
- "grabbable-toggle",
- inherit(base, {
- schema: {
- maxGrabbers: { type: "int", default: NaN },
- invert: { default: false },
- suppressY: { default: false },
- primaryReleaseEvents: { default: ["primary_hand_release"] },
- secondaryReleaseEvents: { default: ["secondary_hand_release"] }
- },
- init: function() {
- this.GRABBED_STATE = "grabbed";
- this.GRAB_EVENT = "grab-start";
- this.UNGRAB_EVENT = "grab-end";
- this.grabbed = false;
- this.grabbers = [];
- this.constraints = new Map();
- this.deltaPositionIsValid = false;
- this.grabDistance = undefined;
- this.grabDirection = { x: 0, y: 0, z: -1 };
- this.grabOffset = { x: 0, y: 0, z: 0 };
- // persistent object speeds up repeat setAttribute calls
- this.destPosition = { x: 0, y: 0, z: 0 };
- this.deltaPosition = new THREE.Vector3();
- this.targetPosition = new THREE.Vector3();
- this.physicsInit();
-
- this.el.addEventListener(this.GRAB_EVENT, e => this.start(e));
- this.el.addEventListener(this.UNGRAB_EVENT, e => this.end(e));
- this.el.addEventListener("mouseout", e => this.lostGrabber(e));
-
- this.toggle = false;
- this.lastGrabber = null;
- },
- update: function() {
- this.physicsUpdate();
- this.xFactor = this.data.invert ? -1 : 1;
- this.zFactor = this.data.invert ? -1 : 1;
- this.yFactor = (this.data.invert ? -1 : 1) * !this.data.suppressY;
- },
- tick: (function() {
- const q = new THREE.Quaternion();
- const v = new THREE.Vector3();
-
- return function() {
- let entityPosition;
- if (this.grabber) {
- // reflect on z-axis to point in same direction as the laser
- this.targetPosition.copy(this.grabDirection);
- this.targetPosition
- .applyQuaternion(this.grabber.object3D.getWorldQuaternion(q))
- .setLength(this.grabDistance)
- .add(this.grabber.object3D.getWorldPosition(v))
- .add(this.grabOffset);
- if (this.deltaPositionIsValid) {
- // relative position changes work better with nested entities
- this.deltaPosition.sub(this.targetPosition);
- entityPosition = this.el.getAttribute("position");
- this.destPosition.x = entityPosition.x - this.deltaPosition.x * this.xFactor;
- this.destPosition.y = entityPosition.y - this.deltaPosition.y * this.yFactor;
- this.destPosition.z = entityPosition.z - this.deltaPosition.z * this.zFactor;
- this.el.setAttribute("position", this.destPosition);
- } else {
- this.deltaPositionIsValid = true;
- }
- this.deltaPosition.copy(this.targetPosition);
- }
- };
- })(),
- remove: function() {
- this.el.removeEventListener(this.GRAB_EVENT, this.start);
- this.el.removeEventListener(this.UNGRAB_EVENT, this.end);
- this.physicsRemove();
- },
- start: function(evt) {
- if (evt.defaultPrevented || !this.startButtonOk(evt)) {
- return;
- }
- // room for more grabbers?
- let grabAvailable = !Number.isFinite(this.data.maxGrabbers) || this.grabbers.length < this.data.maxGrabbers;
- if (Number.isFinite(this.data.maxGrabbers) && !grabAvailable && this.grabbed) {
- this.grabbers[0].components["super-hands"].onGrabEndButton();
- grabAvailable = true;
- }
- if (this.grabbers.indexOf(evt.detail.hand) === -1 && grabAvailable) {
- if (!evt.detail.hand.object3D) {
- console.warn("grabbable entities must have an object3D");
- return;
- }
- this.grabbers.push(evt.detail.hand);
- // initiate physics if available, otherwise manual
- if (!this.physicsStart(evt) && !this.grabber) {
- this.grabber = evt.detail.hand;
- this.resetGrabber();
- }
- // notify super-hands that the gesture was accepted
- if (evt.preventDefault) {
- evt.preventDefault();
- }
- this.grabbed = true;
- this.el.addState(this.GRABBED_STATE);
- }
- },
- end: function(evt) {
- const handIndex = this.grabbers.indexOf(evt.detail.hand);
- if (evt.defaultPrevented || !this.endButtonOk(evt)) {
- return;
- }
-
- const type = evt.detail && evt.detail.buttonEvent ? evt.detail.buttonEvent.type : null;
-
- if (this.toggle && this.lastGrabber !== this.grabbers[0]) {
- this.toggle = false;
- this.lastGrabber = null;
- }
-
- if (handIndex !== -1) {
- this.grabber = this.grabbers[0];
- }
-
- if ((this.isPrimaryRelease(type) && !this.toggle) || this.isSecondaryRelease(type)) {
- this.toggle = true;
- this.lastGrabber = this.grabbers[0];
- return;
- } else if (this.toggle && this.isPrimaryRelease(type)) {
- this.toggle = false;
- this.lastGrabber = null;
- }
-
- if (handIndex !== -1) {
- this.grabbers.splice(handIndex, 1);
- this.grabber = this.grabbers[0];
- }
-
- this.physicsEnd(evt);
- if (!this.resetGrabber()) {
- this.grabbed = false;
- this.el.removeState(this.GRABBED_STATE);
- }
- if (evt.preventDefault) {
- evt.preventDefault();
- }
- },
- resetGrabber: (() => {
- const objPos = new THREE.Vector3();
- const grabPos = new THREE.Vector3();
- return function() {
- if (!this.grabber) {
- return false;
- }
- const raycaster = this.grabber.getAttribute("raycaster");
- this.deltaPositionIsValid = false;
- this.grabDistance = this.el.object3D
- .getWorldPosition(objPos)
- .distanceTo(this.grabber.object3D.getWorldPosition(grabPos));
- if (raycaster) {
- this.grabDirection = raycaster.direction;
- this.grabOffset = raycaster.origin;
- }
- return true;
- };
- })(),
- lostGrabber: function(evt) {
- const i = this.grabbers.indexOf(evt.relatedTarget);
- // if a queued, non-physics grabber leaves the collision zone, forget it
- if (i !== -1 && evt.relatedTarget !== this.grabber && !this.physicsIsConstrained(evt.relatedTarget)) {
- this.grabbers.splice(i, 1);
- }
- },
-
- isPrimaryRelease(type) {
- return this.data.primaryReleaseEvents.indexOf(type) !== -1;
- },
-
- isSecondaryRelease(type) {
- return this.data.secondaryReleaseEvents.indexOf(type) !== -1;
- }
- })
-);
diff --git a/src/components/hand-controls2.js b/src/components/hand-controls2.js
index 961790fead81073fcf066ad907079c2497461cd8..cdafd23c4379a6e8c1a87c5a1156a2d738e09c90 100644
--- a/src/components/hand-controls2.js
+++ b/src/components/hand-controls2.js
@@ -115,17 +115,11 @@ AFRAME.registerComponent("hand-controls2", {
const controlConfiguration = {
hand: hand,
- model: false,
orientationOffset: { x: 0, y: 0, z: 0 }
};
if (hand !== prevData) {
- el.setAttribute("vive-controls", controlConfiguration);
- el.setAttribute("oculus-touch-controls", controlConfiguration);
- el.setAttribute("oculus-go-controls", controlConfiguration);
- el.setAttribute("windows-motion-controls", controlConfiguration);
- el.setAttribute("daydream-controls", controlConfiguration);
- el.setAttribute("gearvr-controls", controlConfiguration);
+ el.setAttribute("tracked-controls", controlConfiguration);
}
},
diff --git a/src/components/tools/pen.js b/src/components/tools/pen.js
index d0fc5932d9ac8d5a12f7a64ae2f9b0a27a51ba9f..7e4b097b0d36ea65f4a39b1040b16828bd566b6d 100644
--- a/src/components/tools/pen.js
+++ b/src/components/tools/pen.js
@@ -62,12 +62,7 @@ AFRAME.registerComponent("pen", {
},
radius: { default: 0.01 }, //drawing geometry radius
minRadius: { default: 0.005 },
- maxRadius: { default: 0.2 },
- startDrawingPath: { default: undefined },
- stopDrawingPath: { default: undefined },
- changePenSizePath: { default: undefined },
- nextColorPath: { default: undefined },
- prevColorPath: { default: undefined }
+ maxRadius: { default: 0.2 }
},
init() {
@@ -87,7 +82,6 @@ AFRAME.registerComponent("pen", {
this.colorIndex = 0;
this.grabbed = false;
- this.actionPath = null;
},
play() {
diff --git a/src/hub.html b/src/hub.html
index cebb916097781d9c110270019725d7ae69c2106c..46b335b32c2e36d35d04b7e04bb48c224181325f 100644
--- a/src/hub.html
+++ b/src/hub.html
@@ -149,8 +149,6 @@
position-at-box-shape-border="target:.delete-button"
destroy-at-extreme-distances
rotation
- activatable__increase-scale="buttonStartEvents: scroll_right; buttonEndEvents: horizontal_scroll_release; activatedState: scaleUp;"
- activatable__decrease-scale="buttonStartEvents: scroll_left; buttonEndEvents: horizontal_scroll_release; activatedState: scaleDown;"
>
<!-- HACK: rotation component above is required for its side effect of setting YXZ order -->
<a-entity class="delete-button" visible-while-frozen>
@@ -162,7 +160,7 @@
<template id="pen-interactable">
<a-entity
- class="pen interactable toggle"
+ class="pen interactable"
super-networked-interactable="counter: #pen-counter;"
body="type: dynamic; shape: none; mass: 1;"
grabbable="maxGrabbers: 1"
@@ -193,8 +191,6 @@
grabbable
hoverable
stretchable
- activatable__snap-hand="buttonStartEvents: secondary_hand_grab; buttonEndEvents: secondary_hand_release;"
- activatable__snap-cursor="buttonStartEvents: secondary-cursor-grab; buttonEndEvents: secondary-cursor-release;"
camera-tool
body="type: dynamic; shape: none; mass: 1;"
shape="shape: box; halfExtents: 0.22 0.145 0.1; offset: 0 0.02 0"
diff --git a/src/hub.js b/src/hub.js
index 282cc63514f9808a68462b30a0d667fb2d9b7883..119012568bcf95de5993ca1470a62ff875e5e759 100644
--- a/src/hub.js
+++ b/src/hub.js
@@ -101,7 +101,6 @@ import "./components/super-networked-interactable";
import "./components/networked-counter";
import "./components/event-repeater";
import "./components/controls-shape-offset";
-import "./components/grabbable-toggle";
import "./components/cardboard-controls";