Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-10-01 13:38:47 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

focus export check on UWorld for maps

Browse Source
This commit is contained in:
Asval
2025-02-11 19:47:39 +01:00
parent 71468dca23
commit 6dfbd11ad4
8 changed files with 51 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CUE4Parse

Submodule CUE4Parse updated: 699dbd4438...822dc9bf39

3
FModel/Creator/CreatorPackage.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.CompilerServices;
using CUE4Parse.UE4.Assets.Exports;
using FModel.Creator.Bases;
@@ -30,7 +31,7 @@ public class CreatorPackage : IDisposable
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool TryConstructCreator(out UCreator creator)
public bool TryConstructCreator([MaybeNullWhen(false)] out UCreator creator)
{
switch (_exportType)
{

44
FModel/Extensions/CUE4ParseExtensions.cs
View File

@@ -2,6 +2,8 @@
using CUE4Parse.FileProvider;
using CUE4Parse.FileProvider.Objects;
using CUE4Parse.UE4.Assets;
using CUE4Parse.UE4.Objects.UObject;
using FModel.Settings;
namespace FModel.Extensions;
@@ -9,35 +11,57 @@ public static class CUE4ParseExtensions
{
public class LoadPackageResult
{
// more than 1 export per page currently break the inner package navigation feature
// if you have 1k exports per page, at page 2, you click on export index 932
// it will find the export index 932 in the current page, which would realistically be 1932
// fix would be to use InclusiveStart and ExclusiveEnd to determine the page the export index is in
// giving the document access to this would fix the issue and we could re-use Package instead of reloading it but it's quite a bit of work atm
private const int PaginationThreshold = 5000;
private const int MaxExportPerPage = 1;
public IPackage Package;
public int RequestedIndex;
public bool IsPaginated => Package.ExportMapLength >= PaginationThreshold;
public int InclusiveStart;
/// <summary>
/// index of the first export on the current page
/// this index is the starting point for additional data preview
///
/// it can be >0 even if <see cref="IsPaginated"/> is false if we want to focus data preview on a specific export
/// in this case, we will display all exports but only the focused one will be checked for data preview
/// </summary>
public int InclusiveStart => Math.Max(0, RequestedIndex - RequestedIndex % MaxExportPerPage);
/// <summary>
/// last exclusive export index of the current page
/// </summary>
public int ExclusiveEnd => IsPaginated
? Math.Min(InclusiveStart + MaxExportPerPage, Package.ExportMapLength)
: Package.ExportMapLength;
public int PageSize => ExclusiveEnd - InclusiveStart;
private int CurrentPage => (InclusiveStart + 1) / MaxExportPerPage;
private int LastPage => Math.Max(1, (Package.ExportMapLength + MaxExportPerPage - 1) / MaxExportPerPage);
private int PageSize => ExclusiveEnd - InclusiveStart;
public string TabTitleExtra => IsPaginated ? $"Export{(PageSize > 1 ? "s" : "")} {InclusiveStart}{(PageSize > 1 ? $"-{ExclusiveEnd - 1}" : "")} of {Package.ExportMapLength - 1}" : null;
public string TabTitleExtra => IsPaginated ? $"Page {CurrentPage}/{LastPage}" : null;
public object GetDisplayData(bool save = false) => !save ? Package.GetExports(InclusiveStart, PageSize) : Package.GetExports();
/// <summary>
/// display all exports unless paginated
/// </summary>
/// <param name="save">if we save the data we will display all exports even if <see cref="IsPaginated"/> is true</param>
/// <returns></returns>
public object GetDisplayData(bool save = false) => !save && IsPaginated
? Package.GetExports(InclusiveStart, PageSize)
: Package.GetExports();
}
public static LoadPackageResult GetLoadPackageResult(this IFileProvider provider, GameFile file, string objectName = null)
{
var result = new LoadPackageResult { Package = provider.LoadPackage(file) };
if (result.IsPaginated)
if (result.IsPaginated || (result.Package.HasFlags(EPackageFlags.PKG_ContainsMap) && UserSettings.Default.PreviewWorlds)) // focus on UWorld if it's a map we want to preview
{
result.InclusiveStart = result.Package.GetExportIndex(file.NameWithoutExtension);
result.RequestedIndex = result.Package.GetExportIndex(file.NameWithoutExtension);
if (objectName != null)
{
result.InclusiveStart = int.TryParse(objectName, out var index) ? index : result.Package.GetExportIndex(objectName);
result.RequestedIndex = int.TryParse(objectName, out var index) ? index : result.Package.GetExportIndex(objectName);
}
}

6
FModel/MainWindow.xaml.cs
View File

@@ -83,9 +83,9 @@ public partial class MainWindow
).ConfigureAwait(false);
#if DEBUG
await _threadWorkerView.Begin(cancellationToken =>
_applicationView.CUE4Parse.Extract(cancellationToken,
_applicationView.CUE4Parse.Provider["FortniteGame/Plugins/GameFeatures/BRMapCh6/Content/Maps/Hermes_Terrain.umap"]));
// await _threadWorkerView.Begin(cancellationToken =>
// _applicationView.CUE4Parse.Extract(cancellationToken,
// _applicationView.CUE4Parse.Provider["FortniteGame/Plugins/GameFeatures/MeshCosmetics/Content/Jumpsuit/F_MED_Jumpsuit_Scrap/CO/CO_F_MED_Jumpsuit_Scrap.uasset"]));
// await _threadWorkerView.Begin(cancellationToken =>
// _applicationView.CUE4Parse.Extract(cancellationToken,
// "RED/Content/Chara/ABA/Costume01/Animation/Charaselect/body/stand_body01.uasset"));

10
FModel/ViewModels/CUE4ParseViewModel.cs
View File

@@ -138,12 +138,12 @@ public class CUE4ParseViewModel : ViewModel
{
case Constants._FN_LIVE_TRIGGER:
{
Provider = new StreamedFileProvider("FortniteLive", true, versionContainer);
Provider = new StreamedFileProvider("FortniteLive", versionContainer);
break;
}
case Constants._VAL_LIVE_TRIGGER:
{
Provider = new StreamedFileProvider("ValorantLive", true, versionContainer);
Provider = new StreamedFileProvider("ValorantLive", versionContainer);
break;
}
default:
@@ -155,12 +155,12 @@ public class CUE4ParseViewModel : ViewModel
[
new(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\StateOfDecay2\\Saved\\Paks"),
new(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\StateOfDecay2\\Saved\\DisabledPaks")
], SearchOption.AllDirectories, true, versionContainer),
], SearchOption.AllDirectories, versionContainer),
"eFootball" => new DefaultFileProvider(new DirectoryInfo(gameDirectory),
[
new(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData) + "\\KONAMI\\eFootball\\ST\\Download")
], SearchOption.AllDirectories, true, versionContainer),
_ => new DefaultFileProvider(gameDirectory, SearchOption.AllDirectories, true, versionContainer)
], SearchOption.AllDirectories, versionContainer),
_ => new DefaultFileProvider(gameDirectory, SearchOption.AllDirectories, versionContainer)
};
break;

2
FModel/Views/Resources/Controls/Aed/GamePathVisualLineText.cs
View File

@@ -70,7 +70,7 @@ public class GamePathVisualLineText : VisualLineText
{
var obj = gamePath.SubstringAfterLast('.');
var package = gamePath.SubstringBeforeLast('.');
var fullPath = _applicationView.CUE4Parse.Provider.FixPath(package, StringComparison.Ordinal);
var fullPath = _applicationView.CUE4Parse.Provider.FixPath(package);
var firstLine = a.ParentVisualLine.Document.GetLineByNumber(2);
if (a.ParentVisualLine.Document.FileName.Equals(fullPath.SubstringBeforeLast('.'), StringComparison.OrdinalIgnoreCase) &&

6
FModel/Views/Resources/Controls/ImagePopout.xaml
View File

@@ -15,7 +15,9 @@
<controls:MagnifierManager.Magnifier>
<controls:Magnifier Radius="150" ZoomFactor=".7" />
</controls:MagnifierManager.Magnifier>
<Image x:Name="ImageCtrl" UseLayoutRounding="True" />
<Border BorderBrush="#3b3d4a" BorderThickness="1" HorizontalAlignment="Center" VerticalAlignment="Center">
<Image x:Name="ImageCtrl" UseLayoutRounding="True" />
</Border>
</DockPanel>
</adonisControls:AdonisWindow>

2
FModel/Views/Snooper/Shading/Material.cs
View File

@@ -80,7 +80,7 @@ public class Material : IDisposable
Normals = [new Texture(new FLinearColor(0.5f, 0.5f, 1f, 1f))];
SpecularMasks = [new Texture(new FLinearColor(1f, 0.5f, 0.5f, 1f))];
Emissive = new Texture[1];
DiffuseColor = [Vector4.One];
DiffuseColor = FillColors(1, Diffuse, CMaterialParams2.DiffuseColors, Vector4.One);
EmissiveColor = [Vector4.One];
}
else