Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-09-14 04:26:40 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

env map not rendering fix

Browse Source
This commit is contained in:
MountainFlash
2021-11-18 17:24:18 +05:30
parent 86f0a5b96c
commit eaf38495c7
4 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
FModel/FModel.csproj
View File

@@ -186,6 +186,7 @@
<Resource Include="Resources\delete.png" />
<Resource Include="Resources\edit.png" />
<Resource Include="Resources\go_to_directory.png" />
<Resource Include="Resources\approaching_storm_cubemap.dds" />
</ItemGroup>
<ItemGroup>

BIN
FModel/Resources/approaching_storm_cubemap.dds Normal file
View File

Binary file not shown.

44
FModel/ViewModels/ModelViewerViewModel.cs
View File

@@ -4,6 +4,9 @@ using System.Drawing.Imaging;
using System.IO;
using System.Linq;
using System.Net;
using System.Reflection;
using System.Windows;
using System.Windows.Media.Media3D;
using CUE4Parse.UE4.Assets.Exports;
using CUE4Parse.UE4.Assets.Exports.Material;
using CUE4Parse.UE4.Assets.Exports.SkeletalMesh;
@@ -94,33 +97,16 @@ namespace FModel.ViewModels
private void LoadHDRi()
{
var hdri = new FileInfo(
Path.Combine(UserSettings.Default.OutputDirectory, ".data", "approaching_storm.jpg"));
if (!hdri.Exists)
{
var request = new RestRequest($"https://dl.polyhaven.org/file/ph-assets/HDRIs/extra/Tonemapped%20JPG/approaching_storm.jpg", Method.GET);
var response = new RestClient().ExecuteAsync(request).Result;
if (response.StatusCode != HttpStatusCode.OK)
{
var b = new Bitmap(1, 1);
b.SetPixel(0, 0, System.Drawing.Color.DarkGray);
var stream = new MemoryStream();
b.Save(stream, ImageFormat.Jpeg);
HDRi = TextureModel.Create(stream);
return;
}
// Blur makes reflections soft but these black borders...
// var temp = SKImage.FromBitmap(SKBitmap.Decode(response.RawBytes));
// var blur = SKImageFilter.CreateBlur(20, 20, SKShaderTileMode.Clamp); // this adds black borders. WHY?
// var blurred = temp.ApplyImageFilter(blur, temp.Info.Rect, temp.Info.Rect, out SKRectI _, out SKPoint _);
using (var writer = hdri.OpenWrite())
writer.Write(response.RawBytes);
}
HDRi = new TextureModel(hdri.ToString());
var cubeMap = Application.GetResourceStream(new Uri("/FModel;component/Resources/approaching_storm_cubemap.dds",
UriKind.Relative));
HDRi = TextureModel.Create(cubeMap?.Stream);
}
public void LoadExport(UObject export)
{
#if DEBUG
LoadHDRi();
#endif
if (!AppendModeEnabled) Clear();
switch (export)
{
@@ -185,7 +171,7 @@ namespace FModel.ViewModels
return;
}
SetupCameraAndAxis(convertedMesh.BoundingBox.Min, convertedMesh.BoundingBox.Max);
if (!AppendModeEnabled) SetupCameraAndAxis(convertedMesh.BoundingBox.Min, convertedMesh.BoundingBox.Max);
foreach (var lod in convertedMesh.LODs)
{
@@ -224,8 +210,8 @@ namespace FModel.ViewModels
{
var id = section.FirstIndex + j * 3 + t;
var vert = verts[indices[id]];
var p = new Vector3(vert.Position.X, -vert.Position.Y, vert.Position.Z);
var n = new Vector3(vert.Normal.X, -vert.Normal.Y, vert.Normal.Z);
var p = new Vector3(vert.Position.X, vert.Position.Z, -vert.Position.Y); // up direction is Y
var n = new Vector3(vert.Normal.X, vert.Normal.Z, -vert.Normal.Y);
n.Normalize();
var uv = new Vector2(vert.UV.U, vert.UV.V);
builder.AddNode(p, n, uv);
@@ -322,9 +308,9 @@ namespace FModel.ViewModels
{
var minOfMin = min.Min();
var maxOfMax = max.Max();
Cam.UpDirection = new System.Windows.Media.Media3D.Vector3D(0, 0, 1);
Cam.Position = new System.Windows.Media.Media3D.Point3D(maxOfMax, maxOfMax, (minOfMin + maxOfMax) / 1.25);
Cam.LookDirection = new System.Windows.Media.Media3D.Vector3D(-Cam.Position.X, -Cam.Position.Y, 0);
Cam.UpDirection = new Vector3D(0, 1, 0);
Cam.Position = new Point3D(maxOfMax, maxOfMax, (minOfMin + maxOfMax) / 1.25);
Cam.LookDirection = new Vector3D(-Cam.Position.X, -Cam.Position.Y, 0);
var lineBuilder = new LineBuilder();
lineBuilder.AddLine(new Vector3(0, 0, 0), new Vector3(100, 0, 0));

4
FModel/Views/ModelViewer.xaml
View File

@@ -44,8 +44,8 @@
<helix:Viewport3DX Grid.Column="2" EffectsManager="{Binding ModelViewer.EffectManager}" Camera="{Binding ModelViewer.Cam}"
IsChangeFieldOfViewEnabled="False" IsMoveEnabled="False" UseDefaultGestures="False" ShowViewCube="False"
ShowCameraTarget="False" ModelUpDirection="0,0,1" BackgroundColor="#2A2B34"
EnableSSAO="True" SSAOIntensity="1" MSAA="Maximum" EnableSwapChainRendering="True">
ShowCameraTarget="False" BackgroundColor="#2A2B34"
EnableSSAO="True" SSAOIntensity="1" FXAALevel="Ultra" MSAA="Maximum" EnableSwapChainRendering="True">
<helix:Viewport3DX.InputBindings>
<MouseBinding Command="helix:ViewportCommands.Rotate" Gesture="LeftClick" />
<MouseBinding Command="helix:ViewportCommands.Zoom" Gesture="RightClick" />