Upstream
/
BlueMap
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Limit raycast objects to the current tile

This commit is contained in:
Katrix 2020-01-18 19:30:44 +01:00
parent aaaaf7e18a
commit 7cca8e428f
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BlueMapCore/src/main/webroot/js/libs/BlueMap.js
View File

@ -80,6 +80,8 @@ export default class BlueMap {
this.controls = new Controls(this.camera, this.element, this.hiresScene);
this.loadSettings().then(async () => {
this.controls.setTileSize(this.settings[this.map]['hires']['tileSize']);
this.lowresTileManager = new TileManager(
this,
this.settings[this.map]['lowres']['viewDistance'],
@ -120,6 +122,7 @@ export default class BlueMap {
this.lowresTileManager.close();
this.map = map;
this.controls.setTileSize(this.settings[this.map]['hires']['tileSize']);
this.controls.resetPosition();
this.lowresTileManager = new TileManager(

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

@ -113,6 +113,10 @@ export default class Controls {
this.camera.updateProjectionMatrix();
}
setTileSize(tileSize) {
this.tileSize = tileSize;
}
resetPosition() {
this.position = new Vector3(0, 70, 0);
this.targetPosition = new Vector3(0, 70, 0);
@ -174,13 +178,25 @@ export default class Controls {
}
updateHeights() {
//TODO: this can be performance-improved by only intersecting the correct tile?
function between(n, min, max) {
return n >= min && n < max;
}
let inTile = (pos, thisPos) => {
return between(pos.x, thisPos.x - this.tileSize.x, thisPos.x) &&
between(pos.z, thisPos.z - this.tileSize.z, thisPos.z);
};
let tileChildren = (targetPos) => {
return this.heightScene.children.filter(child => inTile(child.position, targetPos))
};
let rayStart = new Vector3(this.targetPosition.x, 300, this.targetPosition.z);
this.raycaster.set(rayStart, this.rayDirection);
this.raycaster.near = 1;
this.raycaster.far = 300;
let intersects = this.raycaster.intersectObjects(this.heightScene.children);
let intersects = this.raycaster.intersectObjects(tileChildren(this.targetPosition));
if (intersects.length > 0){
this.minHeight = intersects[0].point.y;
//this.targetPosition.y = this.minHeight;
@ -191,7 +207,7 @@ export default class Controls {
rayStart.set(this.camera.position.x, 300, this.camera.position.z);
this.raycaster.set(rayStart, this.rayDirection);
intersects.length = 0;
intersects = this.raycaster.intersectObjects(this.heightScene.children);
intersects = this.raycaster.intersectObjects(tileChildren(this.camera.position));
if (intersects.length > 0){
if (intersects[0].point.y > this.minHeight){
this.minHeight = intersects[0].point.y;