diff --git a/blog/progress-report-dec-2024/img/camera.png b/blog/progress-report-dec-2024/img/camera.png new file mode 100644 index 00000000..efdca19c Binary files /dev/null and b/blog/progress-report-dec-2024/img/camera.png differ diff --git a/blog/progress-report-dec-2024/img/poster.png b/blog/progress-report-dec-2024/img/poster.png new file mode 100644 index 00000000..efdca19c Binary files /dev/null and b/blog/progress-report-dec-2024/img/poster.png differ diff --git a/blog/progress-report-dec-2024/img/stretch.png b/blog/progress-report-dec-2024/img/stretch.png new file mode 100644 index 00000000..5f8df6c1 Binary files /dev/null and b/blog/progress-report-dec-2024/img/stretch.png differ diff --git a/blog/progress-report-dec-2024/img/texture.png b/blog/progress-report-dec-2024/img/texture.png new file mode 100644 index 00000000..2f17244e Binary files /dev/null and b/blog/progress-report-dec-2024/img/texture.png differ diff --git a/blog/progress-report-dec-2024/img/topbar.png b/blog/progress-report-dec-2024/img/topbar.png new file mode 100644 index 00000000..4257ba9f Binary files /dev/null and b/blog/progress-report-dec-2024/img/topbar.png differ diff --git a/blog/progress-report-dec-2024/index.mdx b/blog/progress-report-dec-2024/index.mdx new file mode 100644 index 00000000..4993bd25 --- /dev/null +++ b/blog/progress-report-dec-2024/index.mdx @@ -0,0 +1,150 @@ +--- +title: Progress Report - December 2024 +date: 2025-01-05T10:00 +description: December 2024's OpenGOAL progress report +slug: progress-report-dec-2024 +authors: + - vaser +tags: [progress-report] +image: ./img/poster.png +hide_table_of_contents: false +draft: false +--- + + + + + +Despite the holiday season, some work was still accomplished. + + + +## Release Info + +This month's OpenGOAL Tooling (jak-project repo) release is `0.2.21`. + +
+
+ +
+
+ +## General Changes + +### Support Apple Silicon via the Launcher + +To coincide with the changes in last month's upgrade, the launcher is now natively built for Apple Silicon and the application will actually let you install the tooling and games appropriately. + +### Support Caron Diacritics and Czech Alphabet + +Caron diacritics have been added to the games font, as well as some additional diacritics to fully support the Czech alphabet. A reminder once again that if you would like to translate the games into a language but your font is not fully supported, please still reach out. As long as the alphabet only requires some simple modifications with the game's existing glyphs (such as adding diacritics to the latin alphabet) it's relatively simple to accomodate. + +### Avoid Duplicate Model Replacement Processing + +Store a small database of which models have already been swapped out in a level to prevent duplicate processing. + +Also a small fix for cases where using a model replacement that has no armature would cause merc nightmares due to only having a `max_bones` of 3. + +### Support Hiding ImGUI with a mouse click + +Yet another way to hide the topbar. + +![topbar](img/topbar.png) + +### Support Drawing Custom Models for Foreground HUD Elements + +Add a version of `draw-bones-hud` that uses merc to support drawing foreground HUD elements that use custom models. + +### Fix Animations Involving a full 180 degree Rotation + +Fixes the issue with animations doing a full 180 degree rotation and disappearing. The quaternions in the GLB export "flip", and when interpolating animation frames in between a flip, we got bogus quaternions. + +Also fix a crash in `goalc` when using merc models without any materials. + +### Convert Inverse-Multiplication into Division in Decompiled Output + +More readable output + +### Improved Color Palette Generation for Custom Levels + +A few improvements to color palette selection. These were made by tracing some particularly bad colors through and seeing where it made obviously bad decisions for splitting. I tested on crystal cave, and a test GLBs from Kuitar that previously had issues with alpha. + +- The previous approach to splitting was based on trying to keep a tree of deduplicated colors balanced (same count in each leaf). This is not really a good idea for generating color palettes. A better approach is to try to minimize the volume of the child node, limiting how inaccurate a color can be. Splitting is now chosen based on the average of the _deduplicated channel values_, which in practice seems to work pretty well for Kuitar's levels. Other approaches could work here too. +- The previous approach of alternating through dimensions to split on was kept. +- The depth of the KD tree during the initial split was increased, allowing it to use up to 8192 colors, instead of just 1024. +- In most cases, not all child nodes of the tree have colors in them, meaning that a tree of depth 13 would have less than 8192 colors. If this happens, child nodes are split until the color count reaches 8192. The selection of which nodes to split is somewhat arbitrary, but is breadth-first. The axis for splitting is the one with the largest range. (which might be a better idea in general?) + +On crystal-cave, the worst case color error was reduced from 221 to 9. + +### Option to copy mod/eye draws from Original Model + +Two new flags were added to the Blender plugin to allow reusing the mod and/or eye draws of the original model that is being replaced. Works pretty well for eyes, but the blerc draws can cause some Z-fighting with the non-moving parts of the model. + +### Fix Animation Compression for Custom Actors + +Fix a missing scale factor when using the large mode in the animation compressor. This would make some joints have a translation of near 0 if the original animation had stuff moving a large distance + +### Improve Camera Math + +I finally went through and worked out the math for the camera matrix, and improved how it works for PC rendering. I was able to finally avoid the double perspective divide issue, which I always thought would cause accuracy issues. + +This will help tfrag, tie (no envmap), shrub, and hfrag have less z-fighting in cases where the camera and the thing you're looking at are pretty close, but the entire level is far from the origin - like jak 3 temple. I was able to modify the camera matrix so we don't have to do all the weird scaling/addition in the shader. + +Here's a screenshot from the temple oracle checkpoint, cropped from 4k. This used to have a lot of fighting issues. + +![image](img/camera.png) + +It doesn't help issues where the thing you're looking at is very far away (jak 1 mountains, some jak 2 city stuff). It also doesn't help with jak's skirt/scarf, since those use a different renderer. + +There's definitely more to do here, but this is a good starting point and proof that I can at least figure out the math. + +### Increase Print Buffer and Check Size + +This should fix the crash when entering the freedom HQ elevator. It was caused by a large number of prints, one for each process in the city being killed by `check-for-rougue-process`, which would overflow the print buffer. So I increased the print buffer. + +Detecting buffer overflow here is hard because lots of things are allowed to write to it, including the user's GOAL print methods. I added a basic check that will assert when there's 1k or less space in the buffer. It won't catch every overflow, but it would have caught this one. + +## Jak 2 and Jak 3 + +### Unstretch Sun and Moon + +Fix the issue where the moon gets wide when using PC aspect ratios + +![stretch](img/stretch.png) + +## Jak 3 + +### Fix Cloth Disappearing after 600 Orbs + +After collecting 600 orbs, cloth systems that didn't have any `alt-tex-name`s defined would vanish because the `static-cloth-params` macro doesn't default them to `#f`. + +### Fix Missing Shadows on Light Jak Wings + +### Adjust Overlord SPU DMA to Avoid Audio Hangs + +Change jak 3 SPU DMA to run the interrupt handler "immediately" (or at least before `DMA_SendToSPUAndSync` returns). + +This fixes an issue where audio can hang during fast cutscene playback. I'm hoping it fixes more issues with looping/stuck audio as well, but this needs more testing. + +I originally wanted to do it this way, but thought that it didn't work - from Jak 2 it seemed like things broke if the DMA was too fast. But, at least for Jak 3, everything seems to work like this. This will remove a huge source of non-deterministic timing in audio stuff and hopefully make things easier to debug. It also means that a large portion of streaming audio code will never have to run - from the game's point of view there's always the next SPU buffer available. + +### Fix issue where VAG Streams Never Queue + +Accidentally incrementing `s` twice in the loop, so queued streams in slot 1, and 3 were skipped by the overlord. +This would usually cause the audio to never start playing because the game would wait for the audio to successfully get queued. + +### Workaround Language Setting Issue + +In Jak 3, the default PC settings file would have a language of 255 because it runs before the first settings update. This would cause the game to crash the second time it is started. + +### Update texture remap table + +Jak 2 and 3 use this annoying trick where they store multiple images in the same texture by just changing the CLUT. This breaks some PC code because those two textures will have the same TBP address. so there's a table of remaps to fix this, generated by the decompiler. Unfortunately, I generated that table before the decompiler loaded the .STR file with these textures, so it was missing the remaps. This is automatically generated in the texture folder when you run the decompiler - I just copied it to the C++ file. + +![texture](img/texture.png) + +### Fix Cloth NaNs + +Kind of silly fix. + +The cloth update function sometimes runs before the "setup" is done (`need-setup` is set), which divides by zero in a bunch of places. This fix prevents NaNs from spreading during this time. diff --git a/blog/progress-report-nov-2024/index.mdx b/blog/progress-report-nov-2024/index.mdx index 042dfa40..a8d8313b 100644 --- a/blog/progress-report-nov-2024/index.mdx +++ b/blog/progress-report-nov-2024/index.mdx @@ -21,7 +21,7 @@ Wouldn't you know it, more Jak 3 fixes! ## Release Info -This month's OpenGOAL Tooling (jak-project repo) release is `0.2.19`. +This month's OpenGOAL Tooling (jak-project repo) release is `0.2.20`.
diff --git a/docusaurus.config.js b/docusaurus.config.js index bb2e68ea..61d42c47 100644 --- a/docusaurus.config.js +++ b/docusaurus.config.js @@ -77,8 +77,8 @@ const config = { /** @type {import('@docusaurus/preset-classic').ThemeConfig} */ ({ announcementBar: { - id: "announcementBar-20", // Increment on change - content: `Check out November's Progress Report Here!`, + id: "announcementBar-21", // Increment on change + content: `Check out December's Progress Report Here!`, }, algolia: { // The application ID provided by Algolia diff --git a/src/components/LatestBlogs/index.js b/src/components/LatestBlogs/index.js index d4c779e5..84f53d5a 100644 --- a/src/components/LatestBlogs/index.js +++ b/src/components/LatestBlogs/index.js @@ -6,6 +6,17 @@ import Typography from "@mui/material/Typography"; import { CardActionArea } from "@mui/material"; const BlogList = [ + { + title: "Progress Report - December 2024", + image: require("@site/blog/progress-report-dec-2024/img/poster.png") + .default, + description: ( + <> + Despite the holiday season, some work was still accomplished. + + ), + link: "/blog/progress-report-dec-2024", + }, { title: "Progress Report - November 2024", image: require("@site/blog/progress-report-nov-2024/img/poster.png") @@ -27,17 +38,6 @@ const BlogList = [ ), link: "/blog/progress-report-oct-2024", - }, - { - title: "Progress Report - September 2024", - image: require("@site/blog/progress-report-sept-2024/img/poster.png") - .default, - description: ( - <> - Plenty of small Jak 3 bugfixes and some custom level improvements. - - ), - link: "/blog/progress-report-sept-2024", } ]; diff --git a/src/components/LauncherDownloadLink/index.js b/src/components/LauncherDownloadLink/index.js index c34f1f75..8ecd52a0 100644 --- a/src/components/LauncherDownloadLink/index.js +++ b/src/components/LauncherDownloadLink/index.js @@ -10,13 +10,15 @@ export default function LauncherDownloadLink({ hideTutorial = false }) { const [detectedPlatform, setDetectedPlatform] = useState(""); const [forPlatform, setForPlatform] = useState(""); - const [isArm, setIsArm] = useState(false); + const [isUnsupportedArmPlatform, setIsUnsupportedArmPlatform] = + useState(false); const [launcherVersion, setLauncherVersion] = useState(""); const [downloadUrlAutomatic, setDownloadUrlAutomatic] = useState("#"); const [downloadUrlWindows, setDownloadUrlWindows] = useState("#"); const [downloadUrlLinux, setDownloadUrlLinux] = useState("#"); const [downloadUrlMacOS, setDownloadUrlMacOS] = useState("#"); + const [downloadUrlMacOSARM, setDownloadUrlMacOSARM] = useState("#"); const [deckyPluginVersion, setDeckyPluginVersion] = useState(""); const [deckyPluginDownloadUrl, setDeckyPluginDownloadUrl] = useState(""); @@ -30,6 +32,9 @@ export default function LauncherDownloadLink({ hideTutorial = false }) { const isWindows = platformLower === "windows"; const isMacOS = platformLower === "mac os"; const isLinux = !isWindows && !isMacOS; + const isARM = + parser.getCPU().architecture === "arm" || + parser.getCPU().architecture === "arm64"; const response = await fetch( `https://api.github.com/repos/open-goal/launcher/releases/latest`, @@ -56,13 +61,20 @@ export default function LauncherDownloadLink({ hideTutorial = false }) { setForPlatform("Linux"); setDownloadUrlAutomatic(asset.browser_download_url); } - } else if (asset.name.match(/^.*\.dmg$/)) { + } else if (asset.name.match(/^.*_x64\.dmg$/)) { setAvailable(true); setDownloadUrlMacOS(asset.browser_download_url); - if (isMacOS) { + if (isMacOS && !isARM) { setForPlatform("Intel MacOS"); setDownloadUrlAutomatic(asset.browser_download_url); } + } else if (asset.name.match(/^.*_aarch64\.dmg$/)) { + setAvailable(true); + setDownloadUrlMacOSARM(asset.browser_download_url); + if (isMacOS && isARM) { + setForPlatform("Apple Silicon"); + setDownloadUrlAutomatic(asset.browser_download_url); + } } } @@ -83,11 +95,7 @@ export default function LauncherDownloadLink({ hideTutorial = false }) { } } - setIsArm( - parser.getCPU().architecture === "arm" || - parser.getCPU().architecture === "arm64", - ); - + setIsUnsupportedArmPlatform(isARM && !isMacOS); setLoading(false); }; @@ -158,12 +166,14 @@ export default function LauncherDownloadLink({ hideTutorial = false }) { `Windows Launcher @ ${launcherVersion}`, `Linux Launcher @ ${launcherVersion}`, `Intel MacOS Launcher @ ${launcherVersion}`, + `Apple Silicon Launcher @ ${launcherVersion}`, `Decky Plugin @ ${deckyPluginVersion}`, ]} secondaryButtonUrls={[ downloadUrlWindows, downloadUrlLinux, downloadUrlMacOS, + downloadUrlMacOSARM, deckyPluginDownloadUrl, ]} /> @@ -189,15 +199,15 @@ export default function LauncherDownloadLink({ hideTutorial = false }) { )}
- {apiError || !available || isArm ? ( + {apiError || !available || isUnsupportedArmPlatform ? (

{apiError ? "Couldn't fetch latest release, API error or you are rate-limited!" : null}
- {isArm - ? `Launcher only supports Windows, Linux and Intel MacOS. Detected platform: ${forPlatform}` + {isUnsupportedArmPlatform + ? `Launcher only supports Windows, Linux and Intel MacOS. Detected platform: ${detectedPlatform}` : null}