Skip to content

Commit

Permalink
Fix missed path 2
Browse files Browse the repository at this point in the history
  • Loading branch information
TBlueF committed Sep 28, 2024
1 parent e339680 commit bceb715
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
7 changes: 6 additions & 1 deletion common/webapp/src/js/BlueMapApp.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(() => {
Expand Down
19 changes: 17 additions & 2 deletions common/webapp/src/js/map/Map.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit bceb715

Please sign in to comment.