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

Update to new settings.json-s

Browse Source
This commit is contained in:
Lukas Rieger (Blue) 2022-06-06 22:50:19 +02:00
parent be1c4b4939
commit e2af667e5e
No known key found for this signature in database
GPG Key ID: 2D09EC5ED2687FF2
3 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BlueMapWeb

@ -1 +1 @@
Subproject commit a0f5548293f0e22e9fe2ec57207cde754d60b24f
Subproject commit 889d3cf94ce760a4c202735c7060df0744346d54

13
src/components/Menu/SettingsMenu.vue
View File

@ -21,9 +21,9 @@
</Group>
<Group :title="$t('renderDistance.title')">
<Slider :value="mapViewer.loadedHiresViewDistance" :min="50" :max="500" :step="10"
<Slider :value="mapViewer.loadedHiresViewDistance" :min="settings.hiresSliderMin" :max="settings.hiresSliderMax" :step="10"
@update="mapViewer.loadedHiresViewDistance = $event; $bluemap.mapViewer.updateLoadedMapArea()" @lazy="$bluemap.saveUserSettings()">{{ $t("renderDistance.hiresLayer") }}</Slider>
<Slider :value="mapViewer.loadedLowresViewDistance" :min="500" :max="10000" :step="100"
<Slider :value="mapViewer.loadedLowresViewDistance" :min="settings.lowresSliderMin" :max="settings.lowresSliderMax" :step="100"
@update="mapViewer.loadedLowresViewDistance = $event; $bluemap.mapViewer.updateLoadedMapArea()" @lazy="$bluemap.saveUserSettings()">{{ $t("renderDistance.lowersLayer") }}</Slider>
</Group>
@ -79,6 +79,15 @@ name: "SettingsMenu",
return {
appState: this.$bluemap.appState,
mapViewer: this.$bluemap.mapViewer.data,
settings: {
...{
hiresSliderMax: 500,
hiresSliderMin: 50,
lowresSliderMax: 10000,
lowresSliderMin: 500
},
...this.$bluemap.settings
},
qualityStages: qualityStages,
themes: themes,

40
src/js/BlueMapApp.js
View File

@ -55,7 +55,20 @@ export class BlueMapApp {
/** @type {MarkerFileManager} */
this.markerFileManager = null;
/** @type {{useCookies: boolean, freeFlightEnabled: boolean, maps: []}} */
/** @type {{
* useCookies: boolean,
* freeFlightEnabled: boolean,
* resolutionDefault: number,
* hiresSliderMax: number,
* hiresSliderDefault: number,
* hiresSliderMin: number,
* lowresSliderMax: number,
* lowresSliderDefault: number,
* lowresSliderMin: number,
* startLocation: string,
* maps: string[]
* }}
**/
this.settings = null;
this.savedUserSettings = new Map();
@ -116,7 +129,7 @@ export class BlueMapApp {
oldMaps.forEach(map => map.dispose());
// load maps
this.maps = this.loadMaps();
this.maps = await this.loadMaps();
for (let map of this.maps) {
this.mapsMap.set(map.data.id, map);
this.appState.maps.push(map.data);
@ -220,33 +233,28 @@ export class BlueMapApp {
}
/**
* @returns BlueMapMap[]
* @returns Promise<BlueMapMap[]>
*/
loadMaps() {
async loadMaps() {
let settings = this.settings;
let maps = [];
// create maps
if (settings.maps !== undefined){
for (let mapId in settings.maps) {
if (!Object.prototype.hasOwnProperty.call(settings.maps, mapId)) continue;
let mapSettings = settings.maps[mapId];
if (mapSettings.enabled) {
let map = new BlueMapMap(mapId, this.dataUrl + mapId + "/", this.dataUrl + "settings.json", this.dataUrl + mapId + "/textures.json", this.mapViewer.events);
for (let mapId of settings.maps) {
let map = new BlueMapMap(mapId, this.dataUrl + mapId + "/", this.mapViewer.events);
maps.push(map);
map.loadSettings()
await map.loadSettings()
.catch(error => {
alert(this.events, `Failed to load settings for map '${map.data.id}':` + error, "warning");
});
}
}
}
// sort maps
maps.sort((map1, map2) => {
let sort = settings.maps[map1.data.id].ordinal - settings.maps[map2.data.id].ordinal;
let sort = map1.data.sorting - map2.data.sorting;
if (isNaN(sort)) return 0;
return sort;
});
@ -487,6 +495,10 @@ export class BlueMapApp {
}
async loadUserSettings(){
if (!isNaN(this.settings.resolutionDefault)) this.mapViewer.data.superSampling = this.settings.resolutionDefault;
if (!isNaN(this.settings.hiresSliderDefault)) this.mapViewer.data.loadedHiresViewDistance = this.settings.hiresSliderDefault;
if (!isNaN(this.settings.lowresSliderDefault)) this.mapViewer.data.loadedLowresViewDistance = this.settings.lowresSliderDefault;
if (!this.settings.useCookies) return;
if (this.loadUserSetting("resetSettings", false)) {
@ -574,7 +586,7 @@ export class BlueMapApp {
}
loadPageAddress = async () => {
let hash = window.location.hash.substr(1);
let hash = window.location.hash.substring(1) || this.settings.startLocation;
let values = hash.split(":");
if (values.length !== 10) return false;