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

close snooper on extract + moonman (marsman?) specular

Browse Source
This commit is contained in:
4sval 2023-02-01 18:29:34 +01:00
parent 535ffd45ec
commit bbda1c5c0d
6 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
FModel/ViewModels/CUE4ParseViewModel.cs
View File

@ -79,6 +79,7 @@ public class CUE4ParseViewModel : ViewModel
set => SetProperty(ref _modelIsWaitingAnimation, value);
}
public bool IsSnooperOpen => _snooper is { Exists: true, IsVisible: true };
private Snooper _snooper;
public Snooper SnooperViewer
{

6
FModel/ViewModels/ThreadWorkerViewModel.cs
View File

@ -52,7 +52,9 @@ public class ThreadWorkerViewModel : ViewModel
public async Task Begin(Action<CancellationToken> action)
{
if (!_applicationView.Status.IsReady)
if (_applicationView.CUE4Parse.IsSnooperOpen)
_applicationView.CUE4Parse.SnooperViewer.Close();
else if (!_applicationView.Status.IsReady)
{
SignalOperationInProgress();
return;
@ -89,6 +91,8 @@ public class ThreadWorkerViewModel : ViewModel
catch (OperationCanceledException)
{
_applicationView.Status.SetStatus(EStatusKind.Stopped);
if (_applicationView.CUE4Parse.IsSnooperOpen)
_applicationView.CUE4Parse.SnooperViewer.Close();
CurrentCancellationTokenSource = null; // kill token
OperationCancelled = true;
OperationCancelled = false;

8
FModel/Views/Snooper/Lights/SpotLight.cs
View File

@ -18,7 +18,9 @@ public class SpotLight : Light
Attenuation *= Constants.SCALE_DOWN_RATIO;
InnerConeAngle = spot.GetOrDefault("InnerConeAngle", 50.0f);
OuterConeAngle = spot.GetOrDefault("OuterConeAngle", 60.0f);
OuterConeAngle = spot.GetOrDefault("OuterConeAngle", InnerConeAngle + 10);
if (OuterConeAngle < InnerConeAngle)
InnerConeAngle = OuterConeAngle - 10;
}
public SpotLight(FGuid model, Texture icon, UObject parent, UObject spot, Transform transform) : base(model, icon, parent, spot, transform)
@ -28,7 +30,9 @@ public class SpotLight : Light
Attenuation *= Constants.SCALE_DOWN_RATIO;
InnerConeAngle = spot.GetOrDefault("InnerConeAngle", 50.0f);
OuterConeAngle = spot.GetOrDefault("OuterConeAngle", 60.0f);
OuterConeAngle = spot.GetOrDefault("OuterConeAngle", InnerConeAngle + 10);
if (OuterConeAngle < InnerConeAngle)
InnerConeAngle = OuterConeAngle - 10;
}
public override void Render(int i, Shader shader)

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

@ -19,6 +19,7 @@ public class Material : IDisposable
public readonly CMaterialParams2 Parameters;
public string Name;
public string Path;
public int SelectedChannel;
public int SelectedTexture;
public bool IsUsed;
@ -43,6 +44,7 @@ public class Material : IDisposable
{
Parameters = new CMaterialParams2();
Name = "";
Path = "None";
IsUsed = false;
Diffuse = Array.Empty<Texture>();
@ -63,6 +65,7 @@ public class Material : IDisposable
public void SwapMaterial(UMaterialInterface unrealMaterial)
{
Name = unrealMaterial.Name;
Path = unrealMaterial.GetPathName();
unrealMaterial.GetParams(Parameters, EMaterialFormat.AllLayers);
}

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

@ -37,6 +37,8 @@ public static class TextureHelper
// B: Whatever (AO / S / E / ...)
case "shootergame":
case "divineknockout":
case "moonman":
case "marsman":
{
unsafe
{

4
FModel/Views/Snooper/SnimGui.cs
View File

@ -503,7 +503,7 @@ Snooper aims to give an accurate preview of models, materials, skeletal animatio
else _swapper.Value = true;
}
ImGui.Separator();
if (ImGui.Selectable("Copy Name to Clipboard")) ImGui.SetClipboardText(material.Name);
if (ImGui.Selectable("Copy Path to Clipboard")) ImGui.SetClipboardText(material.Path);
});
ImGui.PopID();
}
@ -639,7 +639,7 @@ Snooper aims to give an accurate preview of models, materials, skeletal animatio
material.ImGuiColors(material.Parameters.Colors);
ImGui.TreePop();
}
if (ImGui.TreeNode("Referenced Textures"))
if (ImGui.TreeNode("All Textures"))
{
material.ImGuiDictionaries("textures", material.Parameters.Textures);
ImGui.TreePop();