Skip to content
Open
Changes from all commits
Commits
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
24 changes: 16 additions & 8 deletions Source/ShabBundleLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,25 @@ public class DatabaseLoaderTexture_SHAB : DatabaseLoader<GameDatabase.TextureInf
public override IEnumerator Load(UrlDir.UrlFile urlFile, FileInfo file)
{
Log.Message($"loading `{urlFile.fullPath}`");
var bundle = AssetBundle.LoadFromFile(urlFile.fullPath);

var bundleRequest = AssetBundle.LoadFromFileAsync(urlFile.fullPath);
yield return bundleRequest;

var bundle = bundleRequest.assetBundle;
if (!bundle) {
Log.Warning($"could not load `{urlFile.fullPath}`");
} else {
var shaders = bundle.LoadAllAssets<Shader>();
foreach (var shader in shaders) {
Log.Debug($"adding custom shader `{shader.name}`");
Shabby.AddShader(shader);
}
yield break;
}

yield break;
var request = bundle.LoadAllAssetsAsync<Shader>();
yield return request;

foreach (var obj in request.allAssets) {
if (obj is not Shader shader)
continue;

Log.Debug($"adding custom shader `{shader.name}`");
Shabby.AddShader(shader);
}
}
}
Loading