Skip to content

Commit

Permalink
chore: update large files submodule for 4k texture update (#9435)
Browse files Browse the repository at this point in the history 
* chore: update large files submodule

* fix: make local build not copy 8k textures in 4k build

* fix: do not link 8k textures in 4k build

* add changelog
  • Loading branch information
@Saschl
Saschl authored Nov 7, 2024
1 parent a91cf61 commit 07b260f
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
1 change: 1 addition & 0 deletions .github/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
1. [A32NX/FANS] Restore Portuguese station codes - @tracernz (Mike)
1. [A380X/MFD] Fixed DIRECT TO selection of active waypoint does nothing - @sognodelx (Sven Gross)
1. [A380X/FLIGHT MODEL] Fix for stall and auto-rotation issues- @donstim (donbikes)
1. [A380X/MODEL] Optimized 4K textures - @Repsol

## 0.12.0

Expand Down
4 changes: 3 additions & 1 deletion igniter.config.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,15 @@ export default new TaskOfTasks('all', [
'npm run build-a380x:link-base-files',
'npm run unchunkLargeFiles',
'npm run build-a380x:link-large-files',
'npm run build-a380x:link-large-files-texture-8k',
// temporary until folder exists
'mkdir -p fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/',
]),
new ExecTask('copy-base-files (4K)', [
'npm run build-a380x:link-base-files',
'npm run unchunkLargeFiles',
'npm run build-a380x:link-large-files',
'npm run build-a380x:copy-large-files-texture-4k',
'npm run build-a380x:link-large-files-texture-4k',
// temporary until folder exists
'mkdir -p fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/',
]),
Expand All @@ -160,6 +161,7 @@ export default new TaskOfTasks('all', [
'npm run build-a380x:copy-base-files',
'npm run unchunkLargeFiles',
'npm run build-a380x:copy-large-files',
'npm run build-a380x:copy-large-files-texture-8k',
'npm run chunkLargeFiles',
// temporary until folder exists
'mkdir -p fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/',
Expand Down
2 changes: 1 addition & 1 deletion large-files
Submodule large-files updated from 894066 to 75d80e
6 changes: 4 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,13 @@
"watch:instruments": "rollup --max-old-space-size=8192 -wc src/systems/instruments/buildSrc/simulatorBuild.mjs",
"====== A380 =============================================================": "========================================================",
"build-a380x:copy-base-files": "mkdir -p fbw-a380x/out/flybywire-aircraft-a380-842 && (rsync -a fbw-a380x/src/base/flybywire-aircraft-a380-842 fbw-a380x/out/ || cp -a -u fbw-a380x/src/base/flybywire-aircraft-a380-842 fbw-a380x/out/)",
"build-a380x:copy-large-files": "mkdir -p fbw-a380x/out/flybywire-aircraft-a380-842 && (rsync -a --exclude='texture-4k' large-files/fbw-a380x/src/base/flybywire-aircraft-a380-842 fbw-a380x/out/ || (cp -a -u large-files/fbw-a380x/src/base/flybywire-aircraft-a380-842 fbw-a380x/out/ && rm -rf fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/texture-4k))",
"build-a380x:copy-large-files": "mkdir -p fbw-a380x/out/flybywire-aircraft-a380-842 && (rsync -a --exclude='texture-4k' --exclude='texture' large-files/fbw-a380x/src/base/flybywire-aircraft-a380-842 fbw-a380x/out/ || (cp -a -u large-files/fbw-a380x/src/base/flybywire-aircraft-a380-842 fbw-a380x/out/ && rm -rf fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/texture-4k))",
"build-a380x:copy-large-files-texture-8k": "mkdir -p fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/texture && (rsync -a large-files/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/texture/ fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/texture/ || cp -a large-files/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/texture/* fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/texture/)",
"build-a380x:copy-large-files-texture-4k": "mkdir -p fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/texture && (rsync -a large-files/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/texture-4k/ fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/texture/ || cp -a large-files/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/texture-4k/* fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/texture/)",
"build-a380x:link-base-files": "mkdir -p fbw-a380x/out/flybywire-aircraft-a380-842 && cp -l -r -f fbw-a380x/src/base/flybywire-aircraft-a380-842 fbw-a380x/out/",
"build-a380x:link-large-files": "mkdir -p fbw-a380x/out/flybywire-aircraft-a380-842 && cp -l -r -f large-files/fbw-a380x/src/base/flybywire-aircraft-a380-842 fbw-a380x/out/ && rm -rf fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/texture-4k",
"build-a380x:link-large-files": "mkdir -p fbw-a380x/out/flybywire-aircraft-a380-842 && cp -l -r -f large-files/fbw-a380x/src/base/flybywire-aircraft-a380-842 fbw-a380x/out/ && rm -rf fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/texture-4k && rm -rf fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/texture",
"build-a380x:link-large-files-texture-4k": "mkdir -p fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/texture && cp -l -r -f large-files/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/texture-4k/* fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/texture/",
"build-a380x:link-large-files-texture-8k": "mkdir -p fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/texture && cp -l -r -f large-files/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/texture/* fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/texture/",
"build-a380x:efb-translation": "cd fbw-common/src/systems/instruments/src/EFB/Localization && node build-flypad-translation.js",
"build-a380x:locPak-translation": "cd fbw-a380x/src/localization && node build-locPak-translation.js",
"build-a380x:extras-host": "node fbw-a380x/src/systems/extras-host/build.js",
Expand Down

0 comments on commit 07b260f

Please sign in to comment.