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
chore(examples): Bistro under San Giuseppe Bridge's blue hour, and a bigger window for the hero shot
yhh90ac2175b4d7
diff --git a/.github/workflows/editor-acceptance.yml b/.github/workflows/editor-acceptance.ymlindex 2b7710401..c7b410d2b 100644--- a/.github/workflows/editor-acceptance.yml+++ b/.github/workflows/editor-acceptance.yml@@ -26,8 +26,9 @@ jobs:runs-on: ubuntu-latesttimeout-minutes: 20env:- ESTELLA_WIN_W: ${{ contains(inputs.checks, 'docs-hero') && '1900' || '1480' }}- ESTELLA_WIN_H: ${{ contains(inputs.checks, 'docs-hero') && '1060' || '920' }}+ XVFB_SCREEN: ${{ contains(inputs.checks, 'docs-hero') && '2560x1600x24' || '1920x1080x24' }}+ ESTELLA_WIN_W: ${{ contains(inputs.checks, 'docs-hero') && '2540' || '1480' }}+ ESTELLA_WIN_H: ${{ contains(inputs.checks, 'docs-hero') && '1500' || '920' }}steps:- uses: actions/checkout@v7- uses: ./.github/actions/editor-checkout@@ -69,7 +70,7 @@ jobs:ESTELLA_SECRETS_PLAINTEXT: '1'run: |read -r -a names <<< "$CHECK_NAMES"- xvfb-run -a --server-args="-screen 0 1920x1080x24" node scripts/editor-checks/run.mjs "${names[@]}"+ xvfb-run -a --server-args="-screen 0 ${XVFB_SCREEN}" node scripts/editor-checks/run.mjs "${names[@]}"- name: Keep the actual framesif: always()uses: actions/upload-artifact@v7diff --git a/desktop b/desktopindex b31e42dfc..f60a28edb 160000--- a/desktop+++ b/desktop@@ -1 +1 @@-Subproject commit b31e42dfcd4f2a4ef2d7e289b5d7600f9f513cd2+Subproject commit f60a28edb81ac979c0ca7c8f1b3e0808277b7350diff --git a/examples/ASSETS.md b/examples/ASSETS.mdindex 9497e5746..58dca56ca 100644--- a/examples/ASSETS.md+++ b/examples/ASSETS.md@@ -43,7 +43,7 @@ Unlike the CC0 art above, CC BY requires credit; this section is it:The example is a **modified** copy: the FBX was imported with the engine's own importer, cut to thepieces within 25 m of the camera's view, and its textures were resized to 1024 and re-encoded. The sky-is Poly Haven's *The Sky Is On Fire* (CC0, credited above).+is *San Giuseppe Bridge* by Greg Zaal, [Poly Haven](https://polyhaven.com/a/san_giuseppe_bridge) (CC0), which ships in the Bistro package.## Spinediff --git a/examples/bistro/assets/env/san_giuseppe_bridge_4k.esenv b/examples/bistro/assets/env/san_giuseppe_bridge_4k.esenvnew file mode 100644index 000000000..9fe88a163--- /dev/null+++ b/examples/bistro/assets/env/san_giuseppe_bridge_4k.esenv@@ -0,0 +1,78 @@+{+ "version": 1,+ "irradiance": [+ 2.98979115486145,+ 2.617277145385742,+ 2.140357732772827,+ 1.0691258907318115,+ 1.1134757995605469,+ 1.0947911739349365,+ 1.3642247915267944,+ 1.338856816291809,+ 1.0591824054718018,+ -0.9780336022377014,+ -0.9841182827949524,+ -0.7833818793296814,+ -0.4179860055446625,+ -0.39594191312789917,+ -0.312364399433136,+ 0.6404423117637634,+ 0.5943056344985962,+ 0.4584547281265259,+ 0.26613524556159973,+ 0.2219877988100052,+ 0.1353064328432083,+ -0.7445751428604126,+ -0.6237539649009705,+ -0.4300912916660309,+ 0.0500614196062088,+ -0.00019737247203011066,+ -0.05133548006415367+ ],+ "specular": "san_giuseppe_bridge_4k_env.png",+ "faceSize": 128,+ "mipCount": 5,+ "maxRange": 8,+ "sun": {+ "direction": [+ -0.5144253135319964,+ 0.47903942640690206,+ 0.7112579171757976+ ],+ "color": [+ 1.685346385905261,+ 1.3774053244149225,+ 0.8294634082039178+ ],+ "skyIrradiance": [+ 1.5820122957229614,+ 1.492136001586914,+ 1.5170319080352783,+ 0.25614574551582336,+ 0.42661261558532715,+ 0.6920796036720276,+ 0.1630638986825943,+ 0.34415730834007263,+ 0.4583764970302582,+ -0.09219774603843689,+ -0.2601028382778168,+ -0.35533806681632996,+ -0.06642752885818481,+ -0.11098222434520721,+ -0.14170163869857788,+ 0.15429536998271942,+ 0.19444455206394196,+ 0.21740703284740448,+ 0.047135040163993835,+ 0.0460929200053215,+ 0.026664284989237785,+ -0.22068920731544495,+ -0.19556699693202972,+ -0.17169617116451263,+ 0.024856390431523323,+ -0.02077525481581688,+ -0.06373266875743866+ ]+ },+ "sky": "san_giuseppe_bridge_4k_sky.png"+}diff --git a/examples/bistro/assets/env/the_sky_is_on_fire_2k.esenv.meta b/examples/bistro/assets/env/san_giuseppe_bridge_4k.esenv.metasimilarity index 56%rename from examples/bistro/assets/env/the_sky_is_on_fire_2k.esenv.metarename to examples/bistro/assets/env/san_giuseppe_bridge_4k.esenv.metaindex 079be2550..4e1313ae0 100644--- a/examples/bistro/assets/env/the_sky_is_on_fire_2k.esenv.meta+++ b/examples/bistro/assets/env/san_giuseppe_bridge_4k.esenv.meta@@ -1,5 +1,5 @@{- "uuid": "90f432fd-887d-4df3-8ed0-9c3d0b2a38f0",+ "uuid": "d92b4c0b-c4ec-4573-a5f3-fe23c19c3e9b","version": "2.0","type": "environment","importer": {}diff --git a/examples/bistro/assets/env/san_giuseppe_bridge_4k_env.png b/examples/bistro/assets/env/san_giuseppe_bridge_4k_env.pngnew file mode 100644index 000000000..557657c7cBinary files /dev/null and b/examples/bistro/assets/env/san_giuseppe_bridge_4k_env.png differdiff --git a/examples/bistro/assets/env/the_sky_is_on_fire_2k_env.png.meta b/examples/bistro/assets/env/san_giuseppe_bridge_4k_env.png.metasimilarity index 90%rename from examples/bistro/assets/env/the_sky_is_on_fire_2k_env.png.metarename to examples/bistro/assets/env/san_giuseppe_bridge_4k_env.png.metaindex 4479f11fb..3e5a51ecc 100644--- a/examples/bistro/assets/env/the_sky_is_on_fire_2k_env.png.meta+++ b/examples/bistro/assets/env/san_giuseppe_bridge_4k_env.png.meta@@ -1,5 +1,5 @@{- "uuid": "40827ce1-d599-4a62-87ec-f18b21f7734f",+ "uuid": "a6cc3fb6-db47-4ec9-b3bc-8204f0cf29ba","version": "2.0","type": "texture","importer": {diff --git a/examples/bistro/assets/env/san_giuseppe_bridge_4k_sky.png b/examples/bistro/assets/env/san_giuseppe_bridge_4k_sky.pngnew file mode 100644index 000000000..dc3a8dbd1Binary files /dev/null and b/examples/bistro/assets/env/san_giuseppe_bridge_4k_sky.png differdiff --git a/examples/bistro/assets/env/the_sky_is_on_fire_2k_sky.png.meta b/examples/bistro/assets/env/san_giuseppe_bridge_4k_sky.png.metasimilarity index 90%rename from examples/bistro/assets/env/the_sky_is_on_fire_2k_sky.png.metarename to examples/bistro/assets/env/san_giuseppe_bridge_4k_sky.png.metaindex 1cf76edf4..f397af131 100644--- a/examples/bistro/assets/env/the_sky_is_on_fire_2k_sky.png.meta+++ b/examples/bistro/assets/env/san_giuseppe_bridge_4k_sky.png.meta@@ -1,5 +1,5 @@{- "uuid": "14c1cd46-f4f1-42ab-a059-02eab54cd92e",+ "uuid": "2b6b3eda-a58e-4b59-8924-bad9d40ff086","version": "2.0","type": "texture","importer": {diff --git a/examples/bistro/assets/env/the_sky_is_on_fire_2k.esenv b/examples/bistro/assets/env/the_sky_is_on_fire_2k.esenvdeleted file mode 100644index 1011a19fa..000000000--- a/examples/bistro/assets/env/the_sky_is_on_fire_2k.esenv+++ /dev/null@@ -1,37 +0,0 @@-{- "version": 1,- "irradiance": [- 2.15539813041687,- 1.4798693656921387,- 1.848961591720581,- 0.8251150250434875,- 0.6868517994880676,- 1.0232588052749634,- 0.5147609710693359,- 0.22273914515972137,- 0.191864013671875,- -0.49043944478034973,- -0.20306767523288727,- -0.10834229737520218,- -0.021737204864621162,- -0.006325060501694679,- 0.0011044630082324147,- 0.08923711627721786,- 0.0465264655649662,- 0.0505952313542366,- 0.06969745457172394,- 0.025443293154239655,- 0.008670234121382236,- -0.13344353437423706,- -0.0051087974570691586,- 0.038855601102113724,- 0.1434316784143448,- 0.020210130140185356,- -0.0623050332069397- ],- "specular": "the_sky_is_on_fire_2k_env.png",- "faceSize": 128,- "mipCount": 5,- "maxRange": 8,- "sky": "the_sky_is_on_fire_2k_sky.png"-}diff --git a/examples/bistro/assets/env/the_sky_is_on_fire_2k.hdr b/examples/bistro/assets/env/the_sky_is_on_fire_2k.hdrdeleted file mode 100644index e669310db..000000000Binary files a/examples/bistro/assets/env/the_sky_is_on_fire_2k.hdr and /dev/null differdiff --git a/examples/bistro/assets/env/the_sky_is_on_fire_2k.hdr.meta b/examples/bistro/assets/env/the_sky_is_on_fire_2k.hdr.metadeleted file mode 100644index d430cd9aa..000000000--- a/examples/bistro/assets/env/the_sky_is_on_fire_2k.hdr.meta+++ /dev/null@@ -1,9 +0,0 @@-{- "uuid": "5cccc15b-6798-44f4-9388-91270e4e3833",- "version": "2.0",- "type": "panorama",- "importer": {- "faceSize": 128,- "skyWidth": 2048- }-}diff --git a/examples/bistro/assets/env/the_sky_is_on_fire_2k_env.png b/examples/bistro/assets/env/the_sky_is_on_fire_2k_env.pngdeleted file mode 100644index b1ab7805c..000000000Binary files a/examples/bistro/assets/env/the_sky_is_on_fire_2k_env.png and /dev/null differdiff --git a/examples/bistro/assets/env/the_sky_is_on_fire_2k_sky.png b/examples/bistro/assets/env/the_sky_is_on_fire_2k_sky.pngdeleted file mode 100644index df27aaeb7..000000000Binary files a/examples/bistro/assets/env/the_sky_is_on_fire_2k_sky.png and /dev/null differdiff --git a/examples/bistro/assets/scenes/main.esscene b/examples/bistro/assets/scenes/main.essceneindex 5aabd0cb5..ccf7bc102 100644--- a/examples/bistro/assets/scenes/main.esscene+++ b/examples/bistro/assets/scenes/main.esscene@@ -57,7 +57,7 @@"type": "bloom","enabled": true,"uniforms": {- "u_threshold": 0.75,+ "u_threshold": 0.85,"u_intensity": 1.1,"u_radius": 1.5}@@ -67,9 +67,9 @@"enabled": true,"uniforms": {"u_exposure": 0.05,- "u_contrast": 1.1,+ "u_contrast": 1.08,"u_saturation": 1,- "u_temperature": 0.02,+ "u_temperature": 0,"u_tint": 0}},@@ -77,7 +77,7 @@"type": "tonemap","enabled": true,"uniforms": {- "u_exposure": 0.15+ "u_exposure": 0}},{@@ -128,12 +128,12 @@"data": {"type": 1,"color": {- "r": 0.62,- "g": 0.68,- "b": 0.95,+ "r": 0.78,+ "g": 0.74,+ "b": 0.92,"a": 1},- "intensity": 0.7,+ "intensity": 0.55,"enabled": true,"meshShadows": true,"shadowExtent": 2600,@@ -170,9 +170,9 @@"b": 1,"a": 1},- "intensity": 0.5,+ "intensity": 0.75,"enabled": true,- "environment": "assets/env/the_sky_is_on_fire_2k.esenv",+ "environment": "assets/env/san_giuseppe_bridge_4k.esenv","drawEnvironment": true}}diff --git a/examples/bistro/tools/build-scene.mjs b/examples/bistro/tools/build-scene.mjsindex 1c9080d06..9272e4582 100644--- a/examples/bistro/tools/build-scene.mjs+++ b/examples/bistro/tools/build-scene.mjs@@ -38,22 +38,22 @@ const entities = [{ type: 'Camera', data: { projectionType: 0, fov: 50, nearPlane: 10, farPlane: 30000, isActive: true, priority: 0 } },{ type: 'PostProcessVolume', data: { isGlobal: true, priority: 0, weight: 1, effects: [{ type: 'ssao', enabled: true, uniforms: { u_radius: 80, u_intensity: 1, u_bias: 0.12, u_power: 1.5 } },- { type: 'bloom', enabled: true, uniforms: { u_threshold: 0.75, u_intensity: 1.1, u_radius: 1.5 } },- { type: 'colorGrade', enabled: true, uniforms: { u_exposure: 0.05, u_contrast: 1.1, u_saturation: 1, u_temperature: 0.02, u_tint: 0 } },- { type: 'tonemap', enabled: true, uniforms: { u_exposure: 0.15 } },+ { type: 'bloom', enabled: true, uniforms: { u_threshold: 0.85, u_intensity: 1.1, u_radius: 1.5 } },+ { type: 'colorGrade', enabled: true, uniforms: { u_exposure: 0.05, u_contrast: 1.08, u_saturation: 1, u_temperature: 0, u_tint: 0 } },+ { type: 'tonemap', enabled: true, uniforms: { u_exposure: 0 } },{ type: 'vignette', enabled: true, uniforms: { u_intensity: 0.35, u_softness: 0.6 } },{ type: 'fxaa', enabled: true, uniforms: { u_intensity: 1 } },] } },] },{ id: 1, name: 'Sun', parent: null, children: [], visible: true, components: [tr({ x: 0, y: 0, z: 0 }, aim({ x: -0.4, y: -0.28, z: 0.87 })),- { type: 'Light', data: { type: 1, color: { r: 0.62, g: 0.68, b: 0.95, a: 1 }, intensity: 0.7, enabled: true,+ { type: 'Light', data: { type: 1, color: { r: 0.78, g: 0.74, b: 0.92, a: 1 }, intensity: 0.55, enabled: true,meshShadows: true, shadowExtent: 2600, shadowStrength: 0.85, shadowSoftness: 0.3 } },] },{ id: 2, name: 'Sky', parent: null, children: [], visible: true, components: [tr({ x: 0, y: 0, z: 0 }),- { type: 'Light', data: { type: 2, color: { r: 1, g: 1, b: 1, a: 1 }, intensity: 0.5, enabled: true,- environment: 'assets/env/the_sky_is_on_fire_2k.esenv', drawEnvironment: true } },+ { type: 'Light', data: { type: 2, color: { r: 1, g: 1, b: 1, a: 1 }, intensity: 0.75, enabled: true,+ environment: 'assets/env/san_giuseppe_bridge_4k.esenv', drawEnvironment: true } },] },// One centimetre of the source is one engine unit, which the import's own 0.016 turns back into 1/62.5.{ id: 3, parent: null, prefab: 'assets/models/BistroExterior.esprefab', overrides: [