A fast 2D and 3D game engine — TypeScript SDK, C++/WebAssembly core, visual editor. Ship one project to web, desktop, WeChat MiniGames, playable ads, and native Android / iOS.
TypeScript 2d-game-engine3d3d-game-engineandroidcppecsgame-editorgame-enginegamedeviostypescriptwebassemblywebglwebgpuwechat-minigame
fix(examples): Terrain & Water takes the compact grass with its leaf colour from the art
yhhd53f67b884cc
diff --git a/examples/terrain-water/assets/plants/models/grass-compact-bank/grass-compact-bank.esmesh b/examples/terrain-water/assets/plants/models/grass-compact-bank/grass-compact-bank.esmeshindex 7ee99f243..bd0e22b8b 100644Binary files a/examples/terrain-water/assets/plants/models/grass-compact-bank/grass-compact-bank.esmesh and b/examples/terrain-water/assets/plants/models/grass-compact-bank/grass-compact-bank.esmesh differdiff --git a/examples/terrain-water/assets/plants/models/grass-compact-bank/lod1/grass-compact-bank.esmesh b/examples/terrain-water/assets/plants/models/grass-compact-bank/lod1/grass-compact-bank.esmeshindex 8cc7564db..07464aaed 100644Binary files a/examples/terrain-water/assets/plants/models/grass-compact-bank/lod1/grass-compact-bank.esmesh and b/examples/terrain-water/assets/plants/models/grass-compact-bank/lod1/grass-compact-bank.esmesh differdiff --git a/examples/terrain-water/assets/plants/models/grass-compact-meadow/grass-compact-meadow.esmesh b/examples/terrain-water/assets/plants/models/grass-compact-meadow/grass-compact-meadow.esmeshindex cb6589fc3..85bc62c7e 100644Binary files a/examples/terrain-water/assets/plants/models/grass-compact-meadow/grass-compact-meadow.esmesh and b/examples/terrain-water/assets/plants/models/grass-compact-meadow/grass-compact-meadow.esmesh differdiff --git a/examples/terrain-water/assets/plants/models/grass-compact-meadow/lod1/grass-compact-meadow.esmesh b/examples/terrain-water/assets/plants/models/grass-compact-meadow/lod1/grass-compact-meadow.esmeshindex f34fddb25..4d633a15f 100644Binary files a/examples/terrain-water/assets/plants/models/grass-compact-meadow/lod1/grass-compact-meadow.esmesh and b/examples/terrain-water/assets/plants/models/grass-compact-meadow/lod1/grass-compact-meadow.esmesh differdiff --git a/examples/terrain-water/assets/plants/models/grass-compact-short/grass-compact-short.esmesh b/examples/terrain-water/assets/plants/models/grass-compact-short/grass-compact-short.esmeshindex e0989d068..34d82ed60 100644Binary files a/examples/terrain-water/assets/plants/models/grass-compact-short/grass-compact-short.esmesh and b/examples/terrain-water/assets/plants/models/grass-compact-short/grass-compact-short.esmesh differdiff --git a/examples/terrain-water/assets/plants/models/grass-compact-short/lod1/grass-compact-short.esmesh b/examples/terrain-water/assets/plants/models/grass-compact-short/lod1/grass-compact-short.esmeshindex b86830aa0..fa60e4c03 100644Binary files a/examples/terrain-water/assets/plants/models/grass-compact-short/lod1/grass-compact-short.esmesh and b/examples/terrain-water/assets/plants/models/grass-compact-short/lod1/grass-compact-short.esmesh differdiff --git a/examples/terrain-water/assets/worlds/plants.esworld b/examples/terrain-water/assets/worlds/plants.esworldindex 9ed1506d6..a8b4410f2 100644--- a/examples/terrain-water/assets/worlds/plants.esworld+++ b/examples/terrain-water/assets/worlds/plants.esworld@@ -1001,9 +1001,9 @@"material": "assets/plants/models/grass-compact-short/grass-compact-short_m0.esmaterial","texture": "","tint": [- 0.18400000000000002,- 0.328,- 0.044800000000000006,+ 1,+ 1,+ 1,1],"opaque": true@@ -1031,19 +1031,19 @@"farKeep": 0.25,"tints": [[- 1,- 1,- 1+ 1.5,+ 1.5,+ 1.5],[- 1.07,- 1.02,- 0.88+ 1.6,+ 1.53,+ 1.32],[- 0.91,- 0.97,- 0.95+ 1.37,+ 1.46,+ 1.43]],"tintScale": 1300,@@ -1057,9 +1057,9 @@"material": "assets/plants/models/grass-compact-meadow/grass-compact-meadow_m0.esmaterial","texture": "","tint": [- 0.23199999999999998,- 0.376,- 0.0608,+ 1,+ 1,+ 1,1],"opaque": true@@ -1087,19 +1087,19 @@"farKeep": 0.25,"tints": [[- 1,- 1,- 1+ 1.5,+ 1.5,+ 1.5],[- 1.07,- 1.02,- 0.88+ 1.6,+ 1.53,+ 1.32],[- 0.91,- 0.97,- 0.95+ 1.37,+ 1.46,+ 1.43]],"tintScale": 1300,@@ -1113,9 +1113,9 @@"material": "assets/plants/models/grass-compact-bank/grass-compact-bank_m0.esmaterial","texture": "","tint": [- 0.144,- 0.296,- 0.0512,+ 1,+ 1,+ 1,1],"opaque": true@@ -1143,19 +1143,19 @@"farKeep": 0.3,"tints": [[- 1,- 1,- 1+ 1.5,+ 1.5,+ 1.5],[- 1.07,- 1.02,- 0.88+ 1.6,+ 1.53,+ 1.32],[- 0.91,- 0.97,- 0.95+ 1.37,+ 1.46,+ 1.43]],"tintScale": 1300,diff --git a/examples/terrain-water/tools/plants.mjs b/examples/terrain-water/tools/plants.mjsindex d40b2bd6e..d88085295 100644--- a/examples/terrain-water/tools/plants.mjs+++ b/examples/terrain-water/tools/plants.mjs@@ -31,12 +31,6 @@ function partsOf(project, file) {const SOFT_CARDS = 0.85;const SOFT_GROUND = 0.6;-/**- * The leaf colour of the compact grasses (grass-catalog.json's baseLinearRGB). The art says it is in COLOR_0, but the delivered GLBs carry white- * there, so until that is re-exported it is the part's tint, a little lifted (1.6) for the scene's light.- */-const GRASS_BASE = { 'grass-compact-short': [0.115, 0.205, 0.028], 'grass-compact-meadow': [0.145, 0.235, 0.038], 'grass-compact-bank': [0.09, 0.185, 0.032] };-const asPart = (d, lod1Mesh = '') => ({mesh: d.mesh, lod1Mesh, material: d.material ?? '', texture: d.texture ?? '',tint: [d.color?.r ?? 1, d.color?.g ?? 1, d.color?.b ?? 1, d.color?.a ?? 1], opaque: d.opaque !== false,@@ -51,7 +45,8 @@ const TINTS = {birch: [[0.94, 1, 0.93], [1, 1, 1], [1.04, 1.04, 0.9]],willow: [[0.9, 1, 1.03], [1, 1, 1], [1.05, 1, 0.94]],shrub: [[0.94, 1, 0.92], [1, 1, 1], [1.08, 1.03, 0.9]],- grass: [[1, 1, 1], [1.07, 1.02, 0.88], [0.91, 0.97, 0.95]],+ // The groundcover's variants (warm green, sunlit olive, sheltered green), lifted by 1.5: its leaf colours are authored dark, for a scene lit from above.+ grass: [[1.5, 1.5, 1.5], [1.6, 1.53, 1.32], [1.37, 1.46, 1.43]],beech: [[0.94, 1, 0.92], [1, 1, 1], [1.08, 0.97, 0.86]],conifer: [[0.88, 0.96, 0.92], [1, 1, 1], [1.04, 1.03, 0.91]],fern: [[0.91, 0.98, 0.92], [1, 1, 1], [1.08, 1.03, 0.87]],@@ -110,10 +105,9 @@ function plants(project) {const cover = COVER[name];// Ground cover: the cheaper mesh stands for it far off, thinned; trees: the art's cards.// The art's cards where it made them; ground cover with none (a flower) stands in as its own cheaper mesh, thinned.- const based = (part, prefab) => GRASS_BASE[prefab] ? { ...part, tint: part.tint.map((c, i) => (i < 3 ? c * GRASS_BASE[prefab][i] * 1.6 : c)) } : part;const far = cards.length ? cards.map((d) => ({ ...asPart(d), soft: cover ? SOFT_GROUND : SOFT_CARDS })) : cover ? (cheaper ? near : parts).map((d) => asPart(d)) : [];out[name] = {- parts: parts.map((d, j) => based(asPart(d, cheaper ? near[j].mesh : ''), k.prefab)),+ parts: parts.map((d, j) => asPart(d, cheaper ? near[j].mesh : '')),lodDistance: cheaper ? k.lod * M : 0, drawDistance: k.draw * M,far, farDistance: far.length ? (cover?.far ?? k.far ?? 0) * M : 0,...(cover ? { farKeep: cover.keep } : {}),diff --git a/tools/releaseNotes.mjs b/tools/releaseNotes.mjsindex 46bdd6865..497e8a14f 100644--- a/tools/releaseNotes.mjs+++ b/tools/releaseNotes.mjs@@ -2864,6 +2864,8 @@ export const NOTED = {{"note":"Clouds drawn from a coverage picture."},"fix(examples): Terrain & Water has a thin cloud layer, so its masked clouds do not streak":{"note":"Clouds drawn from a coverage picture."},+ "fix(examples): Terrain & Water takes the compact grass with its leaf colour from the art":+ {"note":"A generated world's plants."},"feat(water): two tiled, scrolling detail normal maps give the surface its sparkle":{"note":"Sparkle on the water."},"fix(lod): a LODGroup with only a cull size is no longer ignored":