From 2cc5d96009d1bed9b112c3e170262226e801c47d Mon Sep 17 00:00:00 2001
From: netpro2k <netpro2k@gmail.com>
Date: Thu, 5 Apr 2018 19:07:38 -0700
Subject: [PATCH] Add back in meeting room space
---
src/hub.js | 4 ++--
src/react-components/avatar-selector.js | 3 ++-
src/react-components/home-root.js | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/hub.js b/src/hub.js
index 4c1e565ed..8a4a9dbe2 100644
--- a/src/hub.js
+++ b/src/hub.js
@@ -263,8 +263,8 @@ const onReady = async () => {
// If ?room is set, this is `yarn start`, so just use a default environment and query string room.
uiRoot.setState({ janusRoomId: qs.room && !isNaN(parseInt(qs.room)) ? parseInt(qs.room) : 1 });
initialEnvironmentEl.setAttribute("gltf-bundle", {
- // src: "https://asset-bundles-dev.reticulum.io/rooms/cliff_meeting_space/CliffMeetingSpaceMeshes.bundle.json"
- src: "https://asset-bundles-dev.reticulum.io/rooms/theater/TheaterMeshes.bundle.json"
+ src: "https://asset-bundles-dev.reticulum.io/rooms/meetingroom/MeetingRoom.bundle.json"
+ // src: "https://asset-bundles-dev.reticulum.io/rooms/theater/TheaterMeshes.bundle.json"
// src: "https://asset-bundles-dev.reticulum.io/rooms/atrium/AtriumMeshes.bundle.json"
// src: "https://asset-bundles-dev.reticulum.io/rooms/courtyard/CourtyardMeshes.bundle.json"
});
diff --git a/src/react-components/avatar-selector.js b/src/react-components/avatar-selector.js
index 5cb456ee5..0f5c0c4ca 100644
--- a/src/react-components/avatar-selector.js
+++ b/src/react-components/avatar-selector.js
@@ -4,7 +4,8 @@ import { injectIntl, FormattedMessage } from "react-intl";
import FontAwesomeIcon from "@fortawesome/react-fontawesome";
import faAngleLeft from "@fortawesome/fontawesome-free-solid/faAngleLeft";
import faAngleRight from "@fortawesome/fontawesome-free-solid/faAngleRight";
-import meetingSpace from "../assets/environments/cliff_meeting_space/MeetingSpace1_mesh.glb";
+
+const meetingSpace = "https://asset-bundles-dev.reticulum.io/rooms/meetingroom/MeetingSpace1_mesh-d48250ebc6.gltf";
class AvatarSelector extends Component {
static propTypes = {
diff --git a/src/react-components/home-root.js b/src/react-components/home-root.js
index 92f56b0bc..8a2f115b8 100644
--- a/src/react-components/home-root.js
+++ b/src/react-components/home-root.js
@@ -16,7 +16,7 @@ addLocaleData([...en]);
const messages = localeData[lang] || localeData.en;
const ENVIRONMENT_URLS = [
- // "https://asset-bundles-dev.reticulum.io/rooms/cliff_meeting_space/CliffMeetingSpaceMeshes.bundle.json",
+ "https://asset-bundles-dev.reticulum.io/rooms/meetingroom/MeetingRoom.bundle.json",
"https://asset-bundles-dev.reticulum.io/rooms/theater/TheaterMeshes.bundle.json",
"https://asset-bundles-dev.reticulum.io/rooms/atrium/AtriumMeshes.bundle.json",
"https://asset-bundles-dev.reticulum.io/rooms/courtyard/CourtyardMeshes.bundle.json"
--
GitLab