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

Set fallback void color to black, pause high fps redraws if nothing changes to save GPU usage

Browse Source
This commit is contained in:
Lukas Rieger (Blue) 2023-11-18 14:20:45 +01:00
parent c69b31ce84
commit 6d3774f24e
No known key found for this signature in database
GPG Key ID: 2D09EC5ED2687FF2
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,6 +113,9 @@ export class MapViewer {
this.markers = new MarkerSet("bm-root"); this.markers = new MarkerSet("bm-root");
this.lastFrame = 0; this.lastFrame = 0;
this.lastRedrawChange = 0;
events.addEventListener("bluemapCameraMoved", () => this.lastRedrawChange = Date.now())
events.addEventListener("bluemapTileLoaded", () => this.lastRedrawChange = Date.now())
// initialize // initialize
this.initializeRootElement(); this.initializeRootElement();
@ -272,7 +275,6 @@ export class MapViewer {
// calculate delta time // calculate delta time
if (this.lastFrame <= 0) this.lastFrame = now; if (this.lastFrame <= 0) this.lastFrame = now;
let delta = now - this.lastFrame; let delta = now - this.lastFrame;
this.lastFrame = now;
// update stats // update stats
this.stats.begin(); this.stats.begin();
@ -283,7 +285,10 @@ export class MapViewer {
} }
// render // render
this.render(delta); if (delta >= 1000 || Date.now() - this.lastRedrawChange < 1000) {
this.lastFrame = now;
this.render(delta);
}
// update stats // update stats
this.stats.update(); this.stats.update();

2
BlueMapCommon/webapp/src/js/map/Map.js
View File

@ -63,7 +63,7 @@ export class Map {
name: id, name: id,
startPos: {x: 0, z: 0}, startPos: {x: 0, z: 0},
skyColor: new Color(), skyColor: new Color(),
voidColor: new Color(), voidColor: new Color(0, 0, 0),
ambientLight: 0, ambientLight: 0,
hires: { hires: {
tileSize: {x: 32, z: 32}, tileSize: {x: 32, z: 32},

7
BlueMapCommon/webapp/src/js/map/TileManager.js
View File

@ -24,7 +24,7 @@
*/ */
import { Vector2, Scene, Group } from 'three'; import { Vector2, Scene, Group } from 'three';
import { Tile } from './Tile.js'; import { Tile } from './Tile.js';
import {alert, hashTile} from '../util/Utils.js'; import {alert, dispatchEvent, hashTile} from '../util/Utils.js';
import {TileMap} from "./TileMap"; import {TileMap} from "./TileMap";
export class TileManager { export class TileManager {
@ -194,6 +194,11 @@ export class TileManager {
this.tiles.set(tileHash, tile); this.tiles.set(tileHash, tile);
tile.load(this.tileLoader) tile.load(this.tileLoader)
.then(() => { .then(() => {
dispatchEvent(this.events, "bluemapTileLoaded", {
tileManager: this,
tile: tile
});
if (this.loadTimeout) clearTimeout(this.loadTimeout); if (this.loadTimeout) clearTimeout(this.loadTimeout);
this.loadTimeout = setTimeout(this.loadCloseTiles, 0); this.loadTimeout = setTimeout(this.loadCloseTiles, 0);
}) })