From 3449119058454d5d67ea4281153ac7d8a376614c Mon Sep 17 00:00:00 2001
From: Greg Fodor <gfodor@gmail.com>
Date: Sat, 29 Sep 2018 03:56:56 +0000
Subject: [PATCH] Feedback from PR
---
src/assets/stylesheets/scene.scss | 5 -----
src/hub.js | 24 +--------------------
src/react-components/scene-ui.js | 2 --
src/scene.js | 35 ++-----------------------------
4 files changed, 3 insertions(+), 63 deletions(-)
diff --git a/src/assets/stylesheets/scene.scss b/src/assets/stylesheets/scene.scss
index 2c2d78c74..44e6591aa 100644
--- a/src/assets/stylesheets/scene.scss
+++ b/src/assets/stylesheets/scene.scss
@@ -1,7 +1,2 @@
@import 'shared';
@import 'loader';
-
-canvas {
- filter: saturate(1.1) brightness(1.1) contrast(1.1);
-}
-
diff --git a/src/hub.js b/src/hub.js
index ce0e5dca5..590b9d5da 100644
--- a/src/hub.js
+++ b/src/hub.js
@@ -31,9 +31,9 @@ import { ObjectContentOrigins } from "./object-types";
import "./activators/shortpress";
+import "./components/scene-components";
import "./components/wasd-to-analog2d"; //Might be a behaviour or activator in the future
import "./components/mute-mic";
-import "./components/audio-feedback";
import "./components/bone-mute-state-indicator";
import "./components/bone-visibility";
import "./components/in-world-hud";
@@ -44,17 +44,9 @@ import "./components/character-controller";
import "./components/haptic-feedback";
import "./components/networked-video-player";
import "./components/offset-relative-to";
-import "./components/water";
-import "./components/skybox";
-import "./components/layers";
-import "./components/spawn-controller";
-import "./components/hide-when-quality";
import "./components/player-info";
import "./components/debug";
-import "./components/animation-mixer";
-import "./components/loop-animation";
import "./components/hand-poses";
-import "./components/gltf-model-plus";
import "./components/gltf-bundle";
import "./components/hud-controller";
import "./components/freeze-controller";
@@ -64,26 +56,17 @@ import "./components/block-button";
import "./components/visible-while-frozen";
import "./components/stats-plus";
import "./components/networked-avatar";
-import "./components/css-class";
-import "./components/scene-shadow";
import "./components/avatar-replay";
import "./components/media-views";
import "./components/pinch-to-move";
import "./components/look-on-mobile";
import "./components/pitch-yaw-rotator";
import "./components/input-configurator";
-import "./components/sticky-object";
import "./components/auto-scale-cannon-physics-body";
import "./components/position-at-box-shape-border";
import "./components/remove-networked-object-button";
import "./components/destroy-at-extreme-distances";
-import "./components/media-loader";
import "./components/gamma-factor";
-import "./components/ambient-light";
-import "./components/directional-light";
-import "./components/hemisphere-light";
-import "./components/point-light";
-import "./components/spot-light";
import "./components/visible-to-owner";
import "./components/camera-tool";
@@ -123,18 +106,13 @@ import "aframe-physics-extras";
import "super-hands";
import "./components/super-networked-interactable";
import "./components/networked-counter";
-import "./components/super-spawner";
import "./components/event-repeater";
import "./components/controls-shape-offset";
-import "./components/duck";
-import "./components/quack";
-import "./components/grabbable-toggle";
import "./components/cardboard-controls";
import "./components/cursor-controller";
-import "./components/heightfield";
import "./components/nav-mesh-helper";
import "./systems/tunnel-effect";
diff --git a/src/react-components/scene-ui.js b/src/react-components/scene-ui.js
index ef47cc598..ec04e095e 100644
--- a/src/react-components/scene-ui.js
+++ b/src/react-components/scene-ui.js
@@ -14,7 +14,6 @@ addLocaleData([...en]);
class SceneUI extends Component {
static propTypes = {
- store: PropTypes.object,
scene: PropTypes.object,
sceneLoaded: PropTypes.bool,
sceneId: PropTypes.string,
@@ -96,7 +95,6 @@ class SceneUI extends Component {
<div className={styles.name}>{this.props.sceneName}</div>
<div className={styles.attribution}>{this.props.sceneAttribution}</div>
</div>
- <div className={styles.description}>{this.props.sceneDescription}</div>
</div>
</IntlProvider>
);
diff --git a/src/scene.js b/src/scene.js
index 0b6cb5a90..6f2f0732d 100644
--- a/src/scene.js
+++ b/src/scene.js
@@ -9,30 +9,8 @@ patchWebGLRenderingContext();
import "three/examples/js/loaders/GLTFLoader";
-import "./components/ambient-light";
-import "./components/animation-mixer";
-import "./components/audio-feedback";
-import "./components/css-class";
+import "./components/scene-components";
import "./components/debug";
-import "./components/directional-light";
-import "./components/duck";
-import "./components/gltf-model-plus";
-import "./components/heightfield";
-import "./components/hemisphere-light";
-import "./components/hide-when-quality";
-import "./components/layers";
-import "./components/loop-animation";
-import "./components/media-loader";
-import "./components/point-light";
-import "./components/quack";
-import "./components/scene-shadow";
-import "./components/scene-preview-camera";
-import "./components/skybox";
-import "./components/spawn-controller";
-import "./components/spot-light";
-import "./components/sticky-object";
-import "./components/super-spawner";
-import "./components/water";
import "./systems/nav";
import { getReticulumFetchUrl } from "./utils/phoenix-utils";
@@ -47,12 +25,6 @@ import "./gltf-component-mappings";
import { App } from "./App";
window.APP = new App();
-window.APP.RENDER_ORDER = {
- HUD_BACKGROUND: 1,
- HUD_ICONS: 2,
- CURSOR: 3
-};
-const store = window.APP.store;
const qs = new URLSearchParams(location.search);
const isMobile = AFRAME.utils.device.isMobile();
@@ -69,14 +41,12 @@ import registerTelemetry from "./telemetry";
registerTelemetry();
disableiOSZoom();
-store.init();
function mountUI(scene, props = {}) {
ReactDOM.render(
<SceneUI
{...{
scene,
- store,
...props
}}
/>,
@@ -118,8 +88,6 @@ const onReady = async () => {
camera.setAttribute("scene-preview-camera", "");
});
- sceneRoot.appendChild(sceneModelEntity);
-
const res = await fetch(getReticulumFetchUrl(`/api/v1/scenes/${sceneId}`)).then(r => r.json());
const sceneInfo = res.scenes[0];
@@ -129,6 +97,7 @@ const onReady = async () => {
gltfEl.setAttribute("gltf-model-plus", { src: modelUrl, useCache: false, inflate: true });
gltfEl.addEventListener("model-loaded", () => sceneModelEntity.emit("scene-loaded"));
sceneModelEntity.appendChild(gltfEl);
+ sceneRoot.appendChild(sceneModelEntity);
remountUI({
sceneName: sceneInfo.name,
--
GitLab