Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-06-21 07:20:05 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

materials + skeleton fix

Browse Source
This commit is contained in:
iAmAsval 2021-12-18 04:01:23 +01:00
parent 609e3e6e33
commit 227dafae53
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CUE4Parse

@ -1 +1 @@
Subproject commit 763aca666c1782ce51287100641bc31d9fce0d41
Subproject commit 370b35d1e0e981501d5f18c574cb55e20ac3000d

6
FModel/ViewModels/CUE4ParseViewModel.cs
View File

@ -752,9 +752,9 @@ namespace FModel.ViewModels
}
else
{
Log.Error("{FileName} could not be saved", savedFileName);
FLogger.AppendError();
FLogger.AppendText($"Could not save '{savedFileName}'", Constants.WHITE, true);
Log.Warning("{FileName} could not be saved", export.Name);
FLogger.AppendWarning();
FLogger.AppendText($"Could not save '{export.Name}'", Constants.WHITE, true);
}
}

8
FModel/ViewModels/MapViewerViewModel.cs
View File

@ -375,9 +375,9 @@ namespace FModel.ViewModels
await _threadWorkerView.Begin(_ =>
{
if (!Utils.TryLoadObject("FortniteGame/Content/UI/IngameMap/UIMapManagerBR.Default__UIMapManagerBR_C", out UObject mapManager) ||
!mapManager.TryGetValue(out UMaterial mapMaterial, "MapMaterial") || mapMaterial.ReferencedTextures.Count < 1) return;
!mapManager.TryGetValue(out UMaterial mapMaterial, "MapMaterial") || mapMaterial.GetFirstTexture() is not UTexture2D tex) return;
_bitmaps[0][_FIRST_BITMAP] = new MapLayer{Layer = Utils.GetBitmap(mapMaterial.ReferencedTextures[0] as UTexture2D), IsEnabled = true};
_bitmaps[0][_FIRST_BITMAP] = new MapLayer{Layer = Utils.GetBitmap(tex), IsEnabled = true};
_brMiniMapImage = GetImageSource(_bitmaps[0][_FIRST_BITMAP].Layer);
});
}
@ -390,9 +390,9 @@ namespace FModel.ViewModels
await _threadWorkerView.Begin(_ =>
{
if (!Utils.TryLoadObject("FortniteGame/Content/UI/IngameMap/UIMapManagerPapaya.Default__UIMapManagerPapaya_C", out UObject mapManager) ||
!mapManager.TryGetValue(out UMaterial mapMaterial, "MapMaterial") || mapMaterial.ReferencedTextures.Count < 1) return;
!mapManager.TryGetValue(out UMaterial mapMaterial, "MapMaterial") || mapMaterial.GetFirstTexture() is not UTexture2D tex) return;
_bitmaps[1][_FIRST_BITMAP] = new MapLayer{Layer = Utils.GetBitmap(mapMaterial.ReferencedTextures[0] as UTexture2D), IsEnabled = true};
_bitmaps[1][_FIRST_BITMAP] = new MapLayer{Layer = Utils.GetBitmap(tex), IsEnabled = true};
_prMiniMapImage = GetImageSource(_bitmaps[1][_FIRST_BITMAP].Layer);
});
}

4
FModel/Views/Resources/Resources.xaml
View File

@ -944,7 +944,7 @@
</MenuItem.Icon>
</MenuItem>
<Separator />
<MenuItem Header="Jump to Asset Folder" Command="{Binding GoToCommand}" CommandParameter="{Binding Directory}">
<MenuItem Header="Jump to Package Folder" Command="{Binding GoToCommand}" CommandParameter="{Binding Directory}">
<MenuItem.Icon>
<Viewbox Width="16" Height="16">
<Canvas Width="24" Height="24">
@ -953,7 +953,7 @@
</Viewbox>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Copy Asset Name" Command="{Binding TabCommand}" CommandParameter="Copy_Asset_Name">
<MenuItem Header="Copy Package Name" Command="{Binding TabCommand}" CommandParameter="Copy_Asset_Name">
<MenuItem.Icon>
<Viewbox Width="16" Height="16">
<Canvas Width="24" Height="24">