From 8a6ed8a92bbb14a441e522cb4fbd9bbcb23d84da Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Tue, 19 Mar 2024 14:30:40 +0100
Subject: [PATCH] smoother 3d rendering

---
 index.html |  5 +++++
 view3d.js  | 38 ++++++++++++++++++++++++++++++++------
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/index.html b/index.html
index 0386640..9d84e0a 100644
--- a/index.html
+++ b/index.html
@@ -244,10 +244,15 @@
 	</label>
 	<br />
 
+	<label>
+		flat faces
+		<input type="checkbox" name="flatFaces" />
+	</label>
 	<label>
 		height of max color
 		<input type="number" name="colorMax" value="2" step="0.1" min="0" />
 	</label>
+	<br />
 	</label>
 		color scale
 		<input type="text" class="colorscale" id="colorscale3d" name="colorScale" value="#070,#0d0,#7d0,#dc0,#d70,#d30,#f00,#b00,#700,#300,#000" />
diff --git a/view3d.js b/view3d.js
index 8f74ede..6031bf3 100644
--- a/view3d.js
+++ b/view3d.js
@@ -74,10 +74,10 @@ class ThreeView {
 		this.camera.rotation.x = -Math.PI / 3;
 		this.camera.rotation.y = -Math.PI * 3 / 4;
 
-		const directionalLight = new THREE.DirectionalLight(0xffffff, 1.0);
+		const directionalLight = new THREE.DirectionalLight(0xffffff, 2.0);
 		directionalLight.position.set(0.1, 1, 0.4);
 		this.scene.add(directionalLight);
-		const ambientLight = new THREE.AmbientLight( 0x404040 ); // soft white light
+		const ambientLight = new THREE.AmbientLight(0x88888888);
 		this.scene.add(ambientLight);
 		this.currentGround = null;
 		this.visible = false;
@@ -92,22 +92,48 @@ class ThreeView {
 		this.boostSpeed = settings.boostSpeed;
 		let vertices = [];
 		let colors = []
-		for (let triangle of graph.triangles()) {
-			for (let node of triangle) {
+		let indices = [];
+		if (settings.flatFaces) {
+			for (let triangle of graph.triangles()) {
+				for (let node of triangle) {
+					vertices.push(node.pos.x * settings.horizontalScale, node.height() * settings.heightScale, node.pos.y * settings.horizontalScale);
+					if (node.isSea()) {
+						colors.push(0, 0, 0.9);
+					} else if (node.isWaterBody()) {
+						colors.push(0.2, 0.2, 1);
+					} else {
+						colors.push(...settings.colorScale.rgbFloats(node.height() / settings.colorMax));
+					}
+				}
+			}
+		} else {
+			let nodeIndex = new Map();
+			let i = 0;
+			for (let node of graph.all()) {
 				vertices.push(node.pos.x * settings.horizontalScale, node.height() * settings.heightScale, node.pos.y * settings.horizontalScale);
 				if (node.isSea()) {
-					colors.push(0, 0, 225);
+					colors.push(0, 0, 0.9);
 				} else if (node.isWaterBody()) {
-					colors.push(76, 76, 255);
+					colors.push(0.2, 0.2, 1);
 				} else {
 					colors.push(...settings.colorScale.rgbFloats(node.height() / settings.colorMax));
 				}
+				nodeIndex.set(node.id.hash(), i++);
+			}
+
+			for (let triangle of graph.triangles()) {
+				for (let node of triangle) {
+					indices.push(nodeIndex.get(node.id.hash()));
+				}
 			}
 		}
 
 		const geometry = new THREE.BufferGeometry();
 		geometry.setAttribute('position', new THREE.BufferAttribute(new Float32Array(vertices), 3));
 		geometry.setAttribute('color', new THREE.BufferAttribute(new Float32Array(colors), 3));
+		if (!settings.flatFaces) {
+			geometry.setIndex(indices);
+		}
 		geometry.computeBoundingBox();
 		geometry.computeVertexNormals()