Heightmaps (#35)

* wip with grass

* grass improvements

* wild

* add skirtDepth param to flatWorlds

* changeset new version

* ci: debug publishing

.changeset/sixty-ducks-dream.md

@@ -0,0 +1,9 @@
+---
+"docs": patch
+"examples": patch
+"@hello-worlds/planets": patch
+"@hello-worlds/react": patch
+"@hello-worlds/vfx": patch
+---
+
+Change normal calculations for FlatWorlds (broken)

.changeset/soft-shrimps-marry.md

@@ -0,0 +1,9 @@
+---
+"docs": patch
+"examples": patch
+"@hello-worlds/planets": patch
+"@hello-worlds/react": patch
+"@hello-worlds/vfx": patch
+---
+
+Various improvements to FlatWorlds

apps/examples/package.json

@@ -1,11 +1,12 @@
 {
   "name": "examples",
   "private": true,
-  "version": "0.0.1",
+  "version": "0.0.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "tsc && vite build",
+    "build": "vite build",
+    "build:strictly": "tsc && vite build",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "preview": "vite preview"
   },

packages/planets/src/flat-world/FlatWorld.chunk.ts

@@ -45,7 +45,8 @@ export function buildFlatWorldChunk<D>(
     // Generate indices
     const indices = generateIndices(resolution)
     // Get Normals
-    const normals = generateNormals(positions, indices)
+    let normals = new Array(positions.length).fill(0.0)
+    normals = generateNormals(normals, positions, indices)
 
     // Pull the skirt vertices down away from the surface
     fixEdgeSkirt(
@@ -58,6 +59,7 @@ export function buildFlatWorldChunk<D>(
       skirtDepth,
       inverted,
     )
+
     const heightmap = generateHeightmapBitmap(heights, heightsMin, heightsMax)
 
     // TODO: allow users to create their own buffers (for terrain splatting or object scattering)

packages/planets/src/flat-world/chunk-helpers/fixEdgeSkirts.ts

@@ -2,6 +2,9 @@ import { MathUtils, Vector3 } from "three"
 
 const _D = new Vector3()
 const _P = new Vector3()
+const _N = new Vector3()
+const _NP1 = new Vector3()
+const _NP2 = new Vector3()
 
 export const fixEdgeSkirt = (
   resolution: number,
@@ -14,8 +17,15 @@ export const fixEdgeSkirt = (
   inverted: boolean,
 ) => {
   const effectiveResolution = resolution + 2
+  const copyNormalsFromTopology = true
 
-  const _ApplyFix = (x: number, y: number, xp: number, yp: number) => {
+  const _ApplyFix = (
+    x: number,
+    y: number,
+    xp: number,
+    yp: number,
+    normal: Vector3,
+  ) => {
     const skirtIndex = x * (effectiveResolution + 1) + y
     const proxyIndex = xp * (effectiveResolution + 1) + yp
 
@@ -39,21 +49,56 @@ export const fixEdgeSkirt = (
     positions[skirtIndex * 3 + 1] = _P.y
     positions[skirtIndex * 3 + 2] = _P.z
 
-    normals[skirtIndex * 3 + 0] = normals[proxyIndex * 3 + 0]
-    normals[skirtIndex * 3 + 1] = normals[proxyIndex * 3 + 1]
-    normals[skirtIndex * 3 + 2] = normals[proxyIndex * 3 + 2]
-  }
+    // this copies the normals from the other one, but what if we don't want that?
+    if (copyNormalsFromTopology) {
+      normals[skirtIndex * 3 + 0] = normals[proxyIndex * 3 + 0]
+      normals[skirtIndex * 3 + 1] = normals[proxyIndex * 3 + 1]
+      normals[skirtIndex * 3 + 2] = normals[proxyIndex * 3 + 2]
+    } else {
+      // calculate REAL normals
 
-  for (let y = 0; y <= effectiveResolution; ++y) {
-    _ApplyFix(0, y, 1, y)
+      // get skirt edge normal
+      normals[skirtIndex * 3 + 0] = normal.x
+      normals[skirtIndex * 3 + 1] = normal.y
+      normals[skirtIndex * 3 + 2] = normal.z
+
+      normals[proxyIndex * 3 + 0] = normal.x
+      normals[proxyIndex * 3 + 1] = normal.y
+      normals[proxyIndex * 3 + 2] = normal.z
+    }
   }
+
   for (let y = 0; y <= effectiveResolution; ++y) {
-    _ApplyFix(effectiveResolution, y, effectiveResolution - 1, y)
-  }
-  for (let x = 0; x <= effectiveResolution; ++x) {
-    _ApplyFix(x, 0, x, 1)
-  }
-  for (let x = 0; x <= effectiveResolution; ++x) {
-    _ApplyFix(x, effectiveResolution, x, effectiveResolution - 1)
+    _ApplyFix(0, y, 1, y, new Vector3(1, 0, 0).random().normalize())
+    _ApplyFix(
+      effectiveResolution,
+      y,
+      effectiveResolution - 1,
+      y,
+      new Vector3(-1, 0, 0).random().normalize(),
+    )
+
+    // because this is a square, we can do this loop at the same time
+    const x = y
+
+    _ApplyFix(x, 0, x, 1, new Vector3(0, 0, 1).random().normalize())
+    _ApplyFix(
+      x,
+      effectiveResolution,
+      x,
+      effectiveResolution - 1,
+      new Vector3(0, 0, -1).random().normalize(),
+    )
   }
+
+  // for (let x = 0; x <= effectiveResolution; ++x) {
+  //   _ApplyFix(x, 0, x, 1, new Vector3(0, 0, 1).random().normalize())
+  //   _ApplyFix(
+  //     x,
+  //     effectiveResolution,
+  //     x,
+  //     effectiveResolution - 1,
+  //     new Vector3(0, 0, -1).random().normalize(),
+  //   )
+  // }
 }

packages/planets/src/flat-world/chunk-helpers/generateInitialHeights.ts

@@ -7,13 +7,9 @@ import {
 import { tempColor } from "../../utils"
 
 const _D = new Vector3()
-
 const _P = new Vector3()
-
 const _H = new Vector3()
 const _W = new Vector3()
-// const _S = new Vector3()
-const _C = new Vector3()
 
 const colorInputVector = new Vector3()
 
@@ -22,14 +18,6 @@ export interface GenerateInitialHeightsProps<D> extends ChunkGeneratorProps<D> {
   colorGenerator?: ColorGenerator<D>
 }
 
-// function calculateUVCoordinates(x: number, y: numbe, width: number, height: number): [number, number] {
-//   // Normalize the coordinates to range [0, 1]
-//   const u = x / (this.width - 1);
-//   const v = y / (this.height - 1);
-
-//   return { u, v };
-// }
-
 export const generateInitialHeights = <D>(
   params: GenerateInitialHeightsProps<D>,
 ) => {
@@ -99,7 +87,7 @@ export const generateInitialHeights = <D>(
         heightsMin = Math.min(heightsMin, height)
       }
 
-      const color = colorGenerator
+      let color = colorGenerator
         ? colorGenerator({
             input: colorInputVector.set(_W.x, _W.y, height).clone(),
             worldPosition: _W.clone(),
@@ -115,6 +103,10 @@ export const generateInitialHeights = <D>(
           })
         : tempColor.set(0xffffff).clone()
 
+      // if (!notInSkirt) {
+      //   color = skirtDebugColor
+      // }
+
       // Purturb height along z-vector
       _P.z += height * (params.inverted ? -1 : 1)
 

packages/planets/src/flat-world/chunk-helpers/generateNormals.ts

@@ -8,10 +8,10 @@ const _D1 = new Vector3()
 const _D2 = new Vector3()
 
 export const generateNormals = (
+  normals: number[],
   positions: number[],
   indices: number[],
 ): number[] => {
-  const normals = new Array(positions.length).fill(0.0)
   for (let i = 0, n = indices.length; i < n; i += 3) {
     const i1 = indices[i] * 3
     const i2 = indices[i + 1] * 3