Skip to content

Rework asynchronous asset registry #425

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

Draft
Helco wants to merge 64 commits into
base: master
Choose a base branch
from
Draft

Rework asynchronous asset registry #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
63c7f4d
Remove old asset registry
Helco Jun 3, 2025
9387368
Scribble most of AssetRegistry
Helco Jun 5, 2025
8d03352
IAsset instead of IAssetLoader
Helco Jun 5, 2025
0c3af47
General guids, low batches
Helco Jun 11, 2025
c1d5ba9
DI for asset loading
Helco Jun 11, 2025
fde4034
Some trivial registry tests
Helco Jun 12, 2025
75fb2a6
MainThreadDisposal and various tests
Helco Jun 13, 2025
c417ec9
Many load tests
Helco Jun 13, 2025
604a5ff
Asset disposal tests
Helco Jun 13, 2025
f22f579
Misc tests
Helco Jun 13, 2025
fa2e699
Broken error tests
Helco Jun 13, 2025
0dcd3d8
DisposeRegistry_HighAsset_DuringLoad test
Helco Jun 23, 2025
e1b82cc
AggregateException vs TestException
Helco Jun 23, 2025
0b19bbd
Fix Error_* tests
Helco Jun 24, 2025
032ea52
Fix AssetHandle being mutable
Helco Jun 25, 2025
403dcbe
Add local asset tests
Helco Jun 25, 2025
031eea8
Add initial secondary tests before removing
Helco Jun 25, 2025
866c2e0
Remove secondary assets
Helco Jun 25, 2025
e0656bb
Add two load nested tests
Helco Jun 25, 2025
b2ca44d
Added deep nested load test
Helco Jun 25, 2025
328238a
Fix LoadNested_SyncSecondaryHigh tests
Helco Jun 25, 2025
3ea1811
Add simple tests to increase coverage
Helco Jun 25, 2025
269a919
Add tests for invalid handle copies
Helco Jun 26, 2025
987eeaa
Remove unnecessary exception unpacking
Helco Jun 26, 2025
47f6c41
Add Unique asset test
Helco Jun 26, 2025
b45a977
Adapt Animation, Clump and Actor
Helco Jul 16, 2025
c77fb9b
Adapt SamplerAsset, SoundAsset, TextureASset
Helco Jul 16, 2025
b84df4d
Adapt UIBitmapAsset, UIPreloadAsset, UITileSheetAsset
Helco Jul 16, 2025
ed27a81
Add IAssetRegistry.Apply
Helco Jul 17, 2025
4a3f8a5
WIP adaption of ClumpMaterialAsset
Helco Jul 21, 2025
2afce5b
Add IAssetRegistry.TryGet
Helco Jul 21, 2025
bc76bed
Adapt ClumpMaterialAsset
Helco Jul 22, 2025
f7912fc
Adapt all material assets
Helco Jul 23, 2025
9f43ab5
Adapt EffectCombinerAsset and WorldAsset
Helco Jul 23, 2025
b312903
AssetLoadPriority -> AssetPriority
Helco Jul 24, 2025
faa28f2
Remove NullDisposable from zzre project
Helco Jul 24, 2025
64e2d2c
Shallow fixes for many tools
Helco Jul 24, 2025
deb8825
Add generic AssetHandle
Helco Jul 25, 2025
0b4756c
Add IAssetRegistry.CopyDebugInfo to fix AssetExplorer
Helco Jul 28, 2025
20e960e
Readd AssetRegistryStats
Helco Jul 29, 2025
6d38fc9
Add AssetRegistryDelayed
Helco Jul 29, 2025
ce410e6
Improve code coverage
Helco Jul 29, 2025
209c2ac
Shallow fixes using AssetRegistryDelayed
Helco Jul 31, 2025
1a43dbf
Shallow fixes with delay, stats, SoundEmitter
Helco Jul 31, 2025
a315f78
Fix LensFlare, SoundEmitter, ActorEditor.Part
Helco Jul 31, 2025
f9e659e
Fix BeamStar, EffectCombiner, MovingPlanes, ParticleEmitter, RandomPl…
Helco Jul 31, 2025
3051936
Adapter LoadUIBitmapFor and LoadUITileSheetFor
Helco Aug 1, 2025
1f9f993
Fix rest of asset loading
Helco Aug 1, 2025
3ae980f
Reintegrate ECS with asset registry
Helco Aug 1, 2025
f847648
Fix spurious NUnit exceptions due to not awaiting Assert.ThatAsync
Helco Aug 1, 2025
e22983b
Add basic validator program
Helco Oct 17, 2024
d0da9c2
validator: Add textures, models, actors and effects
Helco Oct 17, 2024
827774b
Actually use MaxConcurrency option
Helco Oct 22, 2024
0b08fa0
Adapt Validator
Helco Aug 1, 2025
1e2141a
Fix synchronous validation tasks
Helco Aug 1, 2025
9dc815a
Report validation messages as diagnostics
Helco Aug 6, 2025
55ab299
WIP stress tests and fixes
Helco Aug 8, 2025
9280881
Abstract lock
Helco Aug 20, 2025
bbbd2d9
Link tokens together in LockSemaphoreAsync
Helco Aug 20, 2025
0534184
Add tracking asset lock and a bit more stress
Helco Aug 20, 2025
6e4361e
Add better context to tracking lock
Helco Aug 21, 2025
f2ca3c0
Fix double disposal stat
Helco Aug 22, 2025
29279ca
Add equally broken MonitorAssetLock and DotNextAsyncLock
Helco Aug 22, 2025
b16764e
Remove console writes
Helco Aug 22, 2025
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
3 changes: 3 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,9 @@ dotnet_diagnostic.CA2016.severity = warning
dotnet_diagnostic.CA2246.severity = warning
dotnet_diagnostic.IDE0004.severity = warning
dotnet_diagnostic.IDE0005.severity = warning
dotnet_diagnostic.IDE0008.severity = none
dotnet_diagnostic.IDE0010.severity = none
dotnet_diagnostic.IDE0011.severity = none
dotnet_diagnostic.IDE0016.severity = warning
dotnet_diagnostic.IDE0028.severity = warning
dotnet_diagnostic.IDE0029.severity = warning
Expand All @@ -285,6 +287,7 @@ dotnet_diagnostic.IDE0037.severity = warning
dotnet_diagnostic.IDE0041.severity = warning
dotnet_diagnostic.IDE0044.severity = warning
dotnet_diagnostic.IDE0054.severity = warning
dotnet_diagnostic.IDE0061.severity = none
dotnet_diagnostic.IDE0062.severity = warning
dotnet_diagnostic.IDE0071.severity = warning
dotnet_diagnostic.IDE0082.severity = warning
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ sarif-output
**/.DS_Store

BenchmarkDotNet*
assetregistry-old
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<VeldridHash>g2c8a3f1b9e</VeldridHash>
<DefaultEcsHash>0e92bb5</DefaultEcsHash>
<ImguiHash>9b51cce</ImguiHash>
<MlangHash>5c3471e</MlangHash>
<MlangHash>331cf83</MlangHash>
<NLayerHash>01e1238</NLayerHash>
<VeldridVersion>4.9.0-$(VeldridHash)</VeldridVersion>
<VeldridRenderdocVersion>1.0.1-$(VeldridHash)</VeldridRenderdocVersion>
Expand Down
2 changes: 1 addition & 1 deletion extern/Mlang
Open in desktop
Submodule Mlang updated 12 files
+0 −30 .github/workflows/dotnet.yml
+0 −36 Mlang.Compiler.Test/ExpressionPrecedence.cs
+0 −1 Mlang.Compiler.Test/GlobalUsings.cs
+0 −30 Mlang.Compiler.Test/Mlang.Compiler.Test.csproj
+2 −3 Mlang.Compiler/Language/MlangOutputVisitor.cs
+1 −1 Mlang.Compiler/Mlang.Compiler.csproj
+1 −1 Mlang.Compiler/ShaderSetFileWriter.cs
+0 −1 Mlang.Compiler/VisibleInternals.cs
+0 −6 Mlang.sln
+1 −1 Mlang/Mlang.csproj
+1 −1 Mlang/ShaderSetFileReader.cs
+4 −4 Mlangc/Mlangc.cs
1 change: 1 addition & 0 deletions zzio.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0Common", "0Common", "{FB32
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
CodeQuality.props = CodeQuality.props
Directory.Build.props = Directory.Build.props
NoCodeQuality.props = NoCodeQuality.props
EndProjectSection
EndProject
Expand Down
Loading
Loading