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

don't forget to thank extract folder users if you find it laggy now

Browse Source
This commit is contained in:
iAmAsval
2021-12-23 13:25:05 +01:00
parent f0caf246b5
commit dabe13d495
6 changed files with 59 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CUE4Parse

Submodule CUE4Parse updated: a1b6d306fd...254550e6f2

4
FModel/ViewModels/CUE4ParseViewModel.cs
View File

@@ -691,7 +691,7 @@ namespace FModel.ViewModels
export.Owner.Name.EndsWith($"/RenderSwitch_Materials/{export.Name}", StringComparison.OrdinalIgnoreCase) ||
export.Owner.Name.EndsWith($"/MI_BPTile/{export.Name}", StringComparison.OrdinalIgnoreCase))):
{
Application.Current.Dispatcher.InvokeAsync(() =>
Application.Current.Dispatcher.Invoke(delegate
{
var modelViewer = Helper.GetWindow<ModelViewer>("Model Viewer", () => new ModelViewer().Show());
modelViewer.Load(export);
@@ -700,7 +700,7 @@ namespace FModel.ViewModels
}
case UMaterialInstance m when ModelIsOverwritingMaterial:
{
Application.Current.Dispatcher.InvokeAsync(() =>
Application.Current.Dispatcher.Invoke(delegate
{
var modelViewer = Helper.GetWindow<ModelViewer>("Model Viewer", () => new ModelViewer().Show());
modelViewer.Overwrite(m);

6
FModel/ViewModels/Commands/RightClickMenuCommand.cs
View File

@@ -55,12 +55,8 @@ namespace FModel.ViewModels.Commands
contextViewModel.CUE4Parse.TabControl.SelectedTab.SaveImage(false);
}
break;
// case "Assets_Save_Material":
// break;
// case "Assets_Save_Mesh":
// break;
}
});
}
}
}
}

130
FModel/ViewModels/ModelViewerViewModel.cs
View File

@@ -105,7 +105,7 @@ namespace FModel.ViewModels
HDRi = TextureModel.Create(cubeMap?.Stream);
}
public async Task LoadExport(UObject export)
public void LoadExport(UObject export)
{
#if DEBUG
LoadHDRi();
@@ -123,23 +123,20 @@ namespace FModel.ViewModels
_loadedModels.Add(p);
}
await _threadWorkerView.Begin(_ =>
switch (export)
{
switch (export)
{
case UStaticMesh st:
LoadStaticMesh(st, p);
break;
case USkeletalMesh sk:
LoadSkeletalMesh(sk, p);
break;
case UMaterialInstance mi:
LoadMaterialInstance(mi, p);
break;
default:
throw new ArgumentOutOfRangeException(nameof(export));
}
});
case UStaticMesh st:
LoadStaticMesh(st, p);
break;
case USkeletalMesh sk:
LoadSkeletalMesh(sk, p);
break;
case UMaterialInstance mi:
LoadMaterialInstance(mi, p);
break;
default:
throw new ArgumentOutOfRangeException(nameof(export));
}
if (AppendMode && CanAppend) return;
SelectedModel = p;
@@ -287,35 +284,31 @@ namespace FModel.ViewModels
Clipboard.SetText(m.SelectedGeometry.DisplayName.TrimEnd());
}
#endregion
public async Task<bool> TryOverwriteMaterial(UMaterialInstance materialInstance)
public bool TryOverwriteMaterial(UMaterialInstance materialInstance)
{
if (SelectedModel?.SelectedGeometry == null || _loadedModels.Count < 1) return false;
PBRMaterial m = null;
await _threadWorkerView.Begin(_ =>
{
(m, var _, var _) = LoadMaterial(materialInstance);
(PBRMaterial m, _, _) = LoadMaterial(materialInstance);
var obj = new ResolvedLoadedObject(materialInstance);
switch (_loadedModels[SelectedModel.SelectedGeometry.ExportIndex].Export)
{
case UStaticMesh { Materials: { } } st:
st.Materials[SelectedModel.SelectedGeometry.MaterialIndex] = obj;
break;
case USkeletalMesh sk:
sk.Materials[SelectedModel.SelectedGeometry.MaterialIndex].Material = obj;
break;
case UMaterialInstance:
SelectedModel.SwapExport(materialInstance);
break;
}
});
var obj = new ResolvedLoadedObject(materialInstance);
switch (_loadedModels[SelectedModel.SelectedGeometry.ExportIndex].Export)
{
case UStaticMesh { Materials: { } } st:
st.Materials[SelectedModel.SelectedGeometry.MaterialIndex] = obj;
break;
case USkeletalMesh sk:
sk.Materials[SelectedModel.SelectedGeometry.MaterialIndex].Material = obj;
break;
case UMaterialInstance:
SelectedModel.SwapExport(materialInstance);
break;
}
SelectedModel.SelectedGeometry.Material = m;
return m != null;
}
#endregion
private void LoadMaterialInstance(UMaterialInstance materialInstance, ModelAndCam cam)
{
@@ -326,14 +319,11 @@ namespace FModel.ViewModels
SetupCameraAndAxis(new FBox(new FVector(-8), new FVector(8)), cam);
var (m, isRendering, isTransparent) = LoadMaterial(materialInstance);
Application.Current.Dispatcher.Invoke(() =>
cam.Group3d.Add(new CustomMeshGeometryModel3D
{
cam.Group3d.Add(new CustomMeshGeometryModel3D
{
Transform = new RotateTransform3D(new AxisAngleRotation3D(new Vector3D(0,1,0), -45)),
DisplayName = materialInstance.Name, Geometry = builder.ToMeshGeometry3D(), MaterialIndex = 0,
Material = m, IsTransparent = isTransparent, IsRendering = isRendering, ExportIndex = _loadedModels.Count - 1
});
Transform = new RotateTransform3D(new AxisAngleRotation3D(new Vector3D(0,1,0), -45)),
DisplayName = materialInstance.Name, Geometry = builder.ToMeshGeometry3D(), MaterialIndex = 0,
Material = m, IsTransparent = isTransparent, IsRendering = isRendering, ExportIndex = _loadedModels.Count - 1
});
}
@@ -396,29 +386,18 @@ namespace FModel.ViewModels
continue;
var (m, isRendering, isTransparent) = LoadMaterial(material);
Application.Current.Dispatcher.Invoke(() =>
cam.Group3d.Add(new CustomMeshGeometryModel3D
{
cam.Group3d.Add(new CustomMeshGeometryModel3D
{
DisplayName = section.MaterialName ?? material.Name, MaterialIndex = section.MaterialIndex,
Geometry = builder.ToMeshGeometry3D(), Material = m, IsTransparent = isTransparent,
IsRendering = isRendering, ExportIndex = _loadedModels.Count - 1
});
DisplayName = section.MaterialName ?? material.Name, MaterialIndex = section.MaterialIndex,
Geometry = builder.ToMeshGeometry3D(), Material = m, IsTransparent = isTransparent,
IsRendering = isRendering, ExportIndex = _loadedModels.Count - 1
});
}
}
private (PBRMaterial material, bool isRendering, bool isTransparent) LoadMaterial(UMaterialInterface unrealMaterial)
{
PBRMaterial m = null; // default
Application.Current.Dispatcher.Invoke(() => // tweak this later
{
m = new PBRMaterial // recreate on ui thread
{
RenderShadowMap = true, EnableAutoTangent = true, RenderEnvironmentMap = true
};
});
var m = new PBRMaterial {RenderShadowMap = true, EnableAutoTangent = true, RenderEnvironmentMap = true};
var parameters = new CMaterialParams();
unrealMaterial.GetParams(parameters);
@@ -427,18 +406,16 @@ namespace FModel.ViewModels
{
if (!parameters.HasTopDiffuseTexture && parameters.DiffuseColor is { A: > 0 } diffuseColor)
{
Application.Current.Dispatcher.Invoke(() => m.AlbedoColor = new Color4(diffuseColor.R, diffuseColor.G, diffuseColor.B, diffuseColor.A));
m.AlbedoColor = new Color4(diffuseColor.R, diffuseColor.G, diffuseColor.B, diffuseColor.A);
}
else if (parameters.Diffuse is UTexture2D diffuse)
{
var s = diffuse.Decode()?.Encode().AsStream();
Application.Current.Dispatcher.Invoke(() => m.AlbedoMap = new TextureModel(s));
m.AlbedoMap = new TextureModel(diffuse.Decode()?.Encode().AsStream());
}
if (parameters.Normal is UTexture2D normal)
{
var s = normal.Decode()?.Encode().AsStream();
Application.Current.Dispatcher.Invoke(() => m.NormalMap = new TextureModel(s));
m.NormalMap = new TextureModel(normal.Decode()?.Encode().AsStream());
}
if (parameters.Specular is UTexture2D specular)
@@ -545,30 +522,21 @@ namespace FModel.ViewModels
}
// R -> AO G -> Roughness B -> Metallic
var s = bitmap.Encode(SKEncodedImageFormat.Png, 100).AsStream();
Application.Current.Dispatcher.Invoke(() =>
{
m.RoughnessMetallicMap = new TextureModel(s);
m.RoughnessFactor = parameters.RoughnessValue;
m.MetallicFactor = parameters.MetallicValue;
m.RenderAmbientOcclusionMap = parameters.SpecularValue > 0;
});
m.RoughnessMetallicMap = new TextureModel(bitmap.Encode(SKEncodedImageFormat.Png, 100).AsStream());
m.RoughnessFactor = parameters.RoughnessValue;
m.MetallicFactor = parameters.MetallicValue;
m.RenderAmbientOcclusionMap = parameters.SpecularValue > 0;
}
if (parameters.HasTopEmissiveTexture && parameters.Emissive is UTexture2D emissive && parameters.EmissiveColor is { A: > 0 } emissiveColor)
{
var s = emissive.Decode()?.Encode().AsStream();
var c = new Color4(emissiveColor.R, emissiveColor.G, emissiveColor.B, emissiveColor.A);
Application.Current.Dispatcher.Invoke(() =>
{
m.EmissiveColor = c;
m.EmissiveMap = new TextureModel(s);
});
m.EmissiveColor = new Color4(emissiveColor.R, emissiveColor.G, emissiveColor.B, emissiveColor.A);
m.EmissiveMap = new TextureModel(emissive.Decode()?.Encode().AsStream());
}
}
else
{
Application.Current.Dispatcher.Invoke(() => m.AlbedoColor = new Color4(1, 0, 0, 1));
m.AlbedoColor = new Color4(1, 0, 0, 1);
}
return (m, isRendering, parameters.IsTransparent);

6
FModel/Views/ModelViewer.xaml
View File

@@ -110,8 +110,7 @@
<TextBlock Grid.Column="2" Text="Model is loading, please wait..." HorizontalAlignment="Center" VerticalAlignment="Center"/>
<helix:Viewport3DX Grid.Column="2" EffectsManager="{Binding ModelViewer.EffectManager}" Camera="{Binding ModelViewer.Cam}"
Visibility="{Binding IsReady, Converter={StaticResource BoolToVisibilityConverter}}" ShowViewCube="False"
IsChangeFieldOfViewEnabled="False" IsMoveEnabled="False" UseDefaultGestures="False"
ShowViewCube="False" IsChangeFieldOfViewEnabled="False" IsMoveEnabled="False" UseDefaultGestures="False"
ShowCameraTarget="False" FXAALevel="Ultra" MSAA="Maximum" BackgroundColor="#2A2B34"
EnableSSAO="True" SSAOIntensity="1" EnableSwapChainRendering="True">
<helix:Viewport3DX.InputBindings>
@@ -129,7 +128,8 @@
<helix:LineGeometryModel3D Geometry="{Binding ModelViewer.SelectedModel.YAxis}" Color="#85CB22" />
<helix:LineGeometryModel3D Geometry="{Binding ModelViewer.SelectedModel.ZAxis}" Color="#388EED" />
<helix:GroupModel3D x:Name="MyAntiCrashGroup" ItemsSource="{Binding ModelViewer.SelectedModel.Group3d}" Mouse3DDown="OnMouse3DDown" />
<helix:GroupModel3D x:Name="MyAntiCrashGroup" Mouse3DDown="OnMouse3DDown"
ItemsSource="{Binding ModelViewer.SelectedModel.Group3d, IsAsync=True}"/>
</helix:Viewport3DX>
</Grid>
</adonisControls:AdonisWindow>

7
FModel/Views/ModelViewer.xaml.cs
View File

@@ -23,11 +23,10 @@ namespace FModel.Views
InitializeComponent();
}
public async void Load(UObject export) => await _applicationView.ModelViewer.LoadExport(export);
public async void Overwrite(UMaterialInstance materialInstance)
public void Load(UObject export) => _applicationView.ModelViewer.LoadExport(export);
public void Overwrite(UMaterialInstance materialInstance)
{
var sucess = await _applicationView.ModelViewer.TryOverwriteMaterial(materialInstance);
if (sucess)
if (_applicationView.ModelViewer.TryOverwriteMaterial(materialInstance))
{
_applicationView.CUE4Parse.ModelIsOverwritingMaterial = false;
}