From cd203344b3c765cf90ff2d33d78e1f21e62fe7f1 Mon Sep 17 00:00:00 2001
From: joni <johnfshaughnessy@gmail.com>
Date: Thu, 10 May 2018 13:06:26 -0700
Subject: [PATCH] Move RENDER_ORDER into window.APP
---
src/components/cursor-controller.js | 2 +-
src/components/in-world-hud.js | 9 +++++----
src/hub.js | 11 +++++------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/components/cursor-controller.js b/src/components/cursor-controller.js
index af1a9e816..7f0f815de 100644
--- a/src/components/cursor-controller.js
+++ b/src/components/cursor-controller.js
@@ -399,7 +399,7 @@ AFRAME.registerComponent("cursor-controller", {
},
_handleCursorLoaded: function() {
- this.data.cursor.object3DMap.mesh.renderOrder = window.RENDER_ORDER.CURSOR;
+ this.data.cursor.object3DMap.mesh.renderOrder = window.APP.RENDER_ORDER.CURSOR;
},
_handleControllerConnected: function(e) {
diff --git a/src/components/in-world-hud.js b/src/components/in-world-hud.js
index 30a912ef9..7633414b6 100644
--- a/src/components/in-world-hud.js
+++ b/src/components/in-world-hud.js
@@ -8,10 +8,11 @@ AFRAME.registerComponent("in-world-hud", {
this.freeze = this.el.querySelector(".freeze");
this.bubble = this.el.querySelector(".bubble");
this.background = this.el.querySelector(".bg");
- this.mic.object3DMap.mesh.renderOrder = window.RENDER_ORDER.HUD;
- this.freeze.object3DMap.mesh.renderOrder = window.RENDER_ORDER.HUD;
- this.bubble.object3DMap.mesh.renderOrder = window.RENDER_ORDER.HUD;
- this.background.object3DMap.mesh.renderORder = window.RENDER_ORDER.HUD_BACKGROUND;
+ const renderOrder = window.APP.RENDER_ORDER;
+ this.mic.object3DMap.mesh.renderOrder = renderOrder.HUD;
+ this.freeze.object3DMap.mesh.renderOrder = renderOrder.HUD;
+ this.bubble.object3DMap.mesh.renderOrder = renderOrder.HUD;
+ this.background.object3DMap.mesh.renderORder = renderOrder.HUD_BACKGROUND;
this.updateButtonStates = () => {
this.mic.setAttribute("icon-button", "active", this.el.sceneEl.is("muted"));
diff --git a/src/hub.js b/src/hub.js
index b3db4c5fa..5b82f89e5 100644
--- a/src/hub.js
+++ b/src/hub.js
@@ -86,6 +86,11 @@ if (qs.quality) {
} else {
window.APP.quality = isMobile ? "low" : "high";
}
+window.APP.RENDER_ORDER = {
+ HUD_BACKGROUND: 1,
+ HUD: 2,
+ CURSOR: 3
+};
import "aframe-physics-system";
import "aframe-physics-extras";
@@ -111,12 +116,6 @@ import { generateDefaultProfile, generateRandomName } from "./utils/identity.js"
import { getAvailableVREntryTypes, VR_DEVICE_AVAILABILITY } from "./utils/vr-caps-detect.js";
import ConcurrentLoadDetector from "./utils/concurrent-load-detector.js";
-window.RENDER_ORDER = {
- HUD_BACKGROUND: 1,
- HUD: 2,
- CURSOR: 3
-};
-
function qsTruthy(param) {
const val = qs[param];
// if the param exists but is not set (e.g. "?foo&bar"), its value is null.
--
GitLab