diff --git a/src/App.js b/src/App.js
index b814e080d4e1df7ae5f6dbe7649d2548211f4c42..1f425e82d19b5ebb08852e71235904849d52b1ea 100644
--- a/src/App.js
+++ b/src/App.js
@@ -15,7 +15,6 @@ export class App {
this.quality = quality;
if (this.scene) {
- console.log("quality-changed", quality);
this.scene.dispatchEvent(new CustomEvent("quality-changed", { detail: quality }));
}
diff --git a/src/assets/stylesheets/hub.scss b/src/assets/stylesheets/hub.scss
index dd69bc88ab5e30c2022269a128f1f910171a6673..d9519c92fcc0b05dae6916bcf1b06f087c0e14d2 100644
--- a/src/assets/stylesheets/hub.scss
+++ b/src/assets/stylesheets/hub.scss
@@ -8,7 +8,7 @@
@import 'audio';
@import 'info-dialog';
-.a-enter-vr {
+.a-enter-vr, .a-orientation-modal {
display: none;
}
diff --git a/src/avatar-selector.html b/src/avatar-selector.html
index 531a7e15f8ba2bbd479273d0af8332f3b3c836e1..96dd9c67463ec3ddda58956463b2b136b005ed27 100644
--- a/src/avatar-selector.html
+++ b/src/avatar-selector.html
@@ -6,9 +6,9 @@
<title>avatar selector</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<% if(NODE_ENV === "production") { %>
- <script src="https://cdn.rawgit.com/brianpeiris/aframe/845825ae694449524c185c44a314d361eead4680/dist/aframe-master.min.js"></script>
+ <script src="https://cdn.rawgit.com/aframevr/aframe/3e7a4b3/dist/aframe-master.min.js" integrity="sha384-LQXa4VjhYucs9sVd5yQ3OhBXRea0jrvbHJA8CYLgTnvzxF5uvyhabSo1mX4tT2c6" crossorigin="anonymous"></script>
<% } else { %>
- <script src="https://cdn.rawgit.com/brianpeiris/aframe/845825ae694449524c185c44a314d361eead4680/dist/aframe-master.js"></script>
+ <script src="https://cdn.rawgit.com/aframevr/aframe/3e7a4b3/dist/aframe-master.js" integrity="sha384-EaMOuyBOi9ERV/lVDwQgz/yFWBDWPsIju5Co6oCZZHXuvbLBO81yPWn80q0BbBn3" crossorigin="anonymous"></script>
<% } %>
</head>
diff --git a/src/components/bone-mute-state-indicator.js b/src/components/bone-mute-state-indicator.js
index 2d79b3f9c37feee028b89afbe6eaffe7bbd654d8..92a2590e2cda9c2d0c048b0849d1e7bdcab35849 100644
--- a/src/components/bone-mute-state-indicator.js
+++ b/src/components/bone-mute-state-indicator.js
@@ -14,7 +14,6 @@ AFRAME.registerComponent("bone-mute-state-indicator", {
this.el.addEventListener("model-loaded", () => {
this.unmutedBone = this.el.object3D.getObjectByName(this.data.unmutedBoneName);
this.mutedBone = this.el.object3D.getObjectByName(this.data.mutedBoneName);
- console.log(this.unmutedBone, this.mutedBone);
this.modelLoaded = true;
this.updateMuteState();
diff --git a/src/components/controls-shape-offset.js b/src/components/controls-shape-offset.js
index 7ce8764332f0e8b7b6116add6a8e8178a84121f6..7f47c498bc287a0dbd5c8f8126b724d320c95ca7 100644
--- a/src/components/controls-shape-offset.js
+++ b/src/components/controls-shape-offset.js
@@ -2,7 +2,7 @@ import { CONTROLLER_OFFSETS } from "./hand-controls2.js";
AFRAME.registerComponent("controls-shape-offset", {
schema: {
- additionalOffset: { default: { x: 0, y: -0.03, z: -0.04 } }
+ additionalOffset: { type: "vec3", default: { x: 0, y: -0.03, z: -0.04 } }
},
init: function() {
this.controller = null;
diff --git a/src/components/hand-controls2.js b/src/components/hand-controls2.js
index a5f212453d00a4dd6d7fdeb001dd36dc545c5057..d99d5fc063d9a2c487c60490616b959b79c297ea 100644
--- a/src/components/hand-controls2.js
+++ b/src/components/hand-controls2.js
@@ -13,6 +13,7 @@ const POSES = {
export const CONTROLLER_OFFSETS = {
default: new THREE.Matrix4(),
"oculus-touch-controls": new THREE.Matrix4().makeTranslation(0, -0.015, 0.04),
+ "oculus-go-controls": new THREE.Matrix4(),
"vive-controls": new THREE.Matrix4().compose(
new THREE.Vector3(0, -0.017, 0.13),
new THREE.Quaternion().setFromEuler(new THREE.Euler(-40 * THREE.Math.DEG2RAD, 0, 0)),
@@ -110,12 +111,13 @@ AFRAME.registerComponent("hand-controls2", {
const controlConfiguration = {
hand: hand,
model: false,
- rotationOffset: 0
+ 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);
diff --git a/src/components/hide-when-quality.js b/src/components/hide-when-quality.js
index e09d3ae90db3ce48e7afb815b5e0fcf22aa79fc3..93e238d61b74eff66d3becdabca314d13641a97c 100644
--- a/src/components/hide-when-quality.js
+++ b/src/components/hide-when-quality.js
@@ -17,7 +17,6 @@ AFRAME.registerComponent("hide-when-quality", {
},
updateComponentState(quality) {
- console.log(quality);
this.el.setAttribute("visible", quality !== this.data);
}
});
diff --git a/src/components/hud-controller.js b/src/components/hud-controller.js
index d2439b3765d0272ae5b113fa174b1738ab213c2b..67f9c4616285d38efe31e84e63475879463d84fb 100644
--- a/src/components/hud-controller.js
+++ b/src/components/hud-controller.js
@@ -21,6 +21,8 @@ AFRAME.registerComponent("hud-controller", {
init() {
this.isYLocked = false;
this.lockedHeadPositionY = 0;
+ this.lookDir = new THREE.Vector3();
+ this.lookEuler = new THREE.Euler();
},
pause() {
@@ -62,12 +64,14 @@ AFRAME.registerComponent("hud-controller", {
// Reorient the hud only if the user is looking away from the hud, for right now this arbitrarily means the hud is 1/2 way animated away
// TODO: come up with better huristics for this that maybe account for the user turning away from the hud "too far", also animate the position so that it doesnt just snap.
if (yawDif >= yawCutoff || pitch < lookCutoff - animRange / 2) {
- const lookDir = new THREE.Vector3(0, 0, -1);
- lookDir.applyQuaternion(head.quaternion);
- lookDir.add(head.position);
- hud.position.x = lookDir.x;
- hud.position.z = lookDir.z;
- hud.setRotationFromEuler(new THREE.Euler(0, head.rotation.y, 0));
+ this.lookDir.set(0, 0, -1);
+ this.lookDir.applyQuaternion(head.quaternion);
+ this.lookDir.add(head.position);
+ hud.position.x = this.lookDir.x;
+ hud.position.z = this.lookDir.z;
+ hud.rotation.copy(head.rotation);
+ hud.rotation.x = 0;
+ hud.rotation.z = 0;
}
hud.position.y = (this.isYLocked ? this.lockedHeadPositionY : head.position.y) + offset + (1 - t) * offset;
hud.rotation.x = (1 - t) * THREE.Math.DEG2RAD * 90;
diff --git a/src/components/offset-relative-to.js b/src/components/offset-relative-to.js
index f940b687284b34677c579e931557fc9671631f41..39361022488971c5b41a160520594020d81f36ac 100644
--- a/src/components/offset-relative-to.js
+++ b/src/components/offset-relative-to.js
@@ -18,12 +18,6 @@ AFRAME.registerComponent("offset-relative-to", {
const offsetVector = new THREE.Vector3().copy(this.data.offset);
this.data.target.object3D.localToWorld(offsetVector);
this.el.setAttribute("position", offsetVector);
-
- const headWorldRotation = this.data.target.object3D.getWorldRotation();
- this.el.setAttribute("rotation", {
- x: headWorldRotation.x * THREE.Math.RAD2DEG,
- y: headWorldRotation.y * THREE.Math.RAD2DEG,
- z: headWorldRotation.z * THREE.Math.RAD2DEG
- });
+ this.data.target.object3D.getWorldQuaternion(this.el.object3D.quaternion);
}
});
diff --git a/src/components/scene-shadow.js b/src/components/scene-shadow.js
index 72d77cf36b36c80279b0683531f4682f1f5b7a47..14b2e23cc6bbfc4b0a3e930cba4bfab65e74977d 100644
--- a/src/components/scene-shadow.js
+++ b/src/components/scene-shadow.js
@@ -1,21 +1,9 @@
// For use in environment gltf bundles to set scene shadow properties.
AFRAME.registerComponent("scene-shadow", {
schema: {
- autoUpdate: {
- type: "boolean",
- default: true
- },
type: {
type: "string",
default: "pcf"
- },
- renderReverseSided: {
- type: "boolean",
- default: true
- },
- renderSingleSided: {
- type: "boolean",
- default: true
}
},
init() {
diff --git a/src/components/virtual-gamepad-controls.js b/src/components/virtual-gamepad-controls.js
index 87433f427c00fc64054405e5efea91f841dc579a..5b45d07cbb197ae144f0450b31b7e29078c368f1 100644
--- a/src/components/virtual-gamepad-controls.js
+++ b/src/components/virtual-gamepad-controls.js
@@ -143,6 +143,7 @@ AFRAME.registerComponent("virtual-gamepad-controls", {
remove() {
this.el.sceneEl.removeEventListener("entervr", this.onEnterVr);
this.el.sceneEl.removeEventListener("exitvr", this.onExitVr);
+ document.body.removeChild(this.mockJoystickContainer);
document.body.removeChild(this.leftTouchZone);
document.body.removeChild(this.rightTouchZone);
}
diff --git a/src/components/water.js b/src/components/water.js
index cfa33e4b166eea99f5af30d5c5fa36d0075c7378..52d9c01da3b086aa0bccecc4dd9a6074d43be1c9 100644
--- a/src/components/water.js
+++ b/src/components/water.js
@@ -89,7 +89,7 @@ function MobileWater(geometry, options) {
${THREE.ShaderChunk["common"]}
${THREE.ShaderChunk["packing"]}
${THREE.ShaderChunk["bsdfs"]}
- ${THREE.ShaderChunk["lights_pars"]}
+ ${THREE.ShaderChunk["lights_pars_begin"]}
void main() {
vec4 noise = getNoise( worldPosition.xz * size );
diff --git a/src/hub.html b/src/hub.html
index 1d973e1902655946371978120a5e2ac55108f950..da81073233337b2bf22761423c5b06284bbcbbc8 100644
--- a/src/hub.html
+++ b/src/hub.html
@@ -13,9 +13,9 @@
<link href="https://fonts.googleapis.com/css?family=Zilla+Slab:300,300i,400,400i,700" rel="stylesheet">
<% if(NODE_ENV === "production") { %>
- <script src="https://cdn.rawgit.com/brianpeiris/aframe/845825ae694449524c185c44a314d361eead4680/dist/aframe-master.min.js"></script>
+ <script src="https://cdn.rawgit.com/aframevr/aframe/3e7a4b3/dist/aframe-master.min.js" integrity="sha384-LQXa4VjhYucs9sVd5yQ3OhBXRea0jrvbHJA8CYLgTnvzxF5uvyhabSo1mX4tT2c6" crossorigin="anonymous"></script>
<% } else { %>
- <script src="https://cdn.rawgit.com/brianpeiris/aframe/845825ae694449524c185c44a314d361eead4680/dist/aframe-master.js"></script>
+ <script src="https://cdn.rawgit.com/aframevr/aframe/3e7a4b3/dist/aframe-master.js" integrity="sha384-EaMOuyBOi9ERV/lVDwQgz/yFWBDWPsIju5Co6oCZZHXuvbLBO81yPWn80q0BbBn3" crossorigin="anonymous"></script>
<% } %>
<script>window.logs.enable("naf-janus-adapter:*")</script>
</head>
@@ -31,12 +31,14 @@
</audio>
<a-scene
+ renderer="antialias: true"
networked-scene="adapter: janus; audio: true; debug: true; connectOnLoad: false;"
physics="gravity: -6;"
mute-mic="eventSrc: a-scene; toggleEvents: action_mute"
freeze-controller="toggleEvent: action_freeze"
personal-space-bubble="debug: false;"
- >
+ vr-mode-ui="enabled: false"
+ >
<a-assets>
<img id="tooltip" src="./assets/hud/tooltip.9.png" >
diff --git a/src/hub.js b/src/hub.js
index 9d809ddc4f4e4efcd7f08608c8c221e64d6948d8..116a58d8e901f6b3b989d8871b9f53ac6a779094 100644
--- a/src/hub.js
+++ b/src/hub.js
@@ -9,7 +9,7 @@ patchWebGLRenderingContext();
import "aframe-xr";
import "./vendor/GLTFLoader";
-import "networked-aframe";
+import "networked-aframe/src/index";
import "naf-janus-adapter";
import "aframe-teleport-controls";
import "aframe-input-mapping-component";
@@ -111,7 +111,7 @@ import { inGameActions, config as inputConfig } from "./input-mappings";
import registerTelemetry from "./telemetry";
import { generateDefaultProfile, generateRandomName } from "./utils/identity.js";
-import { getAvailableVREntryTypes } from "./utils/vr-caps-detect.js";
+import { getAvailableVREntryTypes, VR_DEVICE_AVAILABILITY } from "./utils/vr-caps-detect.js";
import ConcurrentLoadDetector from "./utils/concurrent-load-detector.js";
function qsTruthy(param) {
@@ -348,7 +348,11 @@ const onReady = async () => {
}
getAvailableVREntryTypes().then(availableVREntryTypes => {
- remountUI({ availableVREntryTypes });
+ if (availableVREntryTypes.gearvr === VR_DEVICE_AVAILABILITY.yes) {
+ remountUI({ availableVREntryTypes, forcedVREntryType: "gearvr" });
+ } else {
+ remountUI({ availableVREntryTypes });
+ }
});
const environmentRoot = document.querySelector("#environment-root");
diff --git a/src/input-mappings.js b/src/input-mappings.js
index f9985498157ac70bec292eacfe241dfbb5927355..5413bbac75868938b92986d40c2e2aa21f0effb2 100644
--- a/src/input-mappings.js
+++ b/src/input-mappings.js
@@ -34,6 +34,9 @@ const config = {
},
"gearvr-controls": {
trackpad: "trackpad_dpad4"
+ },
+ "oculus-go-controls": {
+ trackpad: "trackpad_dpad4"
}
}
},
@@ -77,8 +80,8 @@ const config = {
surfacetouchend: "thumb_up",
thumbsticktouchstart: "thumb_down",
thumbsticktouchend: "thumb_up",
- triggerdown: ["action_primary_down", "action_grab", "index_down"],
- triggerup: ["action_primary_up", "action_release", "index_up"],
+ triggerdown: ["action_grab", "index_down"],
+ triggerup: ["action_release", "index_up"],
"axismove.reverseY": { left: "move" },
abuttondown: "action_primary_down",
abuttonup: "action_primary_up"
@@ -123,6 +126,16 @@ const config = {
triggerdown: ["action_primary_down"],
triggerup: ["action_primary_up"]
},
+ "oculus-go-controls": {
+ trackpad_dpad4_pressed_west_down: "snap_rotate_left",
+ trackpad_dpad4_pressed_east_down: "snap_rotate_right",
+ trackpad_dpad4_pressed_center_down: ["action_primary_down"],
+ trackpad_dpad4_pressed_north_down: ["action_primary_down"],
+ trackpad_dpad4_pressed_south_down: ["action_primary_down"],
+ trackpadup: ["action_primary_up"],
+ triggerdown: ["action_primary_down"],
+ triggerup: ["action_primary_up"]
+ },
keyboard: {
m_press: "action_mute",
q_press: "snap_rotate_left",
@@ -182,6 +195,10 @@ const config = {
"gearvr-controls": {
trackpaddown: { right: "action_ui_select_down" },
trackpadup: { right: "action_ui_select_up" }
+ },
+ "oculus-go-controls": {
+ trackpaddown: { right: "action_ui_select_down" },
+ trackpadup: { right: "action_ui_select_up" }
}
}
}
diff --git a/src/react-components/avatar-selector.js b/src/react-components/avatar-selector.js
index 4495819a83aca79aaddaf63deb66efecb4f49dcb..e4b27897e839eb53f99267b8b3bc70e2c81f8206 100644
--- a/src/react-components/avatar-selector.js
+++ b/src/react-components/avatar-selector.js
@@ -131,7 +131,7 @@ class AvatarSelector extends Component {
<a-entity key={avatar.id} rotation={`0 ${360 * -i / this.props.avatars.length} 0`}>
<a-entity position="0 0 5" gltf-model-plus={`src: #${avatar.id}`} inflate="true">
<template data-selector=".RootScene">
- <a-entity animation-mixer />
+ <a-entity animation-mixer="" />
</template>
<a-animation
@@ -168,7 +168,7 @@ class AvatarSelector extends Component {
</a-entity>
<a-entity position="0 1.5 -5.6" rotation="-10 180 0">
- <a-entity camera />
+ <a-entity camera="" />
</a-entity>
<a-entity
diff --git a/src/systems/exit-on-blur.js b/src/systems/exit-on-blur.js
index ae4c9c00a6cb9d979e9df025ec28bf0c28e1002e..f3b3979aa29ae52e924370f7cc1f87a3b20c119d 100644
--- a/src/systems/exit-on-blur.js
+++ b/src/systems/exit-on-blur.js
@@ -2,6 +2,9 @@ AFRAME.registerSystem("exit-on-blur", {
init() {
this.onBlur = this.onBlur.bind(this);
this.onFocus = this.onFocus.bind(this);
+ this.onTimeout = this.onTimeout.bind(this);
+
+ this.isOculusBrowser = navigator.userAgent.match(/Oculus/);
window.addEventListener("blur", this.onBlur);
window.addEventListener("focus", this.onFocus);
@@ -9,11 +12,21 @@ AFRAME.registerSystem("exit-on-blur", {
this.exitTimeout = null;
},
+ tick() {
+ // This is a hack to detect when an Oculus Go user has taken off the headset and the headset has
+ // entered standby mode. Currently Oculus Browser is not emitting a blur, vrdisplaydeactivate,
+ // vrdisplayblur, visibilitychange, or vrdisplaypresentchange event, so we wait 15 seconds after
+ // the last requestAnimationFrame callback to determine if the headset has gone into standby mode.
+ if (this.isOculusBrowser) {
+ clearTimeout(this.exitTimeout);
+ this.exitTimeout = setTimeout(this.onTimeout, 15 * 1000);
+ }
+ },
+
onBlur() {
if (this.el.isMobile) {
- this.exitTimeout = setTimeout(() => {
- this.el.dispatchEvent(new CustomEvent("exit"));
- }, 30 * 1000);
+ clearTimeout(this.exitTimeout);
+ this.exitTimeout = setTimeout(this.onTimeout, 30 * 1000);
}
},
@@ -23,6 +36,10 @@ AFRAME.registerSystem("exit-on-blur", {
}
},
+ onTimeout() {
+ this.el.dispatchEvent(new CustomEvent("exit"));
+ },
+
remove() {
clearTimeout(this.exitTimeout);
window.removeEventListener("blur", this.onBlur);
diff --git a/src/vendor/Water.js b/src/vendor/Water.js
index a3160a754e0b41ba59e9219350f988ae6e03901f..4d1800b918d7473ebe9eeee8a4ba817284726073 100644
--- a/src/vendor/Water.js
+++ b/src/vendor/Water.js
@@ -159,7 +159,7 @@ THREE.Water = function(geometry, options) {
THREE.ShaderChunk["packing"],
THREE.ShaderChunk["bsdfs"],
THREE.ShaderChunk["fog_pars_fragment"],
- THREE.ShaderChunk["lights_pars"],
+ THREE.ShaderChunk["lights_pars_begin"],
THREE.ShaderChunk["shadowmap_pars_fragment"],
THREE.ShaderChunk["shadowmask_pars_fragment"],
diff --git a/yarn.lock b/yarn.lock
index 4370d655c31a2e6d1d050c648da9eedd12c79f73..4cda32f1367a73148e1b847051739c0c1246b7df 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -202,7 +202,7 @@ aframe-slice9-component@^1.0.0:
"aframe-teleport-controls@https://github.com/mozillareality/aframe-teleport-controls#hubs/master":
version "0.3.2"
- resolved "https://github.com/mozillareality/aframe-teleport-controls#9e2ef7da57144c4a615eba40a945d4cfa105a092"
+ resolved "https://github.com/mozillareality/aframe-teleport-controls#b241e71b256450cdd7a2331d0ab02cf401029493"
"aframe-xr@github:brianpeiris/aframe-xr#3162aed":
version "0.0.9"
@@ -2131,8 +2131,8 @@ colormin@^1.0.5:
has "^1.0.1"
colors@*:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.1.tgz#f4a3d302976aaf042356ba1ade3b1a2c62d9d794"
+ version "1.2.3"
+ resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.3.tgz#1b152a9c4f6c9f74bc4bb96233ad0b7983b79744"
colors@1.0.3:
version "1.0.3"
@@ -5695,7 +5695,7 @@ neo-async@^2.5.0:
"networked-aframe@https://github.com/mozillareality/networked-aframe#mr-social-client/master":
version "0.6.1"
- resolved "https://github.com/mozillareality/networked-aframe#3e690e113052a7ebf8e2b0a89785843690ba7c7b"
+ resolved "https://github.com/mozillareality/networked-aframe#641b5e44b8514d02925e3efb4289ca36a41c1006"
dependencies:
easyrtc "1.1.0"
express "^4.10.7"