From c9e47d7c0ba532120153547e990e5e2ed3619bd6 Mon Sep 17 00:00:00 2001
From: Kevin Lee <kevin@infinite-lee.com>
Date: Fri, 31 Aug 2018 15:44:00 -0700
Subject: [PATCH] fix bug where joystick input in rift would drop objects; fix
bug where media loader objects loaded for the first time lose their physics
shape
---
src/components/media-loader.js | 2 +-
src/input-mappings.js | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/components/media-loader.js b/src/components/media-loader.js
index 916e8c796..586318148 100644
--- a/src/components/media-loader.js
+++ b/src/components/media-loader.js
@@ -28,7 +28,7 @@ AFRAME.registerComponent("media-loader", {
const box = getBox(this.el, mesh);
const scaleCoefficient = resize ? getScaleCoefficient(0.5, box) : 1;
this.el.object3DMap.mesh.scale.multiplyScalar(scaleCoefficient);
- if (this.el.body && this.shapeAdded) {
+ if (this.el.body && this.shapeAdded && this.el.body.shapes.length > 1) {
this.el.removeAttribute("shape");
this.shapeAdded = false;
} else if (this.el.body.shapes.length === 0) {
diff --git a/src/input-mappings.js b/src/input-mappings.js
index 2dcd431c1..6b1b4e955 100644
--- a/src/input-mappings.js
+++ b/src/input-mappings.js
@@ -68,7 +68,6 @@ const config = {
"oculus-touch-controls": {
joystick_dpad4_west: { right: "snap_rotate_left" },
joystick_dpad4_east: { right: "snap_rotate_right" },
- joystick_dpad4_center: { left: "action_primary_up", right: "action_primary_up" },
gripdown: ["primary_action_grab", "middle_ring_pinky_down"],
gripup: ["primary_action_release", "middle_ring_pinky_up"],
abuttontouchstart: ["thumb_down", "increase_radius"],
--
GitLab