Merge pull request #68 from thkruz/fix-url-issues

fix: 🐛 fix url mismatch between code and config

src/index.ts

@@ -7,9 +7,8 @@ import appinfo from './appinfo.json';
 import hud from './hud';
 
 async function loadConfig () {
-  const baseUrl = './';
-  const response = await axios.get(`${baseUrl}config.json`);
   let config = defaultConfig;
+  const response = await axios.get(`${config.baseUrl}config.json`);
   if (response.data) {
     config = { ...defaultConfig, ...response.data, appInfo: appinfo };
   }

src/viewer/Earth.ts

@@ -95,15 +95,16 @@ class Earth implements SceneComponent {
   async init (scene: SatelliteOrbitScene, context: ViewerContext) {
     if (context.config) {
       this.baseUrl = context.config.baseUrl;
+      this.baseUrl = this.baseUrl.endsWith('/') ? this.baseUrl : `${this.baseUrl}/`;
     }
 
     this.group = new Group();
 
-    const basePath = `${this.baseUrl}images`;
-    const dayTexture = await this.loadTexture(`${basePath}/earth-blue-marble.jpg`);
-    const nightTexture = await this.loadTexture(`${basePath}/nightearth-4096.png`);
-    const bumpTexture = await this.loadTexture(`${basePath}/8081_earthbump4k.jpg`);
-    const earthSpecularMap = await this.loadTexture(`${basePath}/earth-water.png`);
+    this.basePath = `${this.baseUrl}images`;
+    const dayTexture = await this.loadTexture(`${this.basePath}/earth-blue-marble.jpg`);
+    const nightTexture = await this.loadTexture(`${this.basePath}/nightearth-4096.png`);
+    const bumpTexture = await this.loadTexture(`${this.basePath}/8081_earthbump4k.jpg`);
+    const earthSpecularMap = await this.loadTexture(`${this.basePath}/earth-water.png`);
 
     const dayMaterial = new MeshPhongMaterial({
       map: dayTexture,

src/viewer/ShaderStore.ts

@@ -19,6 +19,7 @@ class ShaderStore {
   shaderData: Record<string, string> = {};
 
   constructor (appBaseUrl = '') {
+    appBaseUrl = appBaseUrl.endsWith('/') ? appBaseUrl : `${appBaseUrl}/`;
     this.baseUrl = `${appBaseUrl}${this.basePath}`;
   }