Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a8551b5c28 | |||
| f443f0a94a |
@@ -22,7 +22,39 @@ jobs:
|
|||||||
if: inputs.os == 'macos' || inputs.os == 'both'
|
if: inputs.os == 'macos' || inputs.os == 'both'
|
||||||
runs-on: macos-latest
|
runs-on: macos-latest
|
||||||
steps:
|
steps:
|
||||||
|
- name: Проверка релиза
|
||||||
|
env:
|
||||||
|
TOKEN: ${{ secrets.RELEASE_TOKEN || gitea.token }}
|
||||||
|
API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
|
||||||
|
TAG: ${{ inputs.tag }}
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
if ! [[ "$TAG" =~ ^build-[0-9]+$ ]]; then echo "::error::тег '$TAG' не похож на build-N"; exit 1; fi
|
||||||
|
REL_JSON=$(mktemp)
|
||||||
|
CODE=$(curl -s -o "$REL_JSON" -w '%{http_code}' -H "Authorization: token $TOKEN" "$API/releases/tags/$TAG")
|
||||||
|
if [ "$CODE" != "200" ]; then echo "::error::релиза с тегом $TAG нет (HTTP $CODE): сначала дождись сборки build.yml на main"; exit 1; fi
|
||||||
|
python3 - "$TAG" "$REL_JSON" <<'PY'
|
||||||
|
import json, os, sys
|
||||||
|
tag, path = sys.argv[1], sys.argv[2]
|
||||||
|
r = json.load(open(path))
|
||||||
|
assets = [a.get('name') for a in (r.get('assets') or [])]
|
||||||
|
if r.get('tag_name') != tag or r.get('name') != tag or 'airdef.hmod' not in assets:
|
||||||
|
print('::error::релиз %s не создан build.yml (нужны имя = тег и вложение airdef.hmod): чужой релиз не трогаем' % tag)
|
||||||
|
sys.exit(1)
|
||||||
|
with open(os.environ['GITHUB_ENV'], 'a') as f:
|
||||||
|
f.write('RELEASE_ID=%s\nRELEASE_SHA=%s\n' % (r['id'], r.get('target_commitish', '')))
|
||||||
|
PY
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
ref: refs/tags/${{ inputs.tag }}
|
||||||
|
- name: Проверка коммита
|
||||||
|
env:
|
||||||
|
TAG: ${{ inputs.tag }}
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
HEAD_SHA=$(git rev-parse HEAD)
|
||||||
|
if [[ "$RELEASE_SHA" =~ ^[0-9a-f]{40}$ ]] && [ "$HEAD_SHA" != "$RELEASE_SHA" ]; then echo "::error::тег $TAG указывает на $HEAD_SHA, а релиз создан из $RELEASE_SHA"; exit 1; fi
|
||||||
|
echo "собираю $TAG = $HEAD_SHA"
|
||||||
- name: Rust
|
- name: Rust
|
||||||
run: |
|
run: |
|
||||||
command -v cargo || curl -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
|
command -v cargo || curl -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
|
||||||
@@ -47,11 +79,10 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
TOKEN: ${{ secrets.RELEASE_TOKEN || gitea.token }}
|
TOKEN: ${{ secrets.RELEASE_TOKEN || gitea.token }}
|
||||||
API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
|
API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
|
||||||
TAG: ${{ inputs.tag }}
|
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
ID=$(curl -sf -H "Authorization: token $TOKEN" "$API/releases/tags/$TAG" | python3 -c 'import json,sys;print(json.load(sys.stdin)["id"])')
|
# RELEASE_ID взят в шаге «Проверка релиза» (релиз build-N, созданный build.yml)
|
||||||
curl -sf -X POST -H "Authorization: token $TOKEN" -F "attachment=@out/airdef-macos-arm64.tar.gz" "$API/releases/$ID/assets?name=airdef-macos-arm64.tar.gz" > /dev/null
|
curl -sf -X POST -H "Authorization: token $TOKEN" -F "attachment=@out/airdef-macos-arm64.tar.gz" "$API/releases/$RELEASE_ID/assets?name=airdef-macos-arm64.tar.gz" > /dev/null
|
||||||
|
|
||||||
game-windows:
|
game-windows:
|
||||||
if: inputs.os == 'windows' || inputs.os == 'both'
|
if: inputs.os == 'windows' || inputs.os == 'both'
|
||||||
@@ -60,7 +91,34 @@ jobs:
|
|||||||
run:
|
run:
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
steps:
|
steps:
|
||||||
|
- name: Проверка релиза
|
||||||
|
env:
|
||||||
|
TOKEN: ${{ secrets.RELEASE_TOKEN || gitea.token }}
|
||||||
|
API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
|
||||||
|
TAG: ${{ inputs.tag }}
|
||||||
|
run: |
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
if ($env:TAG -notmatch '^build-\d+$') { Write-Output "::error::тег '$env:TAG' не похож на build-N"; exit 1 }
|
||||||
|
$h = @{ Authorization = "token $env:TOKEN" }
|
||||||
|
try { $r = Invoke-RestMethod -Headers $h "$env:API/releases/tags/$env:TAG" }
|
||||||
|
catch { Write-Output "::error::релиза с тегом $env:TAG нет: сначала дождись сборки build.yml на main"; exit 1 }
|
||||||
|
$assets = @($r.assets | ForEach-Object { $_.name })
|
||||||
|
if ($r.tag_name -ne $env:TAG -or $r.name -ne $env:TAG -or ($assets -notcontains 'airdef.hmod')) {
|
||||||
|
Write-Output "::error::релиз $env:TAG не создан build.yml (нужны имя = тег и вложение airdef.hmod): чужой релиз не трогаем"; exit 1
|
||||||
|
}
|
||||||
|
"RELEASE_ID=$($r.id)" | Out-File -Append -Encoding utf8 $env:GITHUB_ENV
|
||||||
|
"RELEASE_SHA=$($r.target_commitish)" | Out-File -Append -Encoding utf8 $env:GITHUB_ENV
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
ref: refs/tags/${{ inputs.tag }}
|
||||||
|
- name: Проверка коммита
|
||||||
|
env:
|
||||||
|
TAG: ${{ inputs.tag }}
|
||||||
|
run: |
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
$head = git rev-parse HEAD
|
||||||
|
if ($env:RELEASE_SHA -match '^[0-9a-f]{40}$' -and $head -ne $env:RELEASE_SHA) { Write-Output "::error::тег $env:TAG указывает на $head, а релиз создан из $env:RELEASE_SHA"; exit 1 }
|
||||||
|
Write-Output "собираю $env:TAG = $head"
|
||||||
- name: Rust
|
- name: Rust
|
||||||
run: |
|
run: |
|
||||||
if (-not (Get-Command cargo -ErrorAction SilentlyContinue)) {
|
if (-not (Get-Command cargo -ErrorAction SilentlyContinue)) {
|
||||||
@@ -88,9 +146,7 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
TOKEN: ${{ secrets.RELEASE_TOKEN || gitea.token }}
|
TOKEN: ${{ secrets.RELEASE_TOKEN || gitea.token }}
|
||||||
API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
|
API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
|
||||||
TAG: ${{ inputs.tag }}
|
|
||||||
run: |
|
run: |
|
||||||
$h = @{ Authorization = "token $env:TOKEN" }
|
# RELEASE_ID взят в шаге «Проверка релиза» (релиз build-N, созданный build.yml)
|
||||||
$id = (Invoke-RestMethod -Headers $h "$env:API/releases/tags/$env:TAG").id
|
curl.exe -sf -X POST -H "Authorization: token $env:TOKEN" -F "attachment=@out\airdef-windows-x86_64.zip" "$env:API/releases/$env:RELEASE_ID/assets?name=airdef-windows-x86_64.zip"
|
||||||
curl.exe -sf -X POST -H "Authorization: token $env:TOKEN" -F "attachment=@out\airdef-windows-x86_64.zip" "$env:API/releases/$id/assets?name=airdef-windows-x86_64.zip"
|
|
||||||
|
|
||||||
|
|||||||
@@ -25,7 +25,39 @@ jobs:
|
|||||||
FREE=$(df --output=avail -BG / | tail -1 | tr -dc 0-9)
|
FREE=$(df --output=avail -BG / | tail -1 | tr -dc 0-9)
|
||||||
echo "свободно: ${FREE} ГБ"
|
echo "свободно: ${FREE} ГБ"
|
||||||
if [ "$FREE" -lt 15 ]; then echo "::error::на сервере свободно ${FREE} ГБ, нужно хотя бы 15: сборка игры забьёт диск и уронит Gitea"; exit 1; fi
|
if [ "$FREE" -lt 15 ]; then echo "::error::на сервере свободно ${FREE} ГБ, нужно хотя бы 15: сборка игры забьёт диск и уронит Gitea"; exit 1; fi
|
||||||
|
- name: Проверка релиза
|
||||||
|
env:
|
||||||
|
TOKEN: ${{ secrets.RELEASE_TOKEN || gitea.token }}
|
||||||
|
API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
|
||||||
|
TAG: ${{ inputs.tag }}
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
if ! [[ "$TAG" =~ ^build-[0-9]+$ ]]; then echo "::error::тег '$TAG' не похож на build-N"; exit 1; fi
|
||||||
|
REL_JSON=$(mktemp)
|
||||||
|
CODE=$(curl -s -o "$REL_JSON" -w '%{http_code}' -H "Authorization: token $TOKEN" "$API/releases/tags/$TAG")
|
||||||
|
if [ "$CODE" != "200" ]; then echo "::error::релиза с тегом $TAG нет (HTTP $CODE): сначала дождись сборки build.yml на main"; exit 1; fi
|
||||||
|
python3 - "$TAG" "$REL_JSON" <<'PY'
|
||||||
|
import json, os, sys
|
||||||
|
tag, path = sys.argv[1], sys.argv[2]
|
||||||
|
r = json.load(open(path))
|
||||||
|
assets = [a.get('name') for a in (r.get('assets') or [])]
|
||||||
|
if r.get('tag_name') != tag or r.get('name') != tag or 'airdef.hmod' not in assets:
|
||||||
|
print('::error::релиз %s не создан build.yml (нужны имя = тег и вложение airdef.hmod): чужой релиз не трогаем' % tag)
|
||||||
|
sys.exit(1)
|
||||||
|
with open(os.environ['GITHUB_ENV'], 'a') as f:
|
||||||
|
f.write('RELEASE_ID=%s\nRELEASE_SHA=%s\n' % (r['id'], r.get('target_commitish', '')))
|
||||||
|
PY
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
ref: refs/tags/${{ inputs.tag }}
|
||||||
|
- name: Проверка коммита
|
||||||
|
env:
|
||||||
|
TAG: ${{ inputs.tag }}
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
HEAD_SHA=$(git rev-parse HEAD)
|
||||||
|
if [[ "$RELEASE_SHA" =~ ^[0-9a-f]{40}$ ]] && [ "$HEAD_SHA" != "$RELEASE_SHA" ]; then echo "::error::тег $TAG указывает на $HEAD_SHA, а релиз создан из $RELEASE_SHA"; exit 1; fi
|
||||||
|
echo "собираю $TAG = $HEAD_SHA"
|
||||||
- name: Системные библиотеки
|
- name: Системные библиотеки
|
||||||
run: |
|
run: |
|
||||||
SUDO=$(command -v sudo || true)
|
SUDO=$(command -v sudo || true)
|
||||||
@@ -45,12 +77,11 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
TOKEN: ${{ secrets.RELEASE_TOKEN || gitea.token }}
|
TOKEN: ${{ secrets.RELEASE_TOKEN || gitea.token }}
|
||||||
API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
|
API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
|
||||||
TAG: ${{ inputs.tag }}
|
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
D=airdef-linux-x86_64
|
D=airdef-linux-x86_64
|
||||||
mkdir -p "$D" out
|
mkdir -p "$D" out
|
||||||
cp horizon/target/fast/horizon-client horizon/target/fast/horizon-ctl airdef-mod/target/horizon-mod/airdef.hmod dist/play.sh docs/INSTALL.md "$D/"
|
cp horizon/target/fast/horizon-client horizon/target/fast/horizon-ctl airdef-mod/target/horizon-mod/airdef.hmod dist/play.sh docs/INSTALL.md "$D/"
|
||||||
tar czf "out/$D.tar.gz" "$D"
|
tar czf "out/$D.tar.gz" "$D"
|
||||||
ID=$(curl -sf -H "Authorization: token $TOKEN" "$API/releases/tags/$TAG" | python3 -c 'import json,sys;print(json.load(sys.stdin)["id"])')
|
# RELEASE_ID взят в шаге «Проверка релиза» (релиз build-N, созданный build.yml)
|
||||||
curl -sf -X POST -H "Authorization: token $TOKEN" -F "attachment=@out/$D.tar.gz" "$API/releases/$ID/assets?name=$D.tar.gz" > /dev/null
|
curl -sf -X POST -H "Authorization: token $TOKEN" -F "attachment=@out/$D.tar.gz" "$API/releases/$RELEASE_ID/assets?name=$D.tar.gz" > /dev/null
|
||||||
|
|||||||
@@ -27,7 +27,9 @@ python3 tools/airdef.py play # запустить (аргументы игр
|
|||||||
CI: `.gitea/workflows/build.yml` на каждый пуш собирает только мод (`airdef.hmod`), а пуш в `main` публикует его
|
CI: `.gitea/workflows/build.yml` на каждый пуш собирает только мод (`airdef.hmod`), а пуш в `main` публикует его
|
||||||
релизом `build-N`. Игру-форк собирают вручную: `.gitea/workflows/game.yml` (Linux) и `.gitea/workflows/desktop.yml`
|
релизом `build-N`. Игру-форк собирают вручную: `.gitea/workflows/game.yml` (Linux) и `.gitea/workflows/desktop.yml`
|
||||||
(macOS и Windows, на раннерах с метками `macos-latest` / `windows-latest`); оба запускаются из Actions с тегом
|
(macOS и Windows, на раннерах с метками `macos-latest` / `windows-latest`); оба запускаются из Actions с тегом
|
||||||
готового релиза и дописывают свои архивы в него.
|
готового релиза `build-N`. Перед сборкой workflow проверяет, что такой релиз создан `build.yml` (имя релиза = тег,
|
||||||
|
есть `airdef.hmod`), иначе падает с ошибкой; затем выкачивает ровно коммит этого тега (а не ветку, с которой запущен),
|
||||||
|
сверяет его с коммитом релиза и дописывает архивы только в этот релиз.
|
||||||
|
|
||||||
## Как играть
|
## Как играть
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
From 3de7a6875140a107e28563cc44489b55f5794517 Mon Sep 17 00:00:00 2001
|
From 3de7a6875140a107e28563cc44489b55f5794517 Mon Sep 17 00:00:00 2001
|
||||||
From: chexit <chexit@duck.com>
|
From: chexit <chexit@duck.com>
|
||||||
Date: Wed, 28 Oct 2026 12:37:45 +0300
|
Date: Wed, 28 Oct 2026 12:37:45 +0300
|
||||||
Subject: [PATCH 01/21] Mod API (AirDef fork): world models, client particles,
|
Subject: [PATCH 01/22] Mod API (AirDef fork): world models, client particles,
|
||||||
sounds, ground heights
|
sounds, ground heights
|
||||||
|
|
||||||
render.set-models draws block models with an interpolated pose per id;
|
render.set-models draws block models with an interpolated pose per id;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
From a6d64e6415bf618539af464e521091e72b72d72f Mon Sep 17 00:00:00 2001
|
From a6d64e6415bf618539af464e521091e72b72d72f Mon Sep 17 00:00:00 2001
|
||||||
From: chexit <chexit@duck.com>
|
From: chexit <chexit@duck.com>
|
||||||
Date: Wed, 28 Oct 2026 12:39:45 +0300
|
Date: Wed, 28 Oct 2026 12:39:45 +0300
|
||||||
Subject: [PATCH 02/21] cargo-horizon-mod: report particles and sounds
|
Subject: [PATCH 02/22] cargo-horizon-mod: report particles and sounds
|
||||||
|
|
||||||
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
From ee79b3562feebe51959a01f1585a9e85bd53ccb5 Mon Sep 17 00:00:00 2001
|
From ee79b3562feebe51959a01f1585a9e85bd53ccb5 Mon Sep 17 00:00:00 2001
|
||||||
From: chexit <chexit@duck.com>
|
From: chexit <chexit@duck.com>
|
||||||
Date: Wed, 28 Oct 2026 13:33:10 +0300
|
Date: Wed, 28 Oct 2026 13:33:10 +0300
|
||||||
Subject: [PATCH 03/21] Mod API (AirDef fork): full-screen post pass for mods
|
Subject: [PATCH 03/22] Mod API (AirDef fork): full-screen post pass for mods
|
||||||
|
|
||||||
render.set-post compiles a mod's WGSL after a prelude (camera matrices,
|
render.set-post compiles a mod's WGSL after a prelude (camera matrices,
|
||||||
time, 256 vec4 of params, the world's colour and depth) and runs it after
|
time, 256 vec4 of params, the world's colour and depth) and runs it after
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
From 2b137dbbedd540daeebc7f5e387847aeb56a1355 Mon Sep 17 00:00:00 2001
|
From 2b137dbbedd540daeebc7f5e387847aeb56a1355 Mon Sep 17 00:00:00 2001
|
||||||
From: chexit <chexit@duck.com>
|
From: chexit <chexit@duck.com>
|
||||||
Date: Wed, 28 Oct 2026 22:09:30 +0300
|
Date: Wed, 28 Oct 2026 22:09:30 +0300
|
||||||
Subject: [PATCH 04/21] Mod models: draw far models as scaled impostors past
|
Subject: [PATCH 04/22] Mod models: draw far models as scaled impostors past
|
||||||
the far plane, cull at 4096
|
the far plane, cull at 4096
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
From c8ebca6e0af68630e65211844b34d25c5b985c03 Mon Sep 17 00:00:00 2001
|
From c8ebca6e0af68630e65211844b34d25c5b985c03 Mon Sep 17 00:00:00 2001
|
||||||
From: chexit <chexit@duck.com>
|
From: chexit <chexit@duck.com>
|
||||||
Date: Wed, 28 Oct 2026 22:31:00 +0300
|
Date: Wed, 28 Oct 2026 22:31:00 +0300
|
||||||
Subject: [PATCH 05/21] Mod cameras: render.set-views draws the world from
|
Subject: [PATCH 05/22] Mod cameras: render.set-views draws the world from
|
||||||
other points into pictures that HUD view shapes show (API level 9)
|
other points into pictures that HUD view shapes show (API level 9)
|
||||||
|
|
||||||
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
From 8d2261fc4f8072c32e454139cfea7a8c0cd9d664 Mon Sep 17 00:00:00 2001
|
From 8d2261fc4f8072c32e454139cfea7a8c0cd9d664 Mon Sep 17 00:00:00 2001
|
||||||
From: chexit <chexit@duck.com>
|
From: chexit <chexit@duck.com>
|
||||||
Date: Wed, 28 Oct 2026 23:08:21 +0300
|
Date: Wed, 28 Oct 2026 23:08:21 +0300
|
||||||
Subject: [PATCH 06/21] Mods: more fuel per tick and per event (AirDef plans
|
Subject: [PATCH 06/22] Mods: more fuel per tick and per event (AirDef plans
|
||||||
raids)
|
raids)
|
||||||
|
|
||||||
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
From 6c548de34def8e4a624d734243418090798bd16a Mon Sep 17 00:00:00 2001
|
From 6c548de34def8e4a624d734243418090798bd16a Mon Sep 17 00:00:00 2001
|
||||||
From: chexit <chexit@duck.com>
|
From: chexit <chexit@duck.com>
|
||||||
Date: Wed, 28 Oct 2026 23:25:29 +0300
|
Date: Wed, 28 Oct 2026 23:25:29 +0300
|
||||||
Subject: [PATCH 07/21] Mod cameras up to 1920x1080 (full-screen replays)
|
Subject: [PATCH 07/22] Mod cameras up to 1920x1080 (full-screen replays)
|
||||||
|
|
||||||
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
From 9b9e93269d67401cc620567a884d5ce97f68d76e Mon Sep 17 00:00:00 2001
|
From 9b9e93269d67401cc620567a884d5ce97f68d76e Mon Sep 17 00:00:00 2001
|
||||||
From: chexit <chexit@duck.com>
|
From: chexit <chexit@duck.com>
|
||||||
Date: Thu, 29 Oct 2026 11:15:11 +0300
|
Date: Thu, 29 Oct 2026 11:15:11 +0300
|
||||||
Subject: [PATCH 08/21] Mod cameras: distant terrain tiles, fog measured from
|
Subject: [PATCH 08/22] Mod cameras: distant terrain tiles, fog measured from
|
||||||
the camera, no impostors while one is shown
|
the camera, no impostors while one is shown
|
||||||
|
|
||||||
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
From 065d9fa02966238a5bd9ff460392a1a809db0b11 Mon Sep 17 00:00:00 2001
|
From 065d9fa02966238a5bd9ff460392a1a809db0b11 Mon Sep 17 00:00:00 2001
|
||||||
From: chexit <chexit@duck.com>
|
From: chexit <chexit@duck.com>
|
||||||
Date: Thu, 29 Oct 2026 11:25:45 +0300
|
Date: Thu, 29 Oct 2026 11:25:45 +0300
|
||||||
Subject: [PATCH 09/21] Mods: game.world-id, so mods keep state per world (API
|
Subject: [PATCH 09/22] Mods: game.world-id, so mods keep state per world (API
|
||||||
level 9)
|
level 9)
|
||||||
|
|
||||||
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
From 1bf28135fd9a31f837323dc3a8d81ed73343d816 Mon Sep 17 00:00:00 2001
|
From 1bf28135fd9a31f837323dc3a8d81ed73343d816 Mon Sep 17 00:00:00 2001
|
||||||
From: chexit <chexit@duck.com>
|
From: chexit <chexit@duck.com>
|
||||||
Date: Thu, 29 Oct 2026 12:01:08 +0300
|
Date: Thu, 29 Oct 2026 12:01:08 +0300
|
||||||
Subject: [PATCH 10/21] cargo-horizon-mod: trial runs behind feature full, so a
|
Subject: [PATCH 10/22] cargo-horizon-mod: trial runs behind feature full, so a
|
||||||
packing-only tool skips wasmtime
|
packing-only tool skips wasmtime
|
||||||
|
|
||||||
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
From 0a56f5616df4699588cbcc529d4720661baa810f Mon Sep 17 00:00:00 2001
|
From 0a56f5616df4699588cbcc529d4720661baa810f Mon Sep 17 00:00:00 2001
|
||||||
From: chexit <chexit@duck.com>
|
From: chexit <chexit@duck.com>
|
||||||
Date: Thu, 29 Oct 2026 13:18:43 +0300
|
Date: Thu, 29 Oct 2026 13:18:43 +0300
|
||||||
Subject: [PATCH 11/21] HD lighting: G-buffer pass, per-pixel mod point lights
|
Subject: [PATCH 11/22] HD lighting: G-buffer pass, per-pixel mod point lights
|
||||||
in HDR, bloom and tone curve; render.set-lights and render.set-lighting (API
|
in HDR, bloom and tone curve; render.set-lights and render.set-lighting (API
|
||||||
level 10)
|
level 10)
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
From 9ebf0031fe9ba6b7f02afb26e4fd3a1ba4ddb0d0 Mon Sep 17 00:00:00 2001
|
From 9ebf0031fe9ba6b7f02afb26e4fd3a1ba4ddb0d0 Mon Sep 17 00:00:00 2001
|
||||||
From: chexit <chexit@duck.com>
|
From: chexit <chexit@duck.com>
|
||||||
Date: Thu, 29 Oct 2026 13:59:43 +0300
|
Date: Thu, 29 Oct 2026 13:59:43 +0300
|
||||||
Subject: [PATCH 12/21] HD lighting stage 2: sun and moon shadow cascades, the
|
Subject: [PATCH 12/22] HD lighting stage 2: sun and moon shadow cascades, the
|
||||||
world relit (sun by face angle and shadow, sky and block light through the
|
world relit (sun by face angle and shadow, sky and block light through the
|
||||||
lightmap), light shafts and halos, fog over it again, a light colour grade
|
lightmap), light shafts and halos, fog over it again, a light colour grade
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
From 7a5a38f68923aec62f10bfa0df50b436474ed612 Mon Sep 17 00:00:00 2001
|
From 7a5a38f68923aec62f10bfa0df50b436474ed612 Mon Sep 17 00:00:00 2001
|
||||||
From: chexit <chexit@duck.com>
|
From: chexit <chexit@duck.com>
|
||||||
Date: Thu, 29 Oct 2026 16:19:53 +0300
|
Date: Thu, 29 Oct 2026 16:19:53 +0300
|
||||||
Subject: [PATCH 13/21] HD: bind groups cached until a resize or a new source,
|
Subject: [PATCH 13/22] HD: bind groups cached until a resize or a new source,
|
||||||
shadow passes draw only the entities that cast shadows
|
shadow passes draw only the entities that cast shadows
|
||||||
|
|
||||||
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
From 8020811e57d4b5a9ea1cd72d30ce859dc5095d35 Mon Sep 17 00:00:00 2001
|
From 8020811e57d4b5a9ea1cd72d30ce859dc5095d35 Mon Sep 17 00:00:00 2001
|
||||||
From: chexit <chexit@duck.com>
|
From: chexit <chexit@duck.com>
|
||||||
Date: Thu, 29 Oct 2026 16:25:44 +0300
|
Date: Thu, 29 Oct 2026 16:25:44 +0300
|
||||||
Subject: [PATCH 14/21] HD: lights culled per 16x16 tile (surface and halo
|
Subject: [PATCH 14/22] HD: lights culled per 16x16 tile (surface and halo
|
||||||
lists built on the CPU), a naga test for the lighting shaders
|
lists built on the CPU), a naga test for the lighting shaders
|
||||||
|
|
||||||
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
From 72d3fddfea329e578162656151350f0aa2efd323 Mon Sep 17 00:00:00 2001
|
From 72d3fddfea329e578162656151350f0aa2efd323 Mon Sep 17 00:00:00 2001
|
||||||
From: chexit <chexit@duck.com>
|
From: chexit <chexit@duck.com>
|
||||||
Date: Thu, 29 Oct 2026 16:43:36 +0300
|
Date: Thu, 29 Oct 2026 16:43:36 +0300
|
||||||
Subject: [PATCH 15/21] HD: GPU time per pass in the F3 timing list,
|
Subject: [PATCH 15/22] HD: GPU time per pass in the F3 timing list,
|
||||||
half-resolution GTAO with a depth-aware blur
|
half-resolution GTAO with a depth-aware blur
|
||||||
|
|
||||||
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
From 1fd83a821bf270879d8ece5aa583f200ed920d89 Mon Sep 17 00:00:00 2001
|
From 1fd83a821bf270879d8ece5aa583f200ed920d89 Mon Sep 17 00:00:00 2001
|
||||||
From: chexit <chexit@duck.com>
|
From: chexit <chexit@duck.com>
|
||||||
Date: Thu, 29 Oct 2026 17:02:02 +0300
|
Date: Thu, 29 Oct 2026 17:02:02 +0300
|
||||||
Subject: [PATCH 16/21] HD: shadows draw only sun-facing quads and skip buried
|
Subject: [PATCH 16/22] HD: shadows draw only sun-facing quads and skip buried
|
||||||
sections, the far cascade every second frame; TAA (Halton jitter,
|
sections, the far cascade every second frame; TAA (Halton jitter,
|
||||||
reprojection by depth, YCoCg variance clipping) before bloom
|
reprojection by depth, YCoCg variance clipping) before bloom
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
From 1502d359d599228fe0f44ce6b99a3fded2ac5ea0 Mon Sep 17 00:00:00 2001
|
From 1502d359d599228fe0f44ce6b99a3fded2ac5ea0 Mon Sep 17 00:00:00 2001
|
||||||
From: chexit <chexit@duck.com>
|
From: chexit <chexit@duck.com>
|
||||||
Date: Thu, 29 Oct 2026 17:02:02 +0300
|
Date: Thu, 29 Oct 2026 17:02:02 +0300
|
||||||
Subject: [PATCH 17/21] Mods: model handles (render.model-id, model-generation,
|
Subject: [PATCH 17/22] Mods: model handles (render.model-id, model-generation,
|
||||||
set-models-by-id; API level 11) so mods send no model names each tick;
|
set-models-by-id; API level 11) so mods send no model names each tick;
|
||||||
clear-post and set-lighting documented
|
clear-post and set-lighting documented
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
From 0f9d99b8ad3e4b72e621d84c2396cf1d3d2b7a33 Mon Sep 17 00:00:00 2001
|
From 0f9d99b8ad3e4b72e621d84c2396cf1d3d2b7a33 Mon Sep 17 00:00:00 2001
|
||||||
From: chexit <chexit@duck.com>
|
From: chexit <chexit@duck.com>
|
||||||
Date: Thu, 29 Oct 2026 17:19:57 +0300
|
Date: Thu, 29 Oct 2026 17:19:57 +0300
|
||||||
Subject: [PATCH 18/21] HD: temporal upscaling (HORIZON_HD_SCALE: world,
|
Subject: [PATCH 18/22] HD: temporal upscaling (HORIZON_HD_SCALE: world,
|
||||||
G-buffer and lighting at a lower size, rebuilt to the window in the TAA
|
G-buffer and lighting at a lower size, rebuilt to the window in the TAA
|
||||||
pass); fix flickering shadows near the player (the near cascade lost its
|
pass); fix flickering shadows near the player (the near cascade lost its
|
||||||
sections on frames the far one was held, the held far matrix ignored the
|
sections on frames the far one was held, the held far matrix ignored the
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
From 38250c4392e27d5700842ca6ee47291dd1831b72 Mon Sep 17 00:00:00 2001
|
From 38250c4392e27d5700842ca6ee47291dd1831b72 Mon Sep 17 00:00:00 2001
|
||||||
From: chexit <chexit@duck.com>
|
From: chexit <chexit@duck.com>
|
||||||
Date: Thu, 29 Oct 2026 17:47:52 +0300
|
Date: Thu, 29 Oct 2026 17:47:52 +0300
|
||||||
Subject: [PATCH 19/21] HD water: its own pass (colour, normal, depth), the
|
Subject: [PATCH 19/22] HD water: its own pass (colour, normal, depth), the
|
||||||
floor under it lit, a composite with world-space waves, refraction with depth
|
floor under it lit, a composite with world-space waves, refraction with depth
|
||||||
absorption in the biome colour, screen-space reflections, Fresnel and a
|
absorption in the biome colour, screen-space reflections, Fresnel and a
|
||||||
shadowed sun glint (HORIZON_HD_WATER=0 to switch off)
|
shadowed sun glint (HORIZON_HD_WATER=0 to switch off)
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
From dbc6f8a6e9c2eeabe1de15f1794013c90be7faa5 Mon Sep 17 00:00:00 2001
|
From dbc6f8a6e9c2eeabe1de15f1794013c90be7faa5 Mon Sep 17 00:00:00 2001
|
||||||
From: chexit <chexit@duck.com>
|
From: chexit <chexit@duck.com>
|
||||||
Date: Thu, 29 Oct 2026 17:56:04 +0300
|
Date: Thu, 29 Oct 2026 17:56:04 +0300
|
||||||
Subject: [PATCH 20/21] HD water: no vanilla texture on the surface (the biome
|
Subject: [PATCH 20/22] HD water: no vanilla texture on the surface (the biome
|
||||||
colour only), a darker, deeper colour
|
colour only), a darker, deeper colour
|
||||||
|
|
||||||
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
From 13e74537dd6e63482e3613e0e416de1158944dfe Mon Sep 17 00:00:00 2001
|
From 13e74537dd6e63482e3613e0e416de1158944dfe Mon Sep 17 00:00:00 2001
|
||||||
From: chexit <chexit@duck.com>
|
From: chexit <chexit@duck.com>
|
||||||
Date: Thu, 29 Oct 2026 18:38:19 +0300
|
Date: Thu, 29 Oct 2026 18:38:19 +0300
|
||||||
Subject: [PATCH 21/21] HD sky and light: a physical atmosphere (Rayleigh, Mie,
|
Subject: [PATCH 21/22] HD sky and light: a physical atmosphere (Rayleigh, Mie,
|
||||||
ozone; constants and transmittance after Photon, MIT) for the sky, haze, fog
|
ozone; constants and transmittance after Photon, MIT) for the sky, haze, fog
|
||||||
and water reflections; warmer sunlight from the atmosphere's transmittance, a
|
and water reflections; warmer sunlight from the atmosphere's transmittance, a
|
||||||
gentle sky-coloured ambient, soft PCSS-lite shadows near the player, a haze
|
gentle sky-coloured ambient, soft PCSS-lite shadows near the player, a haze
|
||||||
|
|||||||
@@ -0,0 +1,42 @@
|
|||||||
|
From 6277e051a89c2537570982f6ef275887193c05cf Mon Sep 17 00:00:00 2001
|
||||||
|
From: chexit <chexit@duck.com>
|
||||||
|
Date: Thu, 29 Oct 2026 19:02:16 +0300
|
||||||
|
Subject: [PATCH 22/22] HD water: a darker blue, a little clearer, ripples a
|
||||||
|
little higher
|
||||||
|
|
||||||
|
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
||||||
|
---
|
||||||
|
crates/horizon-client/src/gfx/hd.rs | 9 +++++----
|
||||||
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/crates/horizon-client/src/gfx/hd.rs b/crates/horizon-client/src/gfx/hd.rs
|
||||||
|
index 031e9f2de..f078d423c 100644
|
||||||
|
--- a/crates/horizon-client/src/gfx/hd.rs
|
||||||
|
+++ b/crates/horizon-client/src/gfx/hd.rs
|
||||||
|
@@ -558,7 +558,8 @@ fn wave_gradient(xz: vec2<f32>, footprint: f32) -> vec2<f32> {
|
||||||
|
let phase = dot(k, xz) - omega * frame.water.y + w.w;
|
||||||
|
grad += (k / len) * (w.z * fade * cos(phase));
|
||||||
|
}
|
||||||
|
- return grad;
|
||||||
|
+ // A little higher than the table's slopes.
|
||||||
|
+ return grad * 1.25;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn cascade_at(p: vec3<f32>, c: i32) -> vec3<f32> {
|
||||||
|
@@ -713,10 +714,10 @@ fn fs_water(in: FullOut) -> @location(0) vec4<f32> {
|
||||||
|
// A deep, dark water: the biome's colour darkened and a little greyed, so it reads as
|
||||||
|
// depth rather than as bright paint.
|
||||||
|
let biome = clamp(tint.rgb, vec3<f32>(0.03), vec3<f32>(1.0));
|
||||||
|
- let colour = mix(vec3<f32>(dot(biome, vec3<f32>(0.333))), biome, 0.85) * vec3<f32>(0.92, 1.0, 1.0);
|
||||||
|
+ let colour = mix(vec3<f32>(dot(biome, vec3<f32>(0.333))), biome, 0.85) * vec3<f32>(0.78, 0.86, 0.95);
|
||||||
|
// The colours the water takes up fastest are the ones it has the least of.
|
||||||
|
- let absorb = exp(-(vec3<f32>(1.0) - colour) * 0.8 * (thickness + 0.3));
|
||||||
|
- let refracted = behind * absorb + colour * volume_light * mix(0.85, 0.4, frame.sun_color.a) * (vec3<f32>(1.0) - absorb);
|
||||||
|
+ let absorb = exp(-(vec3<f32>(1.0) - colour) * 0.6 * (thickness + 0.3));
|
||||||
|
+ let refracted = behind * absorb + colour * volume_light * mix(0.65, 0.3, frame.sun_color.a) * (vec3<f32>(1.0) - absorb);
|
||||||
|
|
||||||
|
// Reflection: the screen where the ray stays on it, the sky where it leaves it or misses.
|
||||||
|
var r = reflect(-v, n);
|
||||||
|
--
|
||||||
|
2.54.0 (Apple Git-157)
|
||||||
|
|
||||||
Reference in New Issue
Block a user