From 3fbf9462c2c07719162313f2dcfcb4cbe969088b Mon Sep 17 00:00:00 2001
From: Greg Fodor <gfodor@gmail.com>
Date: Fri, 16 Mar 2018 17:05:59 -0700
Subject: [PATCH] Fix for case when scene loads quickly
---
src/react-components/ui-root.js | 2 +-
src/room.html | 1 -
src/room.js | 1 -
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/react-components/ui-root.js b/src/react-components/ui-root.js
index 0fdeb4288..068407173 100644
--- a/src/react-components/ui-root.js
+++ b/src/react-components/ui-root.js
@@ -348,7 +348,7 @@ class UIRoot extends Component {
}
render() {
- if (!this.state.sceneLoaded) {
+ if (!this.props.scene.hasLoaded) {
return (
<div>Loading scene</div>
);
diff --git a/src/room.html b/src/room.html
index c6baedfd5..98f1aa201 100644
--- a/src/room.html
+++ b/src/room.html
@@ -14,7 +14,6 @@
</head>
<body>
- <div id="loader"></div>
<audio id="test-tone" src="./assets/sfx/tone.ogg"></audio>
<a-scene
diff --git a/src/room.js b/src/room.js
index 0dceade53..d52722a30 100644
--- a/src/room.js
+++ b/src/room.js
@@ -223,7 +223,6 @@ function mountUI(scene) {
forcedVREntryType,
store
}} />, document.getElementById("ui-root"));
- document.getElementById("loader").style.display = "none";
});
}
--
GitLab