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

spaces -> tabs

Browse Source
This commit is contained in:
Joshua Rodriguez 2020-01-14 07:40:07 -08:00
parent 713c9a5494
commit e5660ac754
9 changed files with 191 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BlueMapCore/src/main/webroot/js/libs/Controls.js
View File

@ -24,11 +24,11 @@
*/ */
import $ from 'jquery'; import $ from 'jquery';
import { import {
Euler, Euler,
Raycaster, Raycaster,
Vector2, Vector2,
Vector3, Vector3,
MOUSE MOUSE
} from 'three'; } from 'three';
import { Vector2_ZERO } from './utils.js'; import { Vector2_ZERO } from './utils.js';

50
BlueMapCore/src/main/webroot/js/libs/Tile.js
View File

@ -24,36 +24,36 @@
*/ */
export default class Tile { export default class Tile {
isLoading = false; isLoading = false;
disposed = false; disposed = false;
model = null; model = null;
constructor(scene, x, z) { constructor(scene, x, z) {
this.scene = scene; this.scene = scene;
this.x = x; this.x = x;
this.z = z; this.z = z;
} }
setModel(model) { setModel(model) {
this.disposeModel(); this.disposeModel();
if (model) { if (model) {
this.model = model; this.model = model;
this.scene.add(model); this.scene.add(model);
//console.log("Added tile:", this.x, this.z); //console.log("Added tile:", this.x, this.z);
} }
} }
disposeModel() { disposeModel() {
this.disposed = true; this.disposed = true;
if (this.model) { if (this.model) {
this.scene.remove(this.model); this.scene.remove(this.model);
this.model.geometry.dispose(); this.model.geometry.dispose();
delete this.model; delete this.model;
//console.log("Removed tile:", this.x, this.z); //console.log("Removed tile:", this.x, this.z);
} }
} }
} }

16
BlueMapCore/src/main/webroot/js/libs/bluemap.js
View File

@ -25,22 +25,22 @@
import $ from 'jquery'; import $ from 'jquery';
import { import {
AmbientLight, AmbientLight,
BackSide, BackSide,
BufferGeometryLoader, BufferGeometryLoader,
ClampToEdgeWrapping, ClampToEdgeWrapping,
CubeGeometry, CubeGeometry,
DirectionalLight, DirectionalLight,
FileLoader, FileLoader,
FrontSide, FrontSide,
Mesh, Mesh,
MeshBasicMaterial, MeshBasicMaterial,
MeshLambertMaterial, MeshLambertMaterial,
NormalBlending, NormalBlending,
NearestFilter, NearestFilter,
PerspectiveCamera, PerspectiveCamera,
Scene, Scene,
Texture, Texture,
TextureLoader, TextureLoader,
VertexColors, VertexColors,
WebGLRenderer, WebGLRenderer,
} from 'three'; } from 'three';

34
BlueMapCore/src/main/webroot/js/libs/modules/Compass.js
View File

@ -29,25 +29,25 @@ import { getTopLeftElement } from './Module.js';
import COMPASS from '../../../assets/compass.svg'; import COMPASS from '../../../assets/compass.svg';
export default class Compass { export default class Compass {
constructor(blueMap) { constructor(blueMap) {
this.blueMap = blueMap; this.blueMap = blueMap;
$('#bluemap-compass').remove(); $('#bluemap-compass').remove();
this.element = $(`<div id="bluemap-compass" class="button"><img id="bluemap-compass-needle" src="${COMPASS}" /></div>`).appendTo(getTopLeftElement(blueMap)); this.element = $(`<div id="bluemap-compass" class="button"><img id="bluemap-compass-needle" src="${COMPASS}" /></div>`).appendTo(getTopLeftElement(blueMap));
this.needle = $('#bluemap-compass-needle'); this.needle = $('#bluemap-compass-needle');
$(document).on('bluemap-update-frame', this.onBlueMapUpdateFrame); $(document).on('bluemap-update-frame', this.onBlueMapUpdateFrame);
$(this.element).click(this.onClick); $(this.element).click(this.onClick);
} }
onBlueMapUpdateFrame = () => { onBlueMapUpdateFrame = () => {
this.needle.css('transform', `rotate(${this.blueMap.controls.direction}rad)`); this.needle.css('transform', `rotate(${this.blueMap.controls.direction}rad)`);
} }
onClick = () => { onClick = () => {
this.blueMap.controls.targetDirection = 0; this.blueMap.controls.targetDirection = 0;
this.blueMap.controls.direction = this.blueMap.controls.direction % (Math.PI * 2); this.blueMap.controls.direction = this.blueMap.controls.direction % (Math.PI * 2);
if (this.blueMap.controls.direction < -Math.PI) this.blueMap.controls.direction += Math.PI * 2; if (this.blueMap.controls.direction < -Math.PI) this.blueMap.controls.direction += Math.PI * 2;
if (this.blueMap.controls.direction > Math.PI) this.blueMap.controls.direction -= Math.PI * 2; if (this.blueMap.controls.direction > Math.PI) this.blueMap.controls.direction -= Math.PI * 2;
} }
} }

36
BlueMapCore/src/main/webroot/js/libs/modules/Info.js
View File

@ -27,23 +27,23 @@ import $ from 'jquery';
import { getTopRightElement } from './Module.js'; import { getTopRightElement } from './Module.js';
export default class Info { export default class Info {
constructor(blueMap) { constructor(blueMap) {
this.blueMap = blueMap; this.blueMap = blueMap;
const parent = getTopRightElement(blueMap); const parent = getTopRightElement(blueMap);
$('#bluemap-info').remove(); $('#bluemap-info').remove();
this.elementInfo = $('<div id="bluemap-info" class="button"></div>').appendTo(parent); this.elementInfo = $('<div id="bluemap-info" class="button"></div>').appendTo(parent);
this.elementInfo.click(this.onClick); this.elementInfo.click(this.onClick);
} }
onClick = () => { onClick = () => {
this.blueMap.alert( this.blueMap.alert(
'<h1>Info</h1>' + '<h1>Info</h1>' +
'Visit BlueMap on <a href="https://github.com/BlueMap-Minecraft">GitHub</a>!<br>' + 'Visit BlueMap on <a href="https://github.com/BlueMap-Minecraft">GitHub</a>!<br>' +
'BlueMap works best with <a href="https://www.google.com/chrome/">Chrome</a>.<br>' + 'BlueMap works best with <a href="https://www.google.com/chrome/">Chrome</a>.<br>' +
'<h2>Controls</h2>' + '<h2>Controls</h2>' +
'Leftclick-drag with your mouse or use the arrow-keys to navigate.<br>' + 'Leftclick-drag with your mouse or use the arrow-keys to navigate.<br>' +
'Rightclick-drag with your mouse to rotate your view.<br>' + 'Rightclick-drag with your mouse to rotate your view.<br>' +
'Scroll to zoom.<br>' 'Scroll to zoom.<br>'
); );
} }
} }

52
BlueMapCore/src/main/webroot/js/libs/modules/MapMenu.js
View File

@ -27,37 +27,37 @@ import $ from 'jquery';
import { getTopLeftElement } from './Module.js'; import { getTopLeftElement } from './Module.js';
export default class MapMenu { export default class MapMenu {
constructor(blueMap) { constructor(blueMap) {
this.bluemap = blueMap; this.bluemap = blueMap;
const maps = this.bluemap.settings; const maps = this.bluemap.settings;
$('#bluemap-mapmenu').remove(); $('#bluemap-mapmenu').remove();
this.element = $(`<div id="bluemap-mapmenu" class="dropdown-container"><span class="selection">${maps[this.bluemap.map].name}</span></div>`).appendTo(getTopLeftElement(blueMap)); this.element = $(`<div id="bluemap-mapmenu" class="dropdown-container"><span class="selection">${maps[this.bluemap.map].name}</span></div>`).appendTo(getTopLeftElement(blueMap));
const dropdown = $('<div class="dropdown"></div>').appendTo(this.element); const dropdown = $('<div class="dropdown"></div>').appendTo(this.element);
this.maplist = $('<ul></ul>').appendTo(dropdown); this.maplist = $('<ul></ul>').appendTo(dropdown);
for (let mapId in maps) { for (let mapId in maps) {
if (!maps.hasOwnProperty(mapId)) continue; if (!maps.hasOwnProperty(mapId)) continue;
if (!maps.enabled) continue; if (!maps.enabled) continue;
const map = maps[mapId]; const map = maps[mapId];
$(`<li map="${mapId}">${map.name}</li>`).appendTo(this.maplist); $(`<li map="${mapId}">${map.name}</li>`).appendTo(this.maplist);
} }
this.maplist.find('li[map=' + this.bluemap.map + ']').hide(); this.maplist.find('li[map=' + this.bluemap.map + ']').hide();
this.maplist.find('li[map]').click(this.onMapClick); this.maplist.find('li[map]').click(this.onMapClick);
$(document).on('bluemap-map-change', this.onBlueMapMapChange); $(document).on('bluemap-map-change', this.onBlueMapMapChange);
} }
onMapClick = event => { onMapClick = event => {
const map = $(this).attr('map'); const map = $(this).attr('map');
this.bluemap.changeMap(map); this.bluemap.changeMap(map);
} }
onBlueMapMapChange = () => { onBlueMapMapChange = () => {
this.maplist.find('li').show(); this.maplist.find('li').show();
this.maplist.find('li[map=' + this.bluemap.map + ']').hide(); this.maplist.find('li[map=' + this.bluemap.map + ']').hide();
this.element.find('.selection').html(this.bluemap.settings[this.bluemap.map].name); this.element.find('.selection').html(this.bluemap.settings[this.bluemap.map].name);
} }
} }

20
BlueMapCore/src/main/webroot/js/libs/modules/Module.js
View File

@ -27,21 +27,21 @@ import $ from 'jquery';
// ###### Modules ###### // ###### Modules ######
export const getTopRightElement = blueMap => { export const getTopRightElement = blueMap => {
let element = $('#bluemap-topright'); let element = $('#bluemap-topright');
if (element.length === 0){ if (element.length === 0){
element = $('<div id="bluemap-topright" class="box"></div>').appendTo(blueMap.element); element = $('<div id="bluemap-topright" class="box"></div>').appendTo(blueMap.element);
} }
return element; return element;
}; };
export const getTopLeftElement = blueMap => { export const getTopLeftElement = blueMap => {
let element = $('#bluemap-topleft'); let element = $('#bluemap-topleft');
if (element.length === 0){ if (element.length === 0){
element = $('<div id="bluemap-topleft" class="box"></div>').appendTo(blueMap.element); element = $('<div id="bluemap-topleft" class="box"></div>').appendTo(blueMap.element);
} }
return element; return element;
}; };

28
BlueMapCore/src/main/webroot/js/libs/modules/Position.js
View File

@ -27,21 +27,21 @@ import $ from 'jquery';
import { getTopLeftElement } from './Module.js'; import { getTopLeftElement } from './Module.js';
export default class Position { export default class Position {
constructor(blueMap) { constructor(blueMap) {
this.blueMap = blueMap; this.blueMap = blueMap;
const parent = getTopLeftElement(blueMap); const parent = getTopLeftElement(blueMap);
$('.bluemap-position').remove(); $('.bluemap-position').remove();
this.elementX = $('<div class="bluemap-position pos-x">0</div>').appendTo(parent); this.elementX = $('<div class="bluemap-position pos-x">0</div>').appendTo(parent);
//this.elementY = $('<div class="bluemap-position pos-y">0</div>').appendTo(parent); //this.elementY = $('<div class="bluemap-position pos-y">0</div>').appendTo(parent);
this.elementZ = $('<div class="bluemap-position pos-z">0</div>').appendTo(parent); this.elementZ = $('<div class="bluemap-position pos-z">0</div>').appendTo(parent);
$(document).on('bluemap-update-frame', this.onBlueMapUpdateFrame); $(document).on('bluemap-update-frame', this.onBlueMapUpdateFrame);
} }
onBlueMapUpdateFrame = () => { onBlueMapUpdateFrame = () => {
this.elementX.html(Math.floor(this.blueMap.controls.targetPosition.x)); this.elementX.html(Math.floor(this.blueMap.controls.targetPosition.x));
//this.elementY.html(this.blueMap.controls.targetPosition.y === 0 ? "-" : Math.floor(this.blueMap.controls.targetPosition.y)); //this.elementY.html(this.blueMap.controls.targetPosition.y === 0 ? "-" : Math.floor(this.blueMap.controls.targetPosition.y));
this.elementZ.html(Math.floor(this.blueMap.controls.targetPosition.z)); this.elementZ.html(Math.floor(this.blueMap.controls.targetPosition.z));
} }
} }

136
BlueMapCore/src/main/webroot/js/libs/modules/Settings.js
View File

@ -30,93 +30,93 @@ import { getTopRightElement } from './Module.js';
import GEAR from '../../../assets/gear.svg'; import GEAR from '../../../assets/gear.svg';
export default class Settings { export default class Settings {
constructor(blueMap) { constructor(blueMap) {
this.blueMap = blueMap; this.blueMap = blueMap;
const parent = getTopRightElement(blueMap); const parent = getTopRightElement(blueMap);
$('#bluemap-settings').remove(); $('#bluemap-settings').remove();
this.elementMenu = $('<div id="bluemap-settings-container" style="display: none"></div>').appendTo(parent); this.elementMenu = $('<div id="bluemap-settings-container" style="display: none"></div>').appendTo(parent);
this.elementSettings = $(`<div id="bluemap-settings" class="button"><img src="${GEAR}" /></div>`).appendTo(parent); this.elementSettings = $(`<div id="bluemap-settings" class="button"><img src="${GEAR}" /></div>`).appendTo(parent);
this.elementSettings.click(this.onSettingsClick); this.elementSettings.click(this.onSettingsClick);
/* Quality */ /* Quality */
this.elementQuality = $( this.elementQuality = $(
'<div id="bluemap-settings-quality" class="dropdown-container"><span class="selection">Quality: <span>Normal</span></span><div class="dropdown"><ul>' + '<div id="bluemap-settings-quality" class="dropdown-container"><span class="selection">Quality: <span>Normal</span></span><div class="dropdown"><ul>' +
'<li quality="2">High</li>' + '<li quality="2">High</li>' +
'<li quality="1" style="display: none">Normal</li>' + '<li quality="1" style="display: none">Normal</li>' +
'<li quality="0.75">Fast</li>' + '<li quality="0.75">Fast</li>' +
'</ul></div></div>' '</ul></div></div>'
).prependTo(this.elementMenu); ).prependTo(this.elementMenu);
this.elementQuality.find('li[quality]').click(this.onQualityClick); this.elementQuality.find('li[quality]').click(this.onQualityClick);
this.elementRenderDistance = $('<div id="bluemap-settings-render-distance" class="dropdown-container"></div>').prependTo(this.elementMenu); this.elementRenderDistance = $('<div id="bluemap-settings-render-distance" class="dropdown-container"></div>').prependTo(this.elementMenu);
this.init(); this.init();
$(document).on('bluemap-map-change', this.init); $(document).on('bluemap-map-change', this.init);
} }
init = () => { init = () => {
this.defaultHighRes = this.blueMap.hiresTileManager.viewDistance; this.defaultHighRes = this.blueMap.hiresTileManager.viewDistance;
this.defaultLowRes = this.blueMap.lowresTileManager.viewDistance; this.defaultLowRes = this.blueMap.lowresTileManager.viewDistance;
this.elementRenderDistance.html( this.elementRenderDistance.html(
'<span class="selection">View Distance: <span>' + this.blueMap.hiresTileManager.viewDistance + '</span></span>' + '<span class="selection">View Distance: <span>' + this.blueMap.hiresTileManager.viewDistance + '</span></span>' +
'<div class="dropdown">' + '<div class="dropdown">' +
'<input type="range" min="0" max="100" step="1" value="' + this.renderDistanceToPct(this.blueMap.hiresTileManager.viewDistance, this.defaultHighRes) + '" />' + '<input type="range" min="0" max="100" step="1" value="' + this.renderDistanceToPct(this.blueMap.hiresTileManager.viewDistance, this.defaultHighRes) + '" />' +
'</div>' '</div>'
); );
this.slider = this.elementRenderDistance.find('input'); this.slider = this.elementRenderDistance.find('input');
this.slider.on('change input', this.onViewDistanceSlider); this.slider.on('change input', this.onViewDistanceSlider);
}; };
onViewDistanceSlider = () => { onViewDistanceSlider = () => {
this.blueMap.hiresTileManager.viewDistance = this.pctToRenderDistance(parseFloat(this.slider.val()), this.defaultHighRes); this.blueMap.hiresTileManager.viewDistance = this.pctToRenderDistance(parseFloat(this.slider.val()), this.defaultHighRes);
this.blueMap.lowresTileManager.viewDistance = this.pctToRenderDistance(parseFloat(this.slider.val()), this.defaultLowRes); this.blueMap.lowresTileManager.viewDistance = this.pctToRenderDistance(parseFloat(this.slider.val()), this.defaultLowRes);
this.elementRenderDistance.find('.selection > span').html(Math.round(this.blueMap.hiresTileManager.viewDistance * 10) / 10); this.elementRenderDistance.find('.selection > span').html(Math.round(this.blueMap.hiresTileManager.viewDistance * 10) / 10);
this.blueMap.lowresTileManager.update(); this.blueMap.lowresTileManager.update();
this.blueMap.hiresTileManager.update(); this.blueMap.hiresTileManager.update();
}; };
onQualityClick = (event) => { onQualityClick = (event) => {
const target = event.target const target = event.target
const desc = $(target).html(); const desc = $(target).html();
this.blueMap.quality = parseFloat($(target).attr("quality")); this.blueMap.quality = parseFloat($(target).attr("quality"));
this.elementQuality.find('li').show(); this.elementQuality.find('li').show();
this.elementQuality.find(`li[quality="${this.blueMap.quality}"]`).hide(); this.elementQuality.find(`li[quality="${this.blueMap.quality}"]`).hide();
this.elementQuality.find('.selection > span').html(desc); this.elementQuality.find('.selection > span').html(desc);
this.blueMap.handleContainerResize(); this.blueMap.handleContainerResize();
}; };
onSettingsClick = () => { onSettingsClick = () => {
if (this.elementMenu.css('display') === 'none'){ if (this.elementMenu.css('display') === 'none'){
this.elementSettings.addClass('active'); this.elementSettings.addClass('active');
} else { } else {
this.elementSettings.removeClass('active'); this.elementSettings.removeClass('active');
} }
this.elementMenu.animate({ this.elementMenu.animate({
width: 'toggle' width: 'toggle'
}, 200); }, 200);
} }
pctToRenderDistance(value, defaultValue) { pctToRenderDistance(value, defaultValue) {
let max = defaultValue * 5; let max = defaultValue * 5;
if (max > 20) max = 20; if (max > 20) max = 20;
return Math3.mapLinear(value, 0, 100, 1, max); return Math3.mapLinear(value, 0, 100, 1, max);
} }
renderDistanceToPct(value, defaultValue) { renderDistanceToPct(value, defaultValue) {
let max = defaultValue * 5; let max = defaultValue * 5;
if (max > 20) max = 20; if (max > 20) max = 20;
return Math3.mapLinear(value, 1, max, 0, 100); return Math3.mapLinear(value, 1, max, 0, 100);
} }
} }