From bceb7150abe1d8610431d519f6c4fd0bd94266be Mon Sep 17 00:00:00 2001 From: "Lukas Rieger (Blue)" Date: Sat, 28 Sep 2024 11:59:05 +0200 Subject: [PATCH] Fix missed path 2 --- common/webapp/src/js/BlueMapApp.js | 7 ++++++- common/webapp/src/js/map/Map.js | 19 +++++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/common/webapp/src/js/BlueMapApp.js b/common/webapp/src/js/BlueMapApp.js index f3fcce5b..9ad6227a 100644 --- a/common/webapp/src/js/BlueMapApp.js +++ b/common/webapp/src/js/BlueMapApp.js @@ -396,7 +396,12 @@ export class BlueMapApp { const map = this.mapViewer.map; if (!map) return; - this.playerMarkerManager = new PlayerMarkerManager(this.mapViewer.markers, map.data.liveDataRoot + "/live/players.json", map.data.mapDataRoot + "assets/playerheads/", this.events); + this.playerMarkerManager = new PlayerMarkerManager( + this.mapViewer.markers, + map.data.liveDataRoot + "/live/players.json", + map.data.mapDataRoot + "/assets/playerheads/", + this.events + ); this.playerMarkerManager.setAutoUpdateInterval(0); return this.playerMarkerManager.update() .then(() => { diff --git a/common/webapp/src/js/map/Map.js b/common/webapp/src/js/map/Map.js index c9210579..7aa48b26 100644 --- a/common/webapp/src/js/map/Map.js +++ b/common/webapp/src/js/map/Map.js @@ -123,12 +123,27 @@ export class Map { this.hiresMaterial = this.createHiresMaterial(hiresVertexShader, hiresFragmentShader, uniforms, textures); - this.hiresTileManager = new TileManager(new TileLoader(`${this.data.mapDataRoot}/tiles/0/`, this.hiresMaterial, this.data.hires, this.loadBlocker, tileCacheHash), this.onTileLoad("hires"), this.onTileUnload("hires"), this.events); + this.hiresTileManager = new TileManager(new TileLoader( + `${this.data.mapDataRoot}/tiles/0/`, + this.hiresMaterial, + this.data.hires, + this.loadBlocker, + tileCacheHash + ), this.onTileLoad("hires"), this.onTileUnload("hires"), this.events); this.hiresTileManager.scene.matrixWorldAutoUpdate = false; this.lowresTileManager = []; for (let i = 0; i < this.data.lowres.lodCount; i++) { - this.lowresTileManager[i] = new TileManager(new LowresTileLoader(`${this.data.mapDataRoot}/tiles/`, this.data.lowres, i + 1, lowresVertexShader, lowresFragmentShader, uniforms, async () => {}, tileCacheHash), this.onTileLoad("lowres"), this.onTileUnload("lowres"), this.events); + this.lowresTileManager[i] = new TileManager(new LowresTileLoader( + `${this.data.mapDataRoot}/tiles/`, + this.data.lowres, + i + 1, + lowresVertexShader, + lowresFragmentShader, + uniforms, + async () => {}, + tileCacheHash + ), this.onTileLoad("lowres"), this.onTileUnload("lowres"), this.events); this.lowresTileManager[i].scene.matrixWorldAutoUpdate = false; }