@call-me-sensei/toonlab 0.4.21 → 0.4.23

package/src/rockgen/surface/c7GeologySurface.js

@@ -146,12 +146,18 @@ function c7Field(u, v, profile, seed) {
     const mineralPatch = smoothstep(0.48, 0.70, tileFbm(u, v, 5, seed + 67, 2));
     height += smoothstep(0.88, 0.975, fine) * mineralPatch * 0.014;
   } else if (profile.fabric === 3) {
-    height += Math.sin((v * 8.5 + u * 0.62) * Math.PI * 2) * lerp(0.009, 0.024, macro);
+    const beddingWarp = (Math.sin(u * Math.PI * 2) * 0.16)
+      + (Math.sin(u * Math.PI * 4) * 0.06);
+    height += Math.sin((v * 8 + beddingWarp) * Math.PI * 2) * lerp(0.009, 0.024, macro);
   } else if (profile.fabric === 5) {
     height -= (1 - smoothstep(0.08, 0.26, micro)) * 0.085;
   }
   let value = clamp01(0.5 + ((macro - 0.5) * 0.44) + ((micro - 0.5) * 0.34) + ((fine - 0.5) * 0.18));
-  if (profile.fabric === 3) value = clamp01(value + Math.sin((v * 9 + u * 0.5) * Math.PI * 2) * 0.08);
+  if (profile.fabric === 3) {
+    value = clamp01(value + Math.sin(
+      (v * 9 + (Math.sin(u * Math.PI * 2) * 0.18)) * Math.PI * 2,
+    ) * 0.08);
+  }
   return { fine, height, macro, micro, value };
 }
 
@@ -229,11 +235,15 @@ function createFractureSegments(profile, seed) {
 function fractureField(u, v, segments, seed) {
   let fracture = 0;
   for (const segment of segments) {
-    fracture = Math.max(fracture, 1 - smoothstep(
-      segment.width,
-      segment.width * 2.8,
-      pointToSegmentDistance(u, v, segment),
-    ));
+    for (let offsetY = -1; offsetY <= 1; offsetY += 1) {
+      for (let offsetX = -1; offsetX <= 1; offsetX += 1) {
+        fracture = Math.max(fracture, 1 - smoothstep(
+          segment.width,
+          segment.width * 2.8,
+          pointToSegmentDistance(u + offsetX, v + offsetY, segment),
+        ));
+      }
+    }
   }
   return fracture * lerp(0.22, 1, smoothstep(0.28, 0.70, tileFbm(u, v, 11, seed + 241, 2)));
 }
@@ -286,11 +296,13 @@ export function createC7GeologyMapData({ geology, seed, size = 512 } = {}) {
       if (profile.fabric === 3) {
         const u = x / size;
         const v = y / size;
-        const warpedBed = (v * 6.4) + (u * 0.26) + ((field.macro - 0.5) * 1.35)
+        const warpedBed = (v * 6) + ((field.macro - 0.5) * 1.35)
+          + (Math.sin(u * Math.PI * 2) * 0.18)
           + (Math.sin(u * Math.PI * 4) * 0.12);
         const bed = 0.5 + (0.5 * Math.sin(warpedBed * Math.PI * 2));
         const seamVariation = lerp(0.12, 1, tileNoise(u, v, 5, resolvedSeed + 91));
-        const fineBed = 0.5 + (0.5 * Math.sin(((v * 16) + (u * 0.42)
+        const fineBed = 0.5 + (0.5 * Math.sin(((v * 16)
+          + (Math.sin(u * Math.PI * 2) * 0.22)
           + ((field.micro - 0.5) * 0.72)) * Math.PI * 2));
         const creamSeam = Math.max(
           smoothstep(0.90, 0.992, bed) * seamVariation,
@@ -344,6 +356,20 @@ export function createC7GeologyMapData({ geology, seed, size = 512 } = {}) {
       }
     }
   }
+  let horizontalEdgeDelta = 0;
+  let verticalEdgeDelta = 0;
+  for (let index = 0; index < size; index += 1) {
+    for (let channel = 0; channel < 3; channel += 1) {
+      horizontalEdgeDelta += Math.abs(
+        maps.baseColor[((index * size) * 4) + channel]
+          - maps.baseColor[((index * size + size - 1) * 4) + channel],
+      ) / 255;
+      verticalEdgeDelta += Math.abs(
+        maps.baseColor[(index * 4) + channel]
+          - maps.baseColor[((((size - 1) * size) + index) * 4) + channel],
+      ) / 255;
+    }
+  }
   return {
     audit: Object.freeze({
       fractureSegments: fractureSegments.length,
@@ -353,6 +379,10 @@ export function createC7GeologyMapData({ geology, seed, size = 512 } = {}) {
       roles: Object.freeze(Object.keys(maps)),
       seed: resolvedSeed,
       size,
+      tileEdgeMeanAbsoluteDelta: Object.freeze({
+        horizontal: horizontalEdgeDelta / (size * 3),
+        vertical: verticalEdgeDelta / (size * 3),
+      }),
     }),
     maps,
   };