From 7cca8e428f2a304870eb3999d1c0ed34cfd63f95 Mon Sep 17 00:00:00 2001
From: Katrix <katrix97@hotmail.com>
Date: Sat, 18 Jan 2020 19:30:44 +0100
Subject: [PATCH] Limit raycast objects to the current tile

---
 .../src/main/webroot/js/libs/BlueMap.js       |  3 +++
 .../src/main/webroot/js/libs/Controls.js      | 22 ++++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/BlueMapCore/src/main/webroot/js/libs/BlueMap.js b/BlueMapCore/src/main/webroot/js/libs/BlueMap.js
index 97176aed..c890fb90 100644
--- a/BlueMapCore/src/main/webroot/js/libs/BlueMap.js
+++ b/BlueMapCore/src/main/webroot/js/libs/BlueMap.js
@@ -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(
diff --git a/BlueMapCore/src/main/webroot/js/libs/Controls.js b/BlueMapCore/src/main/webroot/js/libs/Controls.js
index 49609440..e0bb3efe 100644
--- a/BlueMapCore/src/main/webroot/js/libs/Controls.js
+++ b/BlueMapCore/src/main/webroot/js/libs/Controls.js
@@ -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;