Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-11-22 02:26:00 +01:00
Code Issues Projects Releases Wiki Activity

Fix missed path 2

Browse Source
This commit is contained in:
Lukas Rieger (Blue) 2024-09-28 11:59:05 +02:00
parent e339680978
commit bceb7150ab
No known key found for this signature in database
GPG Key ID: AA33883B1BBA03E6
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/webapp/src/js/BlueMapApp.js
View File

@ -396,7 +396,12 @@ export class BlueMapApp {
const map = this.mapViewer.map; const map = this.mapViewer.map;
if (!map) return; 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); this.playerMarkerManager.setAutoUpdateInterval(0);
return this.playerMarkerManager.update() return this.playerMarkerManager.update()
.then(() => { .then(() => {

19
common/webapp/src/js/map/Map.js
View File

@ -123,12 +123,27 @@ export class Map {
this.hiresMaterial = this.createHiresMaterial(hiresVertexShader, hiresFragmentShader, uniforms, textures); 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.hiresTileManager.scene.matrixWorldAutoUpdate = false;
this.lowresTileManager = []; this.lowresTileManager = [];
for (let i = 0; i < this.data.lowres.lodCount; i++) { 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; this.lowresTileManager[i].scene.matrixWorldAutoUpdate = false;
} }