@zephyr3d/scene 0.9.26 → 0.10.0

package/dist/utility/serialization/scene/sprite.js

@@ -1,19 +1,20 @@
 import { getEngine } from '../../../app/api.js';
 import '../../../scene/scene.js';
 import { Vector2, mimeTypeOf } from '@zephyr3d/base';
-import '../../../values.js';
-import '../../../render/render_queue.js';
 import '../../../render/primitive.js';
 import '@zephyr3d/device';
+import '../../../values.js';
+import '../../../render/render_queue.js';
 import '../../../material/shader/helper.js';
 import '../../../material/lambert.js';
 import '../../../material/blinn.js';
 import '../../../material/unlit.js';
+import '../../../material/meshmaterial.js';
 import '../../../material/particle.js';
 import '../../../material/subsurfaceprofile.js';
-import '../../../material/skin.js';
+import '../../../material/sssprofile.js';
+import '../../../material/sss.js';
 import '../../../material/eye.js';
-import '../../../material/meshmaterial.js';
 import '../../../material/hair.js';
 import '../../../material/hairstrand.js';
 import '../../../material/grassmaterial.js';
@@ -31,9 +32,14 @@ import '../../../render/lightpass.js';
 import '../../../render/sky.js';
 import '../../../render/clipmap.js';
 import '../../../render/envlight.js';
+import '../../../render/lod.js';
 import '../../../render/dualdepthpeeling_oit.js';
 import '../../../shaders/atmosphere.js';
+import '../../../render/water_interaction.js';
 import '../../../render/rendergraph/scene_render_context.js';
+import '../../../render/sdf/scene_sdf.js';
+import '../../../render/sdf/global_sdf.js';
+import '../../../render/gi/voxelize_pass.js';
 import { GraphNode } from '../../../scene/graph_node.js';
 import '../../../shadow/shadowmapper.js';
 import '../../../scene/mesh.js';
@@ -49,6 +55,7 @@ import '../../../scene/batchgroup.js';
 import '../../../scene/terrain-cm/terrain-cm.js';
 import '../../../scene/terrain-cm/grass.js';
 import '../../../scene/raycast_visitor.js';
+import '../../../scene/foliage.js';
 import { meshInstanceClsMap } from './common.js';
 
 /** @internal */ function getSpriteClass() {

package/dist/utility/serialization/scene/sprite.js.map

@@ -1 +1 @@
-{"version":3,"file":"sprite.js","sources":["../../../../src/utility/serialization/scene/sprite.ts"],"sourcesContent":["import { getEngine } from '../../../app/api';\r\nimport type { MeshMaterial } from '../../../material/meshmaterial';\r\nimport { GraphNode, type SceneNode } from '../../../scene';\r\nimport { defineProps, type SerializableClass } from '../types';\r\nimport { meshInstanceClsMap } from './common';\r\nimport { Sprite } from '../../../scene/sprite';\r\nimport { SpriteMaterial } from '../../../material/sprite';\r\nimport { mimeTypeOf, Vector2 } from '@zephyr3d/base';\r\n\r\n/** @internal */\r\nexport function getSpriteClass(): SerializableClass {\r\n  return {\r\n    ctor: Sprite,\r\n    name: 'Sprite',\r\n    parent: GraphNode,\r\n    noTitle: true,\r\n    createFunc(ctx: SceneNode) {\r\n      const node = new Sprite(ctx.scene!);\r\n      node.parent = ctx;\r\n      return { obj: node };\r\n    },\r\n    getProps() {\r\n      return defineProps([\r\n        {\r\n          name: 'Anchor',\r\n          description: 'Sprite pivot in normalized UV space',\r\n          type: 'vec2',\r\n          default: [0.5, 0.5],\r\n          get(this: Sprite, value) {\r\n            value.num[0] = this.anchorX;\r\n            value.num[1] = this.anchorY;\r\n          },\r\n          set(this: Sprite, value) {\r\n            this.anchorX = value.num[0];\r\n            this.anchorY = value.num[1];\r\n          }\r\n        },\r\n        {\r\n          name: 'UVTopLeft',\r\n          description: 'Top-left UV coordinate of the sprite image',\r\n          type: 'vec2',\r\n          default: [0, 0],\r\n          get(this: Sprite, value) {\r\n            const lt = this.uvTopLeft;\r\n            value.num[0] = lt.x;\r\n            value.num[1] = lt.y;\r\n          },\r\n          set(this: Sprite, value) {\r\n            this.uvTopLeft = new Vector2(value.num[0], value.num[1]);\r\n          }\r\n        },\r\n        {\r\n          name: 'UVBottomRight',\r\n          description: 'Bottom-right UV coordinate of the sprite image',\r\n          type: 'vec2',\r\n          default: [1, 1],\r\n          get(this: Sprite, value) {\r\n            const rb = this.uvBottomRight;\r\n            value.num[0] = rb.x;\r\n            value.num[1] = rb.y;\r\n          },\r\n          set(this: Sprite, value) {\r\n            this.uvBottomRight = new Vector2(value.num[0], value.num[1]);\r\n          }\r\n        },\r\n        {\r\n          name: 'Material',\r\n          description: 'Sprite material object',\r\n          type: 'object',\r\n          options: {\r\n            mimeTypes: [mimeTypeOf('.zmtl')]\r\n          },\r\n          get(this: Sprite, value) {\r\n            const m = this.material?.coreMaterial;\r\n            value.str[0] = getEngine().resourceManager.getAssetId(m) ?? '';\r\n          },\r\n          async set(this: Sprite, value) {\r\n            if (value?.str[0]) {\r\n              const material = await getEngine().resourceManager.fetchMaterial<MeshMaterial>(value.str[0]);\r\n              if (material && material instanceof SpriteMaterial) {\r\n                this.material = material;\r\n              } else {\r\n                console.error(\r\n                  material ? `Not a sprite material: ${value.str[0]}` : `Material not found: ${value.str[0]}`\r\n                );\r\n              }\r\n            }\r\n          }\r\n        },\r\n        {\r\n          name: 'Geometry Instance',\r\n          description: 'If true, the sprite uses a material instance',\r\n          type: 'bool',\r\n          get(this: Sprite, value) {\r\n            value.bool[0] = !!this.material?.$isInstance;\r\n          },\r\n          set(this: Sprite, value) {\r\n            this.material =\r\n              (value.bool[0] ? this.material?.createInstance() : this.material?.coreMaterial) ?? null;\r\n          }\r\n        },\r\n        {\r\n          name: 'MaterialInstanceUniforms',\r\n          description: 'Per-instance overrides for sprite material uniforms',\r\n          type: 'object',\r\n          phase: 1,\r\n          options: {\r\n            objectTypes: []\r\n          },\r\n          isHidden(this: Sprite) {\r\n            return this.material && !this.material?.$isInstance;\r\n          },\r\n          isNullable() {\r\n            return true;\r\n          },\r\n          get(this: Sprite, value) {\r\n            const C = this.material?.$isInstance\r\n              ? meshInstanceClsMap.get(this.material.coreMaterial.constructor as typeof MeshMaterial)\r\n              : null;\r\n            value.object[0] = C ? new C.C(this.material) : null;\r\n          },\r\n          set(this: Sprite, value) {\r\n            if (value.object[0]) {\r\n              this.material = (value.object[0] as any)?.material;\r\n            }\r\n          }\r\n        }\r\n      ]);\r\n    }\r\n  };\r\n}\r\n"],"names":["getSpriteClass","ctor","Sprite","name","parent","GraphNode","noTitle","createFunc","ctx","node","scene","obj","getProps","defineProps","description","type","default","get","value","num","anchorX","anchorY","set","lt","uvTopLeft","x","y","Vector2","rb","uvBottomRight","options","mimeTypes","mimeTypeOf","m","material","coreMaterial","str","getEngine","resourceManager","getAssetId","fetchMaterial","SpriteMaterial","console","error","bool","$isInstance","createInstance","phase","objectTypes","isHidden","isNullable","C","meshInstanceClsMap","object"],"mappings":"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"}
+{"version":3,"file":"sprite.js","sources":["../../../../src/utility/serialization/scene/sprite.ts"],"sourcesContent":["import { getEngine } from '../../../app/api';\r\nimport type { MeshMaterial } from '../../../material/meshmaterial';\r\nimport { GraphNode, type SceneNode } from '../../../scene';\r\nimport { defineProps, type SerializableClass } from '../types';\r\nimport { meshInstanceClsMap } from './common';\r\nimport { Sprite } from '../../../scene/sprite';\r\nimport { SpriteMaterial } from '../../../material/sprite';\r\nimport { mimeTypeOf, Vector2 } from '@zephyr3d/base';\r\n\r\n/** @internal */\r\nexport function getSpriteClass(): SerializableClass {\r\n  return {\r\n    ctor: Sprite,\r\n    name: 'Sprite',\r\n    parent: GraphNode,\r\n    noTitle: true,\r\n    createFunc(ctx: SceneNode) {\r\n      const node = new Sprite(ctx.scene!);\r\n      node.parent = ctx;\r\n      return { obj: node };\r\n    },\r\n    getProps() {\r\n      return defineProps([\r\n        {\r\n          name: 'Anchor',\r\n          description: 'Sprite pivot in normalized UV space',\r\n          type: 'vec2',\r\n          default: [0.5, 0.5],\r\n          get(this: Sprite, value) {\r\n            value.num[0] = this.anchorX;\r\n            value.num[1] = this.anchorY;\r\n          },\r\n          set(this: Sprite, value) {\r\n            this.anchorX = value.num[0];\r\n            this.anchorY = value.num[1];\r\n          }\r\n        },\r\n        {\r\n          name: 'UVTopLeft',\r\n          description: 'Top-left UV coordinate of the sprite image',\r\n          type: 'vec2',\r\n          default: [0, 0],\r\n          get(this: Sprite, value) {\r\n            const lt = this.uvTopLeft;\r\n            value.num[0] = lt.x;\r\n            value.num[1] = lt.y;\r\n          },\r\n          set(this: Sprite, value) {\r\n            this.uvTopLeft = new Vector2(value.num[0], value.num[1]);\r\n          }\r\n        },\r\n        {\r\n          name: 'UVBottomRight',\r\n          description: 'Bottom-right UV coordinate of the sprite image',\r\n          type: 'vec2',\r\n          default: [1, 1],\r\n          get(this: Sprite, value) {\r\n            const rb = this.uvBottomRight;\r\n            value.num[0] = rb.x;\r\n            value.num[1] = rb.y;\r\n          },\r\n          set(this: Sprite, value) {\r\n            this.uvBottomRight = new Vector2(value.num[0], value.num[1]);\r\n          }\r\n        },\r\n        {\r\n          name: 'Material',\r\n          description: 'Sprite material object',\r\n          type: 'object',\r\n          options: {\r\n            mimeTypes: [mimeTypeOf('.zmtl')]\r\n          },\r\n          get(this: Sprite, value) {\r\n            const m = this.material?.coreMaterial;\r\n            value.str[0] = getEngine().resourceManager.getAssetId(m) ?? '';\r\n          },\r\n          async set(this: Sprite, value) {\r\n            if (value?.str[0]) {\r\n              const material = await getEngine().resourceManager.fetchMaterial<MeshMaterial>(value.str[0]);\r\n              if (material && material instanceof SpriteMaterial) {\r\n                this.material = material;\r\n              } else {\r\n                console.error(\r\n                  material ? `Not a sprite material: ${value.str[0]}` : `Material not found: ${value.str[0]}`\r\n                );\r\n              }\r\n            }\r\n          }\r\n        },\r\n        {\r\n          name: 'Geometry Instance',\r\n          description: 'If true, the sprite uses a material instance',\r\n          type: 'bool',\r\n          get(this: Sprite, value) {\r\n            value.bool[0] = !!this.material?.$isInstance;\r\n          },\r\n          set(this: Sprite, value) {\r\n            this.material =\r\n              (value.bool[0] ? this.material?.createInstance() : this.material?.coreMaterial) ?? null;\r\n          }\r\n        },\r\n        {\r\n          name: 'MaterialInstanceUniforms',\r\n          description: 'Per-instance overrides for sprite material uniforms',\r\n          type: 'object',\r\n          phase: 1,\r\n          options: {\r\n            objectTypes: []\r\n          },\r\n          isHidden(this: Sprite) {\r\n            return this.material && !this.material?.$isInstance;\r\n          },\r\n          isNullable() {\r\n            return true;\r\n          },\r\n          get(this: Sprite, value) {\r\n            const C = this.material?.$isInstance\r\n              ? meshInstanceClsMap.get(this.material.coreMaterial.constructor as typeof MeshMaterial)\r\n              : null;\r\n            value.object[0] = C ? new C.C(this.material) : null;\r\n          },\r\n          set(this: Sprite, value) {\r\n            if (value.object[0]) {\r\n              this.material = (value.object[0] as any)?.material;\r\n            }\r\n          }\r\n        }\r\n      ]);\r\n    }\r\n  };\r\n}\r\n"],"names":["getSpriteClass","ctor","Sprite","name","parent","GraphNode","noTitle","createFunc","ctx","node","scene","obj","getProps","defineProps","description","type","default","get","value","num","anchorX","anchorY","set","lt","uvTopLeft","x","y","Vector2","rb","uvBottomRight","options","mimeTypes","mimeTypeOf","m","material","coreMaterial","str","getEngine","resourceManager","getAssetId","fetchMaterial","SpriteMaterial","console","error","bool","$isInstance","createInstance","phase","objectTypes","isHidden","isNullable","C","meshInstanceClsMap","object"],"mappings":"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"}

package/dist/utility/serialization/scene/terrain.js

@@ -1,19 +1,20 @@
 import '../../../scene/scene.js';
-import '@zephyr3d/base';
-import '../../../values.js';
-import '../../../render/render_queue.js';
+import { Vector4 } from '@zephyr3d/base';
 import { getDevice } from '../../../app/api.js';
 import '../../../render/primitive.js';
 import '@zephyr3d/device';
+import '../../../values.js';
+import '../../../render/render_queue.js';
 import '../../../material/shader/helper.js';
 import '../../../material/lambert.js';
 import '../../../material/blinn.js';
 import '../../../material/unlit.js';
+import '../../../material/meshmaterial.js';
 import '../../../material/particle.js';
 import '../../../material/subsurfaceprofile.js';
-import '../../../material/skin.js';
+import '../../../material/sssprofile.js';
+import '../../../material/sss.js';
 import '../../../material/eye.js';
-import '../../../material/meshmaterial.js';
 import '../../../material/hair.js';
 import '../../../material/hairstrand.js';
 import '../../../material/grassmaterial.js';
@@ -31,9 +32,14 @@ import '../../../render/lightpass.js';
 import '../../../render/sky.js';
 import '../../../render/clipmap.js';
 import '../../../render/envlight.js';
+import '../../../render/lod.js';
 import '../../../render/dualdepthpeeling_oit.js';
 import '../../../shaders/atmosphere.js';
+import '../../../render/water_interaction.js';
 import '../../../render/rendergraph/scene_render_context.js';
+import '../../../render/sdf/scene_sdf.js';
+import '../../../render/sdf/global_sdf.js';
+import '../../../render/gi/voxelize_pass.js';
 import { GraphNode } from '../../../scene/graph_node.js';
 import '../../../shadow/shadowmapper.js';
 import '../../../scene/mesh.js';
@@ -46,8 +52,9 @@ import '../../../scene/scene_node.js';
 import '../../../scene/particlesys.js';
 import '../../../scene/batchgroup.js';
 import { ClipmapTerrain } from '../../../scene/terrain-cm/terrain-cm.js';
-import '../../../scene/terrain-cm/grass.js';
+import { DEFAULT_BLADE_WIDTH, DEFAULT_BLADE_HEIGHT } from '../../../scene/terrain-cm/grass.js';
 import '../../../scene/raycast_visitor.js';
+import '../../../scene/foliage.js';
 import { JSONArray } from '../json.js';
 
 // 'GRAS' in little endian. The legacy per-instance format starts with the
@@ -137,7 +144,7 @@ async function getTerrainHeightMapContent(terrain) {
     if (heightmap.format === 'r16f') {
         await heightmap.readPixels(0, 0, heightmap.width, heightmap.height, 0, 0, data);
     } else if (heightmap.format === 'rgba16f') {
-        // WebGL1 uses rgba16f for height map, so we need to convert
+        // An rgba16f height map keeps the height in the red channel
         const tmpData = new Uint16Array(heightmap.width * heightmap.height * 4);
         await heightmap.readPixels(0, 0, heightmap.width, heightmap.height, 0, 0, tmpData);
         for(let i = 0; i < heightmap.width * heightmap.height; i++){
@@ -158,7 +165,8 @@ async function getTerrainSplatMapContent(terrain) {
     head.setUint32(8, numLayers, true);
     for(let i = 0; i < numLayers; i++){
         const layerData = new Uint8Array(buffer, 3 * 4 + i * splatMap.width * splatMap.height * info.blockWidth * info.blockHeight * info.size);
-        await splatMap.readPixels(0, 0, splatMap.width, splatMap.height, 0, 0, layerData);
+        // Layer i holds the weights of detail layers 4i..4i+3
+        await splatMap.readPixels(0, 0, splatMap.width, splatMap.height, i, 0, layerData);
     }
     return buffer;
 }
@@ -212,6 +220,18 @@ async function getTerrainSplatMapContent(terrain) {
                         this.castShadow = value.bool[0];
                     }
                 },
+                {
+                    name: 'RuntimeVirtualTexture',
+                    description: 'Blends the detail layers once into a texture cache instead of every frame for every pixel. ' + 'Shading cost no longer grows with the number of layers; close up the ground can look a bit ' + 'softer while the finest detail streams in. WebGPU only',
+                    type: 'bool',
+                    default: false,
+                    get (value) {
+                        value.bool[0] = this.runtimeVirtualTexture;
+                    },
+                    set (value) {
+                        this.runtimeVirtualTexture = value.bool[0];
+                    }
+                },
                 {
                     name: 'Wireframe',
                     description: 'If true, the terrain will be rendered as wireframe',
@@ -287,11 +307,67 @@ async function getTerrainSplatMapContent(terrain) {
                         for(let i = 0; i < numLayers; i++){
                             const grassTexture = this.grassRenderer.getGrassTexture(i);
                             const assetId = grassTexture ? manager.getAssetId(grassTexture) ?? '' : '';
-                            data.push({
+                            const layer = this.grassRenderer.getLayer(i);
+                            const info = {
                                 texture: assetId,
                                 bladeWidth: this.grassRenderer.getBladeWidth(i),
-                                bladeHeight: this.grassRenderer.getBladeHeight(i)
-                            });
+                                bladeHeight: this.grassRenderer.getBladeHeight(i),
+                                drawDistance: this.grassRenderer.getDrawDistance(i),
+                                farDensity: this.grassRenderer.getFarDensity(i)
+                            };
+                            if (layer.kind === 'blade') {
+                                info.kind = 'blade';
+                                info.blade = {
+                                    heightRandomness: layer.heightRandomness,
+                                    widthRandomness: layer.widthRandomness,
+                                    tilt: layer.tilt,
+                                    tiltRandomness: layer.tiltRandomness,
+                                    bend: layer.bend,
+                                    bendRandomness: layer.bendRandomness,
+                                    taper: layer.taper,
+                                    tipDetail: layer.tipDetail,
+                                    clumpSize: layer.clumpSize,
+                                    clumpHeightVariation: layer.clumpHeightVariation,
+                                    clumpPull: layer.clumpPull,
+                                    clumpSameDirection: layer.clumpSameDirection,
+                                    clumpFaceAway: layer.clumpFaceAway,
+                                    clumpColorVariation: layer.clumpColorVariation,
+                                    rootOcclusion: layer.rootOcclusion,
+                                    roundness: layer.roundness,
+                                    viewThickening: layer.viewThickening,
+                                    farNormalStart: layer.farNormalStart,
+                                    farNormalEnd: layer.farNormalEnd,
+                                    farRoughness: layer.farRoughness,
+                                    minScreenWidth: layer.minScreenWidth,
+                                    windFacing: layer.windFacing,
+                                    windLean: layer.windLean,
+                                    swayAmplitude: layer.swayAmplitude,
+                                    swaySpeed: layer.swaySpeed,
+                                    lodDistance: layer.lodDistance,
+                                    rootColor: [
+                                        layer.rootColor.x,
+                                        layer.rootColor.y,
+                                        layer.rootColor.z
+                                    ],
+                                    tipColor: [
+                                        layer.tipColor.x,
+                                        layer.tipColor.y,
+                                        layer.tipColor.z
+                                    ],
+                                    transmissionColor: [
+                                        layer.transmissionColor.x,
+                                        layer.transmissionColor.y,
+                                        layer.transmissionColor.z
+                                    ]
+                                };
+                            } else {
+                                info.card = {
+                                    windLean: layer.windLean,
+                                    swayAmplitude: layer.swayAmplitude,
+                                    swaySpeed: layer.swaySpeed
+                                };
+                            }
+                            data.push(info);
                         }
                         value.object[0] = new JSONArray(null, data);
                     },
@@ -315,7 +391,60 @@ async function getTerrainSplatMapContent(terrain) {
                                     texture = null;
                                 }
                             }
-                            this.grassRenderer.addLayer(info.bladeWidth ?? 1, info.bladeHeight ?? 1, texture);
+                            const isBlade = info.kind === 'blade';
+                            const layer = this.grassRenderer.addLayer(info.bladeWidth ?? (isBlade ? DEFAULT_BLADE_WIDTH : 1), info.bladeHeight ?? (isBlade ? DEFAULT_BLADE_HEIGHT : 1), texture, isBlade ? 'blade' : 'card');
+                            const blade = info.blade;
+                            const card = info.card;
+                            if (info.kind !== 'blade' && card) {
+                                const grassLayer = this.grassRenderer.getLayer(layer);
+                                grassLayer.windLean = card.windLean ?? grassLayer.windLean;
+                                grassLayer.swayAmplitude = card.swayAmplitude ?? grassLayer.swayAmplitude;
+                                grassLayer.swaySpeed = card.swaySpeed ?? grassLayer.swaySpeed;
+                            }
+                            if (info.kind === 'blade' && blade) {
+                                const grassLayer = this.grassRenderer.getLayer(layer);
+                                grassLayer.heightRandomness = blade.heightRandomness ?? grassLayer.heightRandomness;
+                                grassLayer.widthRandomness = blade.widthRandomness ?? grassLayer.widthRandomness;
+                                grassLayer.tilt = blade.tilt ?? grassLayer.tilt;
+                                grassLayer.tiltRandomness = blade.tiltRandomness ?? grassLayer.tiltRandomness;
+                                grassLayer.bend = blade.bend ?? grassLayer.bend;
+                                grassLayer.bendRandomness = blade.bendRandomness ?? grassLayer.bendRandomness;
+                                grassLayer.taper = blade.taper ?? grassLayer.taper;
+                                grassLayer.tipDetail = blade.tipDetail ?? grassLayer.tipDetail;
+                                grassLayer.clumpSize = blade.clumpSize ?? grassLayer.clumpSize;
+                                grassLayer.clumpHeightVariation = blade.clumpHeightVariation ?? grassLayer.clumpHeightVariation;
+                                grassLayer.clumpPull = blade.clumpPull ?? grassLayer.clumpPull;
+                                grassLayer.clumpSameDirection = blade.clumpSameDirection ?? grassLayer.clumpSameDirection;
+                                grassLayer.clumpFaceAway = blade.clumpFaceAway ?? grassLayer.clumpFaceAway;
+                                grassLayer.clumpColorVariation = blade.clumpColorVariation ?? grassLayer.clumpColorVariation;
+                                grassLayer.rootOcclusion = blade.rootOcclusion ?? grassLayer.rootOcclusion;
+                                grassLayer.roundness = blade.roundness ?? grassLayer.roundness;
+                                grassLayer.viewThickening = blade.viewThickening ?? grassLayer.viewThickening;
+                                grassLayer.farNormalStart = blade.farNormalStart ?? grassLayer.farNormalStart;
+                                grassLayer.farNormalEnd = blade.farNormalEnd ?? grassLayer.farNormalEnd;
+                                grassLayer.farRoughness = blade.farRoughness ?? grassLayer.farRoughness;
+                                grassLayer.minScreenWidth = blade.minScreenWidth ?? grassLayer.minScreenWidth;
+                                grassLayer.windFacing = blade.windFacing ?? grassLayer.windFacing;
+                                grassLayer.windLean = blade.windLean ?? grassLayer.windLean;
+                                grassLayer.swayAmplitude = blade.swayAmplitude ?? grassLayer.swayAmplitude;
+                                grassLayer.swaySpeed = blade.swaySpeed ?? grassLayer.swaySpeed;
+                                grassLayer.lodDistance = blade.lodDistance ?? grassLayer.lodDistance;
+                                if (blade.rootColor) {
+                                    grassLayer.rootColor = new Vector4(blade.rootColor[0], blade.rootColor[1], blade.rootColor[2], 1);
+                                }
+                                if (blade.tipColor) {
+                                    grassLayer.tipColor = new Vector4(blade.tipColor[0], blade.tipColor[1], blade.tipColor[2], 1);
+                                }
+                                if (blade.transmissionColor) {
+                                    grassLayer.transmissionColor = new Vector4(blade.transmissionColor[0], blade.transmissionColor[1], blade.transmissionColor[2], 1);
+                                }
+                            }
+                            if (info.drawDistance !== undefined) {
+                                this.grassRenderer.setDrawDistance(layer, info.drawDistance);
+                            }
+                            if (info.farDensity !== undefined) {
+                                this.grassRenderer.setFarDensity(layer, info.farDensity);
+                            }
                         }
                     }
                 },
@@ -343,7 +472,9 @@ async function getTerrainSplatMapContent(terrain) {
                                 albedo: manager.getAssetId(material.getDetailMap(i)) ?? '',
                                 normal: manager.getAssetId(material.getDetailNormalMap(i)) ?? '',
                                 roughness: material.getDetailMapRoughness(i),
-                                uvscale: material.getDetailMapUVScale(i)
+                                uvscale: material.getDetailMapUVScale(i),
+                                hexTiling: material.getDetailMapHexTiling(i),
+                                hexParams: material.getDetailMapHexParams(i)
                             });
                         }
                         value.object[0] = new JSONArray(null, data);
@@ -366,7 +497,7 @@ async function getTerrainSplatMapContent(terrain) {
                                 try {
                                     tex = await manager.fetchTexture(info.albedo);
                                 } catch (err) {
-                                    console.error(`Load asset failed: ${value.str[0]}: ${err}`);
+                                    console.error(`Load asset failed: ${info.albedo}: ${err}`);
                                     tex = null;
                                 }
                                 if (tex?.isTexture2D()) {
@@ -380,19 +511,27 @@ async function getTerrainSplatMapContent(terrain) {
                             } else {
                                 let tex;
                                 try {
-                                    tex = await manager.fetchTexture(info.normal);
+                                    // Normal maps hold vectors, not colors: loaded as sRGB, 0.5 would decode to 0.21
+                                    // and tilt every normal (the editor picks them with linearColorSpace too)
+                                    tex = await manager.fetchTexture(info.normal, {
+                                        linearColorSpace: true
+                                    });
                                 } catch (err) {
-                                    console.error(`Load asset failed: ${value.str[0]}: ${err}`);
+                                    console.error(`Load asset failed: ${info.normal}: ${err}`);
                                     tex = null;
                                 }
                                 if (tex?.isTexture2D()) {
-                                    material.setDetailMap(i, tex);
+                                    material.setDetailNormalMap(i, tex);
                                 } else {
                                     console.error('Invalid texture type');
                                 }
                             }
                             material.setDetailMapRoughness(i, info.roughness ?? 1);
                             material.setDetailMapUVScale(i, info.uvscale ?? 100);
+                            if (info.hexParams) {
+                                material.setDetailMapHexParams(i, info.hexParams[0], info.hexParams[1], info.hexParams[2]);
+                            }
+                            material.setDetailMapHexTiling(i, !!info.hexTiling);
                         }
                     }
                 },
@@ -431,6 +570,7 @@ async function getTerrainSplatMapContent(terrain) {
                                 const content = new Uint8Array(data, 3 * 4 + i * width * height * 4, width * height * 4);
                                 splatMap.update(content, 0, 0, i, width, height, 1);
                             }
+                            this.invalidateRuntimeVirtualTexture();
                             this.splatMapAssetId = value.str[0];
                         }
                     }
@@ -510,24 +650,14 @@ async function getTerrainSplatMapContent(terrain) {
                             const width = dataView.getUint32(0, true);
                             const height = dataView.getUint32(4, true);
                             const heightMap = this.createHeightMapTexture(width, height);
-                            if (heightMap.format !== 'r16f') {
-                                if (heightMap.format === 'rgba16f') {
-                                    // WebGL1 uses rgba16f for height map, so we need to convert
-                                    const rgbaData = new Uint16Array(width * height * 4);
-                                    const rData = new Uint16Array(data, 8);
-                                    for(let i = 0; i < width * height; i++){
-                                        rgbaData[i * 4 + 0] = rData[i];
-                                    }
-                                    heightMap.update(rgbaData, 0, 0, width, height);
-                                } else {
-                                    throw new Error(`Unsupported height map format: ${heightMap.format}`);
-                                }
-                            } else {
-                                heightMap.update(new Uint16Array(data, 8), 0, 0, width, height);
-                            }
+                            heightMap.update(new Uint16Array(data, 8), 0, 0, width, height);
                             this.heightMap = heightMap;
                             this.heightMapAssetId = value.str[0];
-                            this.updateBoundingBox();
+                            const heights = new Uint16Array(data, 8, width * height);
+                            // Known right away from the loaded data, no GPU read back needed
+                            this.setHeightRangeFromHalfData(heights);
+                            // Kept for CPU-side users such as physics colliders.
+                            this.setHeightData(heights, width, height);
                         }
                     }
                 }