cesium base directory needs be specified in app.js

hslayers · Jan 11, 2019 · 0660b5f · 0660b5f
1 parent 8fb9703
commit 0660b5f
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/components/hscesium/hscesium.js b/components/hscesium/hscesium.js
@@ -36,7 +36,7 @@ define(['angular', 'permalink', 'ol', 'hs_cesium_camera', 'hs_cesium_time', 'hs_
                     console.error('Please include cesium in shim definition: cesiumjs: {exports: \'Cesium\'}');
                 }
                 Cesium.Ion.defaultAccessToken = config.cesiumAccessToken || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIzZDk3ZmM0Mi01ZGFjLTRmYjQtYmFkNC02NTUwOTFhZjNlZjMiLCJpZCI6MTE2MSwiaWF0IjoxNTI3MTYxOTc5fQ.tOVBzBJjR3mwO3osvDVB_RwxyLX7W-emymTOkfz6yGA';
-                window.CESIUM_BASE_URL = Core.getNmPath() + 'cesium/Build/Cesium/';
+                window.CESIUM_BASE_URL = config.cesiumBase || Core.getNmPath() + 'cesium/Build/Cesium/';
                 var terrain_provider = config.terrain_provider || Cesium.createWorldTerrain(config.createWorldTerrainOptions);
                 if (config.newTerrainProviderOptions) terrain_provider = new Cesium.CesiumTerrainProvider(config.newTerrainProviderOptions);
 
@@ -66,12 +66,12 @@ define(['angular', 'permalink', 'ol', 'hs_cesium_camera', 'hs_cesium_time', 'hs_
                     // Use high-res stars downloaded from https://github.com/AnalyticalGraphicsInc/cesium-assets
                     skyBox: new Cesium.SkyBox({
                         sources: {
-                            positiveX: Core.getNmPath() + 'cesium/Build/Cesium/Assets/Textures/SkyBox/tycho2t3_80_px.jpg',
-                            negativeX: Core.getNmPath() + 'cesium/Build/Cesium/Assets/Textures/SkyBox/tycho2t3_80_mx.jpg',
-                            positiveY: Core.getNmPath() + 'cesium/Build/Cesium/Assets/Textures/SkyBox/tycho2t3_80_py.jpg',
-                            negativeY: Core.getNmPath() + 'cesium/Build/Cesium/Assets/Textures/SkyBox/tycho2t3_80_my.jpg',
-                            positiveZ: Core.getNmPath() + 'cesium/Build/Cesium/Assets/Textures/SkyBox/tycho2t3_80_pz.jpg',
-                            negativeZ: Core.getNmPath() + 'cesium/Build/Cesium/Assets/Textures/SkyBox/tycho2t3_80_mz.jpg'
+                            positiveX: config.cesiumBase || (Core.getNmPath() + 'cesium/Build/Cesium/') + 'Assets/Textures/SkyBox/tycho2t3_80_px.jpg',
+                            negativeX: config.cesiumBase || (Core.getNmPath() + 'cesium/Build/Cesium/') + 'Assets/Textures/SkyBox/tycho2t3_80_mx.jpg',
+                            positiveY: config.cesiumBase || (Core.getNmPath() + 'cesium/Build/Cesium/') + 'Assets/Textures/SkyBox/tycho2t3_80_py.jpg',
+                            negativeY: config.cesiumBase || (Core.getNmPath() + 'cesium/Build/Cesium/') + 'Assets/Textures/SkyBox/tycho2t3_80_my.jpg',
+                            positiveZ: config.cesiumBase || (Core.getNmPath() + 'cesium/Build/Cesium/') + 'Assets/Textures/SkyBox/tycho2t3_80_pz.jpg',
+                            negativeZ: config.cesiumBase || (Core.getNmPath() + 'cesium/Build/Cesium/') + '/Assets/Textures/SkyBox/tycho2t3_80_mz.jpg'
                         }
                     }),
                     // Show Columbus View map with Web Mercator projection