Minor globe improvements

phpx-foundation · Nov 19, 2024 · c43a8b1 · c43a8b1
1 parent 9674cdf
commit c43a8b1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/app/Http/Controllers/World/HomeController.php b/app/Http/Controllers/World/HomeController.php
@@ -67,8 +67,10 @@ function maximizeDistance(Collection $points)
 				$targets = $result->take(-2);
 
 				$distance = $this->distance($targets->pop(), $point);
+
 				if ($targets->isNotEmpty()) {
 					$distance += $this->distance($targets->pop(), $point);
+					$distance = $distance / 2;
 				}
 
 				return $distance;

diff --git a/resources/js/globe.js b/resources/js/globe.js
@@ -12,6 +12,7 @@ if (! WebGL.isWebGL2Available()) {
 }
 
 const node = document.getElementById('globe-visualization');
+// const debug_node = document.getElementById('debug');
 const points = JSON.parse(node.dataset.points);
 
 const colorInterpolator = t => `rgba(255, 210, 210, ${ 1 - t })`;
@@ -94,7 +95,13 @@ function ease(k) {
 }
 
 function easeInOut (frame, frames, min, max) {
-	return min + (max - min) * Math.sin(Math.PI * (frame / frames)) * Math.sin(Math.PI * (frame / frames));
+	let eased = min + (max - min) * Math.sin(Math.PI * (frame / frames)) * Math.sin(Math.PI * (frame / frames));
+
+	if (frame > (frames /2 )) {
+		eased = Math.max(eased, default_z);
+	}
+
+	return eased;
 }
 
 function interpolate(from, to, tick, ticks) {
@@ -121,7 +128,7 @@ let frames_per_point = (60 * SECONDS_BETWEEN_POINTS); // Assume 60 fps at first
 let last_timestamp = 0;
 let current_z = default_z;
 let last_z = default_z;
-let fps = 0;
+let fps = 60;
 
 function move(frame)
 {
@@ -178,6 +185,10 @@ function pause(frame)
 	fps = 1 / (timestamp - last_timestamp);
 	last_timestamp = timestamp;
 
+	// if (debug_node) {
+	// 	debug_node.innerText = `${ camera.position.z.toFixed(2) } (${ Math.round(fps) } fps)`;
+	// }
+
 	renderer.render(scene, camera);
 	requestAnimationFrame(animate);
 })();
diff --git a/resources/views/world/home.blade.php b/resources/views/world/home.blade.php
@@ -9,6 +9,9 @@
 
 	<x-slot:before>
 		<div id="globe-visualization" class="w-full h-32 -mb-4 sm:h-40 md:h-56 lg:h-96" data-points="{{ json_encode($points) }}"></div>
+		@env('local')
+			<div id="debug" class="absolute top-4 right-4 bg-red-800 text-white p-4 rounded"></div>
+		@endenv
 	</x-slot:before>
 
 	<x-markdown :file="base_path('README.md')" sidebar />