Merge branch 'main' of github.com:nwpointer/three-landscape

.github/workflows/npm-publish.yml

@@ -27,7 +27,7 @@ jobs:
         with:
           node-version: 16
           registry-url: https://registry.npmjs.org/
-      - run: npm ci && npm run build
+      - run: npm ci && npm run build && cp README.md ./package/README.md
       - run: npm publish -w package
         env:
-          NODE_AUTH_TOKEN: ${{secrets.npm_token}}
+          NODE_AUTH_TOKEN: ${{secrets.NPM_AUTH_TOKEN}}

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "cSpell.words": [
+        "metalness"
+    ]
+}

Makefile

@@ -0,0 +1,8 @@
+install:
+	@npm install
+
+help:
+	@node -e "console.log(Object.keys(require('.' + require('path').sep + 'package.json').scripts || {}))"
+
+%:
+	@npm run $@

README.md

@@ -10,7 +10,7 @@ Note: this package is not capable of procedurally generating terrain. Height map
 
 https://three-landscape.vercel.app/
 
-Source code for example is available in the /examples/highland@latest directory
+Source code for example is available in the /examples/highlands directory
 
 ### Installation
 
@@ -31,11 +31,12 @@ Custom material that extends the meshStandardMaterial with additional properties
 - Stochastic sampling
 - Triplanar mapping
 - Multiple material blending options
+- Automatic texture 'atlasing' allows more that 16 textures(max on most hardware by default)
 
 ```js
 function MySuperCoolTerrain() {
   const textures = useTexture([
-    ... list of up to 16* textures
+    ... any number of textures
   ]);
 
   return (
@@ -61,8 +62,11 @@ function MySuperCoolTerrain() {
 ### New props:
 
 - splats: Texture[] (expects 4 channel splat data in rgba)
-- noise: Texture; used for stochastic sampling
-- Surfaces: Surface[];
+- surfaceSamples: Number, defaults to 4. 
+- surfaces: Surface[];
+- smoothness: Number > 0
+- distanceOptimizedRendering: Boolean, defaults to true
+
 
 Most of the new features are configured by modifying surface properties.
 
@@ -82,22 +86,6 @@ const grass = {
 };
 ```
 
-### Blend Modes:
-by default all surfaces will be alpha blended based on the weights defined in the provided splatmap(s). This generally looks fine from a distance but you may want to try a different blend mode if the camera is likely to be near the ground. blend mode are a surface specific setting.
-
-##### Noise blending:
-uses random noise and splat weights to create a detailed edge. To fully control the shape, you can optionally provide one or more octaves of noise.
-```
-grass.blend = {
-  mode: "noise",
-  octaves: {
-    blur:0.5,
-    amplitude: 1.25,
-    wavelength: 1024.0 * 16.0,
-    accuracy: 1.25
-  }
-}
-```
 To get a better understanding of how each noise parameter effects the edge check out this interactive demo: https://www.redblobgames.com/x/1730-terrain-shader-experiments/noisy-hex-rendering.html
 
 Please see the example directory for advanced usage and example textures.

examples/highlands/package.json

@@ -3,21 +3,25 @@
   "private": true,
   "version": "0.0.0",
   "type": "module",
-
   "scripts": {
-    "dev": "vite",
+    "dev": "vite --host",
     "build": "tsc && vite build",
     "preview": "vite preview"
   },
   "dependencies": {
     "@react-three/drei": "^9.34.4",
     "@react-three/fiber": "^8.3.1",
+    "@tensorflow/tfjs": "^4.2.0",
+    "@upscalerjs/esrgan-thick": "^1.0.0-beta.11",
+    "install": "^0.13.0",
+    "leva": "^0.9.34",
+    "npm": "^9.6.1",
+    "r3f-perf": "^6.6.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "three": "^0.143.0",
     "three-landscape": "*",
-    "leva": "^0.9.34",
-    "r3f-perf": "^6.6.0"
+    "upscaler": "^1.0.0-beta.16"
   },
   "devDependencies": {
     "@types/react": "^18.0.17",