Upstream/BlueMapWeb
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMapWeb.git synced 2024-06-26 14:24:44 +02:00
Code Issues Projects Releases Wiki Activity

Moving live-player-endpoint

Browse Source
This commit is contained in:
Lukas Rieger (Blue) 2022-06-27 01:07:31 +02:00
parent 889d3cf94c
commit 25c4658de4
No known key found for this signature in database
GPG Key ID: 2D09EC5ED2687FF2
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/markers/PlayerMarker.js
View File

@ -40,8 +40,6 @@ export class PlayerMarker extends Marker {
this.data.playerUuid = playerUuid; this.data.playerUuid = playerUuid;
this.data.name = playerUuid; this.data.name = playerUuid;
this.data.world = "?";
this.elementObject = new CSS2DObject(htmlToElement(` this.elementObject = new CSS2DObject(htmlToElement(`
<div id="bm-marker-${this.data.id}" class="bm-marker-${this.data.type}"> <div id="bm-marker-${this.data.id}" class="bm-marker-${this.data.type}">
<img src="assets/playerheads/${this.data.playerUuid}.png" alt="playerhead" draggable="false"> <img src="assets/playerheads/${this.data.playerUuid}.png" alt="playerhead" draggable="false">
@ -89,7 +87,7 @@ export class PlayerMarker extends Marker {
* @typedef PlayerLike {{ * @typedef PlayerLike {{
* uuid: string, * uuid: string,
* name: string, * name: string,
* world: string, * foreign: boolean,
* position: {x: number, y: number, z: number}, * position: {x: number, y: number, z: number},
* rotation: {yaw: number, pitch: number, roll: number} * rotation: {yaw: number, pitch: number, roll: number}
* }} * }}
@ -138,8 +136,7 @@ export class PlayerMarker extends Marker {
this.playerNameElement.innerHTML = name; this.playerNameElement.innerHTML = name;
// update world // update world
this.data.world = markerData.world || "?"; this.data.foreign = markerData.foreign;
} }
dispose() { dispose() {

17
src/markers/PlayerMarkerManager.js
View File

@ -33,15 +33,12 @@ export class PlayerMarkerManager extends MarkerManager {
* @constructor * @constructor
* @param markerScene {THREE.Scene} - The scene to which all markers will be added * @param markerScene {THREE.Scene} - The scene to which all markers will be added
* @param playerDataUrl {string} - The marker file from which this manager updates its markers * @param playerDataUrl {string} - The marker file from which this manager updates its markers
* @param worldId {string} - The worldId of the world for which the markers should be loaded
* @param events {EventTarget} * @param events {EventTarget}
*/ */
constructor(markerScene, playerDataUrl, worldId, events = null) { constructor(markerScene, playerDataUrl, events = null) {
super(markerScene, playerDataUrl, events); super(markerScene, playerDataUrl, events);
Object.defineProperty(this, 'isPlayerMarkerManager', {value: true}); Object.defineProperty(this, 'isPlayerMarkerManager', {value: true});
this.worldId = worldId;
this.getPlayerMarkerSet(); this.getPlayerMarkerSet();
} }
@ -105,8 +102,8 @@ export class PlayerMarkerManager extends MarkerManager {
// update // update
marker.updateFromData(markerData); marker.updateFromData(markerData);
// hide if wrong world // hide if from different world
marker.visible = markerData.world === this.worldId; marker.visible = !markerData.foreign;
return marker; return marker;
} }
@ -127,4 +124,12 @@ export class PlayerMarkerManager extends MarkerManager {
return playerMarkerSet; return playerMarkerSet;
} }
/**
* @param playerUuid {string}
* @returns {Marker}
*/
getPlayerMarker(playerUuid) {
return this.markers.get("bm-player-" + playerUuid);
}
} }