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

Improve redraw-trigger on settings-changes

Browse Source
This commit is contained in:
Lukas Rieger (Blue) 2023-11-19 13:42:56 +01:00
parent 77c1e42009
commit 73103eda3b
No known key found for this signature in database
GPG Key ID: 2D09EC5ED2687FF2
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BlueMapCommon/webapp/src/components/ControlBar/DayNightSwitch.vue
View File

@ -43,6 +43,7 @@ export default {
animation = animate(t => { animation = animate(t => {
let u = EasingFunctions.easeOutQuad(t); let u = EasingFunctions.easeOutQuad(t);
this.mapViewer.uniforms.sunlightStrength.value = startValue * (1-u) + targetValue * u; this.mapViewer.uniforms.sunlightStrength.value = startValue * (1-u) + targetValue * u;
this.$bluemap.mapViewer.redraw();
}, 300); }, 300);
} }
} }

6
BlueMapCommon/webapp/src/components/Menu/SettingsMenu.vue
View File

@ -8,15 +8,15 @@
<Group :title="$t('lighting.title')"> <Group :title="$t('lighting.title')">
<Slider :value="mapViewer.uniforms.sunlightStrength.value" :min="0" :max="1" :step="0.01" <Slider :value="mapViewer.uniforms.sunlightStrength.value" :min="0" :max="1" :step="0.01"
@update="mapViewer.uniforms.sunlightStrength.value = $event">{{$t('lighting.sunlight')}}</Slider> @update="mapViewer.uniforms.sunlightStrength.value = $event; $bluemap.mapViewer.redraw()">{{$t('lighting.sunlight')}}</Slider>
<Slider :value="mapViewer.uniforms.ambientLight.value" :min="0" :max="1" :step="0.01" <Slider :value="mapViewer.uniforms.ambientLight.value" :min="0" :max="1" :step="0.01"
@update="mapViewer.uniforms.ambientLight.value = $event">{{$t('lighting.ambientLight')}}</Slider> @update="mapViewer.uniforms.ambientLight.value = $event; $bluemap.mapViewer.redraw()">{{$t('lighting.ambientLight')}}</Slider>
</Group> </Group>
<Group :title="$t('resolution.title')"> <Group :title="$t('resolution.title')">
<SimpleButton v-for="stage of qualityStages" :key="stage.name" <SimpleButton v-for="stage of qualityStages" :key="stage.name"
:active="mapViewer.superSampling === stage.value" :active="mapViewer.superSampling === stage.value"
@action="$bluemap.mapViewer.superSampling = stage.value; $bluemap.saveUserSettings();" @action="$bluemap.mapViewer.superSampling = stage.value; $bluemap.saveUserSettings(); $bluemap.mapViewer.redraw()"
>{{stage.name}}</SimpleButton> >{{stage.name}}</SimpleButton>
</Group> </Group>

13
BlueMapCommon/webapp/src/js/MapViewer.js
View File

@ -114,8 +114,8 @@ export class MapViewer {
this.lastFrame = 0; this.lastFrame = 0;
this.lastRedrawChange = 0; this.lastRedrawChange = 0;
events.addEventListener("bluemapCameraMoved", () => this.lastRedrawChange = Date.now()) events.addEventListener("bluemapCameraMoved", this.redraw)
events.addEventListener("bluemapTileLoaded", () => this.lastRedrawChange = Date.now()) events.addEventListener("bluemapTileLoaded", this.redraw)
// initialize // initialize
this.initializeRootElement(); this.initializeRootElement();
@ -163,6 +163,8 @@ export class MapViewer {
this.camera.aspect = this.rootElement.clientWidth / this.rootElement.clientHeight; this.camera.aspect = this.rootElement.clientWidth / this.rootElement.clientHeight;
this.camera.updateProjectionMatrix(); this.camera.updateProjectionMatrix();
this.redraw();
}; };
/** /**
@ -264,6 +266,13 @@ export class MapViewer {
} }
} }
/**
* Call to wake up the render-loop and render on high-fps for a while
*/
redraw = () => {
this.lastRedrawChange = Date.now();
}
/** /**
* @private * @private
* The render-loop to update and possibly render a new frame. * The render-loop to update and possibly render a new frame.