From ee430548b10b074e4090d1dd530183d4f83e7dac Mon Sep 17 00:00:00 2001
From: Robert Long <robert@robertlong.me>
Date: Tue, 24 Apr 2018 19:18:05 -0700
Subject: [PATCH] ASSET_SERVER -> ASSET_BUNDLE_SERVER
---
scripts/default.env | 2 +-
src/hub.js | 8 ++++----
src/react-components/home-root.js | 10 +++++-----
webpack.config.js | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/scripts/default.env b/scripts/default.env
index e027cf715..c7ec289d2 100644
--- a/scripts/default.env
+++ b/scripts/default.env
@@ -4,4 +4,4 @@ ORIGIN_TRIAL_TOKEN="ArEZ0vY0uMo3pj+oY8Up4u4Hy8QolJwKxG4/2WRhSPnTZRrviiGhzP6/y72n
ORIGIN_TRIAL_EXPIRES="2018-05-15"
JANUS_SERVER="wss://prod-janus.reticulum.io"
DEV_RETICULUM_SERVER="dev.reticulum.io"
-ASSET_SERVER="https://asset-bundles-prod.reticulum.io"
+ASSET_BUNDLE_SERVER="https://asset-bundles-prod.reticulum.io"
diff --git a/src/hub.js b/src/hub.js
index a25eebbaf..0e29e104a 100644
--- a/src/hub.js
+++ b/src/hub.js
@@ -330,10 +330,10 @@ const onReady = async () => {
// If ?room is set, this is `yarn start`, so just use a default environment and query string room.
remountUI({ janusRoomId: qs.room && !isNaN(parseInt(qs.room)) ? parseInt(qs.room) : 1 });
initialEnvironmentEl.setAttribute("gltf-bundle", {
- src: process.env.ASSET_SERVER + "/rooms/meetingroom/MeetingRoom.bundle.json"
- // src: process.env.ASSET_SERVER + "/rooms/theater/TheaterMeshes.bundle.json"
- // src: process.env.ASSET_SERVER + "/rooms/atrium/AtriumMeshes.bundle.json"
- // src: process.env.ASSET_SERVER + "/rooms/courtyard/CourtyardMeshes.bundle.json"
+ src: process.env.ASSET_BUNDLE_SERVER + "/rooms/meetingroom/MeetingRoom.bundle.json"
+ // src: process.env.ASSET_BUNDLE_SERVER + "/rooms/theater/TheaterMeshes.bundle.json"
+ // src: process.env.ASSET_BUNDLE_SERVER + "/rooms/atrium/AtriumMeshes.bundle.json"
+ // src: process.env.ASSET_BUNDLE_SERVER + "/rooms/courtyard/CourtyardMeshes.bundle.json"
});
return;
}
diff --git a/src/react-components/home-root.js b/src/react-components/home-root.js
index 149797cc3..0a5693196 100644
--- a/src/react-components/home-root.js
+++ b/src/react-components/home-root.js
@@ -18,11 +18,11 @@ addLocaleData([...en]);
const messages = localeData[lang] || localeData.en;
const ENVIRONMENT_URLS = [
- process.env.ASSET_SERVER + "/rooms/meetingroom/MeetingRoom.bundle.json",
- process.env.ASSET_SERVER + "/rooms/theater/Theater.bundle.json",
- process.env.ASSET_SERVER + "/rooms/atrium/Atrium.bundle.json",
- process.env.ASSET_SERVER + "/rooms/courtyard/Courtyard.bundle.json",
- process.env.ASSET_SERVER + "/rooms/MedievalFantasyBook/MedievalFantasyBook.bundle.json"
+ process.env.ASSET_BUNDLE_SERVER + "/rooms/meetingroom/MeetingRoom.bundle.json",
+ process.env.ASSET_BUNDLE_SERVER + "/rooms/theater/Theater.bundle.json",
+ process.env.ASSET_BUNDLE_SERVER + "/rooms/atrium/Atrium.bundle.json",
+ process.env.ASSET_BUNDLE_SERVER + "/rooms/courtyard/Courtyard.bundle.json",
+ process.env.ASSET_BUNDLE_SERVER + "/rooms/MedievalFantasyBook/MedievalFantasyBook.bundle.json"
];
class HomeRoot extends Component {
diff --git a/webpack.config.js b/webpack.config.js
index 7b33d29c7..5ee8cfc75 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -229,7 +229,7 @@ const config = {
NODE_ENV: process.env.NODE_ENV,
JANUS_SERVER: process.env.JANUS_SERVER,
DEV_RETICULUM_SERVER: process.env.DEV_RETICULUM_SERVER,
- ASSET_SERVER: process.env.ASSET_SERVER
+ ASSET_BUNDLE_SERVER: process.env.ASSET_BUNDLE_SERVER
})
})
]
--
GitLab