Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lots of changes #14

Merged
merged 13 commits into from
Jan 17, 2024
Merged

Lots of changes #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
75b0259
fix string table not updating correctly
LeftofZen Jan 7, 2024
4617dcc
cleanup sawyer stream stuff
LeftofZen Jan 7, 2024
bb4eafe
small optimisations
LeftofZen Jan 8, 2024
0213e95
some stream optimisations, file cleanup
LeftofZen Jan 10, 2024
4202168
fix string table ui and parsing
LeftofZen Jan 10, 2024
7ca8a2e
add viewing of other data files, and playing of music tracks
LeftofZen Jan 12, 2024
d173084
improve music loading
LeftofZen Jan 14, 2024
85bc539
add scuffed audio rendering
LeftofZen Jan 14, 2024
9a9cc84
figured out the /2 is the bytes per sample
LeftofZen Jan 14, 2024
fc847d7
clean up riff code
LeftofZen Jan 14, 2024
8dc8ad7
add loading of misc tracks and sound effects file (css1)
LeftofZen Jan 16, 2024
b63d740
add exporting music (buggy with sound effects though)
LeftofZen Jan 16, 2024
6229255
add sound ids to ui
LeftofZen Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions OpenLocoTool/DatFileParsing/ObjectAnnotator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public static IList<Annotation> Annotate(byte[] bytelist, out byte[] fullData)
fullData =
[
.. bytelist[..runningCount],
.. SawyerStreamReader.Decode(objectHeader.Encoding, bytelist.AsSpan()[runningCount..(int)(runningCount + objectHeader.DataLength)]),
.. SawyerStreamReader.Decode(objectHeader.Encoding, bytelist[runningCount..(int)(runningCount + objectHeader.DataLength)]),
];

var locoStruct = SawyerStreamReader.GetLocoStruct(s5Header.ObjectType, fullData.AsSpan()[runningCount..]);
Expand Down Expand Up @@ -137,7 +137,7 @@ public static IList<Annotation> AnnotateG1Data(byte[] fullData, int runningCount
return annotations;
}

public static int AnnotateStringTable(byte[] fullData, int runningCount, ILocoStruct locoStruct, IList<Annotation> annotations)
static int AnnotateStringTable(byte[] fullData, int runningCount, ILocoStruct locoStruct, IList<Annotation> annotations)
{
var root = new Annotation("String Table", runningCount, 1);
annotations.Add(root);
Expand Down
Loading
Loading