diff --git a/src/components/cursor-controller.js b/src/components/cursor-controller.js
index 7e09d0cf1831a3925cac432b87dddd0625d51410..c801f76188260c695d7121ef242a00e1d5db4ea9 100644
--- a/src/components/cursor-controller.js
+++ b/src/components/cursor-controller.js
@@ -99,7 +99,7 @@ AFRAME.registerComponent("cursor-controller", {
this.el.setAttribute("line", { start: this.origin.clone(), end: this.data.cursor.object3D.position.clone() });
}
- // The curser will always be oriented towards the player about its Y axis, so bjects held by the cursor will rotate towards the player.
+ // The cursor will always be oriented towards the player about its Y axis, so objects held by the cursor will rotate towards the player.
this.data.camera.object3D.getWorldPosition(cameraPos);
cameraPos.y = this.data.cursor.object3D.position.y;
this.data.cursor.object3D.lookAt(cameraPos);
diff --git a/src/components/image-plus.js b/src/components/image-plus.js
index d1d4455d986a0ccc92dd94db4595068e25c760d6..5110cebbaca330f9ce53aa32d2d5fbee0963c196 100644
--- a/src/components/image-plus.js
+++ b/src/components/image-plus.js
@@ -69,7 +69,9 @@ errorImage.onload = () => {
AFRAME.registerComponent("image-plus", {
schema: {
src: { type: "string" },
- contentType: { type: "string" }
+ contentType: { type: "string" },
+
+ depth: { default: 0.05 }
},
remove() {
@@ -144,7 +146,6 @@ AFRAME.registerComponent("image-plus", {
texture.minFilter = THREE.LinearFilter;
videoEl.addEventListener("loadedmetadata", () => resolve(texture), { once: true });
videoEl.onerror = reject;
- texture.audioSource = this.el.sceneEl.audioListener.context.createMediaElementSource(videoEl);
// If iOS and video is HLS, do some hacks.
if (
@@ -181,11 +182,13 @@ AFRAME.registerComponent("image-plus", {
return;
}
+ let cacheItem;
if (textureCache.has(url)) {
- const cacheItem = textureCache.get(url);
+ cacheItem = textureCache.get(url);
texture = cacheItem.texture;
cacheItem.count++;
} else {
+ cacheItem = { count: 1 };
if (url === "error") {
texture = errorTexture;
} else if (contentType === "image/gif") {
@@ -194,16 +197,18 @@ AFRAME.registerComponent("image-plus", {
texture = await this.loadImage(url);
} else if (contentType.startsWith("video/") || contentType.startsWith("audio/")) {
texture = await this.loadVideo(url);
+ cacheItem.audioSource = this.el.sceneEl.audioListener.context.createMediaElementSource(texture.image);
} else {
throw new Error(`Unknown content type: ${contentType}`);
}
- textureCache.set(url, { count: 1, texture });
+ cacheItem.texture = texture;
+ textureCache.set(url, cacheItem);
}
- if (texture.audioSource) {
+ if (cacheItem.audioSource) {
const sound = new THREE.PositionalAudio(this.el.sceneEl.audioListener);
- sound.setNodeSource(texture.audioSource);
+ sound.setNodeSource(cacheItem.audioSource);
this.el.setObject3D("sound", sound);
}
} catch (e) {
@@ -229,10 +234,12 @@ AFRAME.registerComponent("image-plus", {
this.el.setObject3D("mesh", this.mesh);
this.el.setAttribute("shape", {
shape: "box",
- halfExtents: { x: width / 2, y: height / 2, z: 0.05 }
+ halfExtents: { x: width / 2, y: height / 2, z: this.data.depth }
});
+
+ // TODO: verify if we actually need to do this
if (this.el.components.body && this.el.components.body.body) {
- this.el.components.body.syncToPhysics(); // not sure if necessary?
+ this.el.components.body.syncToPhysics();
this.el.components.body.updateCannonScale();
}
this.el.emit("image-loaded");
diff --git a/src/components/position-at-box-shape-border.js b/src/components/position-at-box-shape-border.js
index 27ce62dd061753ea7ed0ec24655de2a5bfdd369a..561577b5eb1d302f0dfa44d508352e76cad11829 100644
--- a/src/components/position-at-box-shape-border.js
+++ b/src/components/position-at-box-shape-border.js
@@ -2,7 +2,7 @@ import { getBox } from "../utils/auto-box-collider.js";
const PI = Math.PI;
const HALF_PI = PI / 2;
-const THREE_HALF_PI = 3 * PI / 2;
+const THREE_HALF_PI = 3 * HALF_PI;
const right = new THREE.Vector3(1, 0, 0);
const forward = new THREE.Vector3(0, 0, 1);
const left = new THREE.Vector3(-1, 0, 0);
@@ -43,6 +43,7 @@ AFRAME.registerComponent("position-at-box-shape-border", {
init() {
this.cam = this.el.sceneEl.camera.el.object3D;
+ this.halfExtents = new THREE.Vector3();
},
update() {
@@ -65,7 +66,7 @@ AFRAME.registerComponent("position-at-box-shape-border", {
this.mesh = this.el.getObject3D("mesh");
if (this.el.components.shape) {
this.shape = this.el.components.shape;
- this.halfExtents = new THREE.Vector3().copy(this.shape.data.halfExtents);
+ this.halfExtents.copy(this.shape.data.halfExtents);
} else {
const box = getBox(this.el, this.mesh);
this.halfExtents = box.min
diff --git a/src/components/super-spawner.js b/src/components/super-spawner.js
index b33d4a3c52078ff1453e59f19b7ef36d0435224e..a3d2df9137fe19999c04d66ba27e55ce90afc97e 100644
--- a/src/components/super-spawner.js
+++ b/src/components/super-spawner.js
@@ -109,7 +109,7 @@ AFRAME.registerComponent("super-spawner", {
onGrabEnd(e) {
this.heldEntities.delete(e.detail.hand);
- // This tells super-hands we are handling this releae
+ // This tells super-hands we are handling this release
e.preventDefault();
},
diff --git a/src/hub.html b/src/hub.html
index e519fb4f8e6018c14add14512a10fe3c9f328b38..2f7eb243d63d286c04a7af9effaaef62e18f669e 100644
--- a/src/hub.html
+++ b/src/hub.html
@@ -165,7 +165,7 @@
position-at-box-shape-border="target:.delete-button"
destroy-at-extreme-distances
>
- <a-entity class="delete-button" visible-while-frozen scale="1.00 1.00 1.00">
+ <a-entity class="delete-button" visible-while-frozen>
<a-entity mixin="rounded-text-button" remove-networked-object-button position="0 0 0"> </a-entity>
<a-entity text=" value:Delete; width:2.5; align:center;" text-raycast-hack position="0 0 0.01"></a-entity>
</a-entity>
diff --git a/src/utils/auto-box-collider.js b/src/utils/auto-box-collider.js
index 255c579aed44d74b2dee3294b9dfb0ca1d11e79b..0a8b69037f59147065a141273616e30a034d6ee6 100644
--- a/src/utils/auto-box-collider.js
+++ b/src/utils/auto-box-collider.js
@@ -1,6 +1,7 @@
+const rotation = new THREE.Euler();
export function getBox(entity, boxRoot) {
const box = new THREE.Box3();
- const rotation = entity.object3D.rotation.clone();
+ rotation.copy(entity.object3D.rotation);
entity.object3D.rotation.set(0, 0, 0);
entity.object3D.updateMatrixWorld(true);
box.setFromObject(boxRoot);