From 5e88f5a73d66773e8f4306de6df0234d34ddf2c5 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Sat, 23 May 2026 13:18:09 -0500 Subject: [PATCH] update module --- .gitmodules | 2 +- packages/cue4parse | 2 +- packages/game/JSExport/GameInterface.cs | 19 ++++++++++++++++--- packages/game/Models/BlitzFileProvider.cs | 5 ++--- packages/game/game.csproj | 1 - 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.gitmodules b/.gitmodules index 83f08c870..5abb68d08 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,4 +3,4 @@ url = https://github.com/blitzkit/closed.git [submodule "packages/cue4parse"] path = packages/cue4parse - url = https://github.com/FabianFG/CUE4Parse.git + url = https://github.com/tresabhi/cue4parse.git diff --git a/packages/cue4parse b/packages/cue4parse index b8c9dab50..ecc487895 160000 --- a/packages/cue4parse +++ b/packages/cue4parse @@ -1 +1 @@ -Subproject commit b8c9dab50010ac800e6810622e71f6ca8874a288 +Subproject commit ecc4878950336126f125af0747190edf474b2a21 diff --git a/packages/game/JSExport/GameInterface.cs b/packages/game/JSExport/GameInterface.cs index 10f85dee9..0260a03e8 100644 --- a/packages/game/JSExport/GameInterface.cs +++ b/packages/game/JSExport/GameInterface.cs @@ -1,6 +1,7 @@ using System.Text.RegularExpressions; using BlitzKit.Game.Models; using CUE4Parse_Conversion.Textures; +using CUE4Parse.Compression; using CUE4Parse.UE4.Assets.Exports; using CUE4Parse.UE4.Assets.Exports.Texture; using CUE4Parse.UE4.Assets.Objects.Properties; @@ -37,6 +38,10 @@ public partial class GameInterface .Where(nation => !nation.EndsWith(".uasset") && nation != "TankStub") .Distinct(), ]; + + string oodlePath = "temp/oodle.so"; + OodleHelper.DownloadOodleDll(ref oodlePath); + OodleHelper.Initialize(oodlePath); } public HashSet Files => files; @@ -166,10 +171,18 @@ public partial class GameInterface return []; } - var bitmap = cTexture.ToSkBitmap(); - var data = bitmap.Encode(SKEncodedImageFormat.Webp, 80); + try + { + var bitmap = cTexture.ToSkBitmap(); + } + catch (Exception ex) + { + Console.WriteLine(ex); + } - return data.ToArray(); + // var data = bitmap.Encode(SKEncodedImageFormat.Webp, 80); + + // return data.ToArray(); } Console.WriteLine($"Could not load {path} as pda"); diff --git a/packages/game/Models/BlitzFileProvider.cs b/packages/game/Models/BlitzFileProvider.cs index 1ac7081fe..4463be523 100644 --- a/packages/game/Models/BlitzFileProvider.cs +++ b/packages/game/Models/BlitzFileProvider.cs @@ -2,7 +2,9 @@ using System.Runtime.InteropServices; using CUE4Parse.Compression; using CUE4Parse.FileProvider; using CUE4Parse.MappingsProvider; +using CUE4Parse.UE4.Exceptions; using CUE4Parse.UE4.Versions; +using CUE4Parse.Utils; namespace BlitzKit.Game.Models; @@ -20,8 +22,5 @@ public class BlitzFileProvider : DefaultFileProvider Initialize(); Mount(); - - // OodleHelper.DownloadOodleDll($"../../temp/oodle.so"); - // OodleHelper.Initialize($"../../temp/oodle.so"); } } diff --git a/packages/game/game.csproj b/packages/game/game.csproj index 0441a3461..515925ed5 100644 --- a/packages/game/game.csproj +++ b/packages/game/game.csproj @@ -2,7 +2,6 @@ BlitzKit.Game net9.0 - enable enable esm