@selvajs/visualization 1.7.0-beta.0 → 1.7.0

package/dist/parse.cjs

@@ -1684,29 +1684,58 @@ function applyTexture(material, url, slot, mapSize) {
 const f$1 = (n) => n.toFixed(4);
 const PITH = 120;
 const PITH_SPREAD = 120;
-const PLANK = 180;
+const PLANK = 160;
+const SEAM_JITTER = .7;
 const LEAN = .0105;
+const BOARD_SHADE = .14;
+const PORE_ROW = .35;
+const PORE_FILL = .3;
+const PORE_DARK = .4;
+const PORE_MEAN = PORE_FILL * .7 * .42;
+const seam = (k) => `( ( ${k} ) + ( selvaHash( vec2( ${k}, 6.0 ) ) - 0.5 ) * ${f$1(SEAM_JITTER)} ) * ${f$1(PLANK)}`;
 const wood = ({ ring, latewood, band, pores, streaks }) => `
-		float plank = floor( uv.y / ${f$1(PLANK)} );
-		float s = uv.y - ( plank + 0.5 ) * ${f$1(PLANK)};
+		float cell = floor( uv.y / ${f$1(PLANK)} );
+		float plank = cell + ( uv.y < ${seam("cell")} ? -1.0 : ( uv.y >= ${seam("cell + 1.0")} ? 1.0 : 0.0 ) );
+		float lo = ${seam("plank")};
+		float hi = ${seam("plank + 1.0")};
+		// Each plank starts somewhere else along its log.
+		float along = uv.x + selvaHash( vec2( plank, 9.0 ) ) * 5000.0;
+		// The pith lies anywhere under the plank, sometimes past its edge, which leaves straight
+		// rift grain on that side.
+		float heart = mix( lo, hi, selvaHash( vec2( plank, 3.0 ) ) * 1.6 - 0.3 );
+		heart += ( selvaNoise( vec2( along * 0.0006, plank * 7.0 ) ) - 0.5 ) * 50.0;
+		float s = uv.y - heart;
 		float pith = ${f$1(PITH)} + selvaHash( vec2( plank, 2.0 ) ) * ${f$1(PITH_SPREAD)};
+		pith += ( selvaFbm( vec2( along * 0.0004, plank * 5.0 + 1.0 ) ) - 0.5 ) * ${f$1(50)};
+		float lean = ${f$1(LEAN)} * ( 0.5 + selvaHash( vec2( plank, 8.0 ) ) );
 		// Rings wander a few mm and vary in spacing, as growth does from year to year.
-		float wander = ( selvaFbm( uv * vec2( 0.003, 0.008 ) ) - 0.5 ) * ${f$1(ring * 2)};
-		float r = sqrt( pith * pith + s * s ) + uv.x * ${f$1(LEAN)} + wander;
+		float wander = ( selvaFbm( vec2( along * 0.003, uv.y * 0.008 ) ) - 0.5 ) * ${f$1(ring * 2)};
+		float r = sqrt( pith * pith + s * s ) + along * lean + wander;
 		r += selvaFbm( vec2( r * 0.02, plank ) ) * ${f$1(ring * 3)} + selvaHash( vec2( plank, 1.0 ) ) * ${f$1(ring * 20)};
 		float year = fract( r / ${f$1(ring)} );
 		float late = smoothstep( ${f$1(1 - band)}, ${f$1(1 - band * .4)}, year ) * ( 1.0 - smoothstep( 0.95, 1.0, year ) );
 		// Open-pored wood shows its rings as a broken band of pores, not a clean line.
-		late *= 1.0 - ${f$1(pores * .6)} * ( 1.0 - smoothstep( 0.3, 0.7, selvaNoise( uv * vec2( 0.25, 2.0 ) ) ) );
+		float broken = 1.0 - smoothstep( 0.3, 0.7, selvaNoise( uv * vec2( 0.25, 2.0 ) ) );
+		late *= 1.0 - ${f$1(pores * .45)} * mix( 0.5, broken, selvaDetail( 0.5 ) );
 		late *= selvaDetail( ${f$1(ring)} );
 		float fibre = ( selvaNoise( uv * vec2( 0.04, 1.6 ) ) - 0.5 ) * selvaDetail( 1.0 );
-		float pore = smoothstep( 0.62, 0.8, selvaNoise( uv * vec2( 0.3, 2.5 ) ) ) * ( 1.0 - 0.6 * late );
-		pore *= ${f$1(pores)} * selvaDetail( 0.8 );
-		float streak = ( selvaFbm( uv * vec2( 0.0015, 0.012 ) ) - 0.5 ) * ${f$1(streaks)};
-		float shade = 1.0 + ${f$1(latewood * band)} - late * ${f$1(latewood)} + fibre * 0.1 - pore * 0.45 + streak * 0.6;
-		tone = vec3( shade );
+		// Pores: thin dashes along the grain, most of each row empty. Smaller than a pixel they
+		// show as their average shade, or they would be static.
+		float poreRow = floor( uv.y / ${f$1(PORE_ROW)} );
+		float poreAlong = uv.x / mix( 1.5, 5.0, selvaHash( vec2( poreRow, 11.0 ) ) ) + selvaHash( vec2( poreRow, 12.0 ) );
+		float poreT = fract( poreAlong );
+		float pore = step( ${f$1(.7)}, selvaHash( vec2( poreRow, 13.0 + 1.618 * floor( poreAlong ) ) ) );
+		pore *= smoothstep( 0.0, 0.3, poreT ) * smoothstep( 1.0, 0.7, poreT );
+		pore *= 1.0 - smoothstep( 0.12, 0.3, abs( fract( uv.y / ${f$1(PORE_ROW)} ) - 0.5 ) );
+		pore = mix( ${f$1(PORE_MEAN)}, pore, selvaDetail( ${f$1(PORE_ROW)} ) ) * ${f$1(pores)} * ( 1.0 - 0.6 * late );
+		float streak = ( selvaFbm( vec2( along * 0.0015, uv.y * 0.012 ) ) - 0.5 ) * ${f$1(streaks)};
+		float shade = 1.0 + ${f$1(latewood * band)} - late * ${f$1(latewood)} + fibre * 0.1 - pore * ${f$1(PORE_DARK)} + streak * 0.6;
+		float board = ( selvaHash( vec2( plank, 4.0 ) ) - 0.5 ) * selvaDetail( ${f$1(PLANK * .5)} );
+		float warmth = ( selvaHash( vec2( plank, 5.0 ) ) - 0.5 ) * selvaDetail( ${f$1(PLANK * .5)} );
+		tone = vec3( shade ) * ( 1.0 + board * ${f$1(BOARD_SHADE)} ) * vec3( 1.0 + warmth * 0.06, 1.0, 1.0 - warmth * 0.06 );
 		gloss = 1.0 + late * 0.08 + pore * 0.4 - fibre * 0.2;
-		height = ( fibre * 0.00008 - pore * 0.00015 ) * selvaDetail( 0.6 );`;
+		// No relief from pores: a bump from screen derivatives beads any dash under a few pixels wide.
+		height = fibre * 0.00008 * selvaDetail( 0.6 );`;
 /**
 * Procedural surfaces, so a preset looks like its material with no texture files to ship or upload.
 * UVs are millimetres, so a brick is brick-sized at any model scale. Each recipe sets `tone` (albedo
@@ -2016,6 +2045,7 @@ const RECIPES = {
 };
 const TILT = .6;
 const FIBRE_FADE = .35;
+const FIBRE_ASPECT = 16;
 const f = (n) => n.toFixed(4);
 /** The shader patch for a finish, or null when it would draw nothing. `key` extends the program cache key. */
 function finishPatch(finish, strength) {
@@ -2047,7 +2077,8 @@ function finishPatch(finish, strength) {
 				// of the part. depth * |depth| keeps most fibres faint and a few deep.
 				float selvaFibreRow( vec2 uv, float pitch, vec2 len, float seed ) {
 					float row = floor( uv.y / pitch );
-					float l = mix( len.x, len.y, selvaHash( vec2( row, seed + 1.0 ) ) );
+					// A coarse cell stays a streak: as wide as it is long it reads as speckle, not grain.
+					float l = max( mix( len.x, len.y, selvaHash( vec2( row, seed + 1.0 ) ) ), pitch * ${f(FIBRE_ASPECT)} );
 					float along = uv.x / l + selvaHash( vec2( row, seed + 2.0 ) );
 					float seg = floor( along );
 					float depth = selvaHash( vec2( row, seed + 3.0 + 1.618 * seg ) ) * 2.0 - 1.0;
@@ -2159,7 +2190,7 @@ function createMaterial(matData, options) {
 	}
 	if (matData.anisotropy != null && matData.anisotropy > 0 && options?.hasUvs) {
 		material.anisotropy = matData.anisotropy;
-		material.anisotropyRotation = matData.anisotropyRotation ?? 0;
+		material.anisotropyRotation = (matData.anisotropyRotation ?? 0) + Math.PI / 2;
 	}
 	if (matData.ior != null) material.ior = matData.ior;
 	if (matData.transmission != null && matData.transmission > 0) applyGlass(material, matData);