mirror of
https://git.triforceproject.com/triforce/source
synced 2026-11-19 16:20:01 -04:00
Triforce v0.5.1
Hotfix for v0.5.0: crashes (NX2navi game folder refused by Setup, heap-full retries, GTX 10 series noise pass and whole VRAM mirrors, code-patch mods kept with their code, no page file warning), graphics (DLSS with frame generation, DLSS coming back, AMD storage buffer alignment, mesh index map, shared memory barrier, shader conversions, integrated GPUs' uniform snapshot, a Mesh shaders row), controls (microphone after restart, button prompts with a mod's size table, sprint vs Hide text, native mouse camera, controller after Restart now), Setup's Preparing shaders step, and the Linux link fix.
This commit is contained in:
@@ -162,6 +162,12 @@ sealed partial class Shell
|
||||
rows["read"].Done(); rows["lift"].Done(); rows["compile"].Begin(); rows["compile"].Progress(0.41);
|
||||
SetButtons(cancel: true);
|
||||
await Shot(dir, "13-build");
|
||||
// ((Triforce, 11-18) the shaders' step after the folder: its own row and bar, and the note that says what it is)
|
||||
rows["compile"].Done(); rows["finish"].Done(); rows["shaders"].Begin(); rows["shaders"].Progress(0.37);
|
||||
BuildNote.Text = T(S.ShadersNote) + " " + T(S.Elapsed) + ": 1 h 17 min";
|
||||
await Shot(dir, "13b-build-shaders");
|
||||
foreach (var r in rows.Values) r.Reset();
|
||||
rows["read"].Done(); rows["lift"].Done(); rows["compile"].Begin(); rows["compile"].Progress(0.41);
|
||||
|
||||
Log.Text = string.Join("\n", new[]
|
||||
{
|
||||
|
||||
@@ -30,8 +30,12 @@ sealed partial class Shell
|
||||
// to 1.1 GB in 13,230 files, 3.9 times its size)
|
||||
const int ToolsUnpackedTimes = 5;
|
||||
// (the build's steps, and the stone each one lights when it is done; the last one makes the whole crest gleam)
|
||||
// ((Triforce, 11-18) "shaders": the game's --prepare-shaders after the folder is put together (nx2/make_game.py prepare_shaders;
|
||||
// its "@@stage shaders" and progress, gpu/vk/vk_main.cpp). Without a row it ran under four finished steps with no bar: an
|
||||
// update on an AMD card sat there over an hour and looked stuck)
|
||||
static readonly (string Id, S Text, int Stone)[] Stages =
|
||||
{ ("read", S.Read, Art.Emerald), ("lift", S.Lift, Art.Sapphire), ("compile", S.Compile, Art.Ruby), ("finish", S.Finish, -1) };
|
||||
{ ("read", S.Read, Art.Emerald), ("lift", S.Lift, Art.Sapphire), ("compile", S.Compile, Art.Ruby), ("finish", S.Finish, -1),
|
||||
("shaders", S.Shaders, -1) };
|
||||
|
||||
// parts of Main.xaml
|
||||
readonly Grid Root, InstallPage, FetchPage, SetupPage, BuildPage, NupRow, AskLayer;
|
||||
@@ -844,7 +848,8 @@ sealed partial class Shell
|
||||
var tools = Tools.Find();
|
||||
if (tools == null) { Say(T(S.ToolsMissing), "Bad", "Bad"); return; }
|
||||
var args = new List<string> { "--check" };
|
||||
args.AddRange(UseNup.IsChecked == true ? new[] { "--nup", NupPath.Text } : new[] { "--exefs", ExefsPath.Text });
|
||||
// (the romfs folder too: NX2navi's holds one packed romfs.bin, which the builder refuses, nx2/make_game.py refuse_packed_romfs)
|
||||
args.AddRange(UseNup.IsChecked == true ? new[] { "--nup", NupPath.Text } : new[] { "--exefs", ExefsPath.Text, "--romfs", RomfsPath.Text });
|
||||
var (ok, text) = await Runner.Check(tools, args);
|
||||
if (serial != checkSerial) return;
|
||||
sourceOk = ok;
|
||||
@@ -960,6 +965,7 @@ sealed partial class Shell
|
||||
if (current != null && rows.TryGetValue(current, out var was)) was.Done();
|
||||
current = id;
|
||||
if (rows.TryGetValue(id, out var row)) row.Begin();
|
||||
ShowClock(); // (the note under the title is the step's: the shaders' says what that step is)
|
||||
}
|
||||
else if (line.StartsWith("@@progress "))
|
||||
{
|
||||
@@ -1042,7 +1048,7 @@ sealed partial class Shell
|
||||
|
||||
void ShowClock()
|
||||
{
|
||||
if (runner != null) BuildNote.Text = T(S.Patience) + " " + T(S.Elapsed) + ": " + Span(elapsed.Elapsed);
|
||||
if (runner != null) BuildNote.Text = (current == "shaders" ? T(S.ShadersNote) : T(S.Patience)) + " " + T(S.Elapsed) + ": " + Span(elapsed.Elapsed);
|
||||
}
|
||||
|
||||
static string Span(TimeSpan t) => t.TotalHours >= 1 ? (int)t.TotalHours + " h " + t.Minutes + " min" : t.TotalMinutes >= 1 ? t.Minutes + " min" : t.Seconds + " s";
|
||||
|
||||
@@ -23,6 +23,8 @@ enum S
|
||||
Download, Updating, UpdateFailed,
|
||||
// (the report of a build that stopped, English only as well)
|
||||
CopyReport, ReportCopied, ReportNotCopied,
|
||||
// ((Triforce, 11-18) the shaders' step after the folder is put together: English only as well)
|
||||
Shaders, ShadersNote,
|
||||
}
|
||||
|
||||
static class Strings
|
||||
@@ -38,6 +40,8 @@ static class Strings
|
||||
"The build stopped", "Build cancelled", "You can start again from the same folder.", "Stop the build and close?", "Language", "Stop and close", "Keep building",
|
||||
"Downloading the new version", "Updating your game", "The update could not be downloaded",
|
||||
"Copy report", "Report copied", "The clipboard is in use: try again",
|
||||
"Preparing shaders",
|
||||
"Your game is built; its shaders are being prepared once so it doesn't stutter later. On AMD graphics cards this can take an hour or more.",
|
||||
};
|
||||
static readonly string[] Fr =
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user