Correct deck trimming, + position jitter on objects in Ship3d_v2

shiplab · Nov 18, 2019 · f538ce2 · f538ce2
1 parent 72e073b
commit f538ce2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/examples/Ship_in_regular_ocean.html b/examples/Ship_in_regular_ocean.html
@@ -81,7 +81,7 @@
 			scene.add(zUpCont);
 
 			//Camera setup
-			camera = new THREE.PerspectiveCamera(26, window.innerWidth / window.innerHeight, 1, 1000000);
+			camera = new THREE.PerspectiveCamera(26, window.innerWidth / window.innerHeight, 1, 1.5*oSize);
 			let onResize = function() {
 				let w = container.clientWidth;
 				let h = container.clientHeight;

diff --git a/examples/snippets/Ship3D_v2.js b/examples/snippets/Ship3D_v2.js
@@ -151,6 +151,7 @@ function Ship3D(ship, {shipState, stlPath, deckOpacity = 0.2, objectOpacity = 0.
 			//Get zero-width sections
 			let x = stss[j];//d.xAft+(j/stss.length)*(d.xFwd-d.xAft);
 			if (isNaN(x)) x = stss[j-1];
+			x = Math.max(d.xAft, Math.min(d.xFwd, x));
 			let y1 = Vessel.f.linearFromArrays(stss, wlHigh, x);
 			let y2 = Vessel.f.linearFromArrays(stss, wlLow, x);
 			let y = Math.min(0.5 * d.breadth, y1, y2);
@@ -255,6 +256,12 @@ Object.assign(Ship3D.prototype, {
 		let y = s.yCentre;
 		let z = s.zBase;
 
+		//Small position jitter to avoid z-fighting
+		let n = 0.01*(2*Math.random()-1);
+		x += n;
+		y += n;
+		z += n;
+
 		//Scale
 		let d = bo.boxDimensions;