ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-13 12:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Slight cleanup.

Browse source
This commit is contained in:
Ottermandias 2024-01-27 19:05:05 +01:00
parent 076dab924f
commit 1e4570bd79
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Penumbra/Import/Models/Export/MaterialExporter.cs
View file

@ -144,7 +144,7 @@ public class MaterialExporter
// Specular (table) // Specular (table)
var lerpedSpecularColor = Vector3.Lerp(prevRow.Specular, nextRow.Specular, tableRow.Weight); var lerpedSpecularColor = Vector3.Lerp(prevRow.Specular, nextRow.Specular, tableRow.Weight);
// float.Lerp is .NET8 ;-; // float.Lerp is .NET8 ;-; #TODO
var lerpedSpecularFactor = prevRow.SpecularStrength * (1.0f - tableRow.Weight) + nextRow.SpecularStrength * tableRow.Weight; var lerpedSpecularFactor = prevRow.SpecularStrength * (1.0f - tableRow.Weight) + nextRow.SpecularStrength * tableRow.Weight;
specularSpan[x].FromVector4(new Vector4(lerpedSpecularColor, lerpedSpecularFactor)); specularSpan[x].FromVector4(new Vector4(lerpedSpecularColor, lerpedSpecularFactor));

2
Penumbra/Import/Models/Export/MeshExporter.cs
View file

@ -241,7 +241,7 @@ public class MeshExporter
} }
else else
{ {
_notifier.Warning($"Invalid attribute data, ignoring."); _notifier.Warning("Invalid attribute data, ignoring.");
} }
return new MeshData return new MeshData

8
Penumbra/UI/AdvancedWindow/ModEditWindow.Models.MdlTab.cs
View file

@ -92,7 +92,7 @@ public partial class ModEditWindow
.ToList(); .ToList();
}); });
task.ContinueWith(t => { GamePaths = FinalizeIo(task); }); task.ContinueWith(t => { GamePaths = FinalizeIo(t); });
} }
private EstManipulation[] GetCurrentEstManipulations() private EstManipulation[] GetCurrentEstManipulations()
@ -171,7 +171,7 @@ public partial class ModEditWindow
/// <summary> Merge material configuration from the source onto the target. </summary> /// <summary> Merge material configuration from the source onto the target. </summary>
/// <param name="target"> Model that will be updated. </param> /// <param name="target"> Model that will be updated. </param>
/// <param name="source"> Model to copy material configuration from. </param> /// <param name="source"> Model to copy material configuration from. </param>
public void MergeMaterials(MdlFile target, MdlFile source) private static void MergeMaterials(MdlFile target, MdlFile source)
{ {
target.Materials = source.Materials; target.Materials = source.Materials;
@ -186,7 +186,7 @@ public partial class ModEditWindow
/// <summary> Merge attribute configuration from the source onto the target. </summary> /// <summary> Merge attribute configuration from the source onto the target. </summary>
/// <param name="target"> Model that will be updated. ></param> /// <param name="target"> Model that will be updated. ></param>
/// <param name="source"> Model to copy attribute configuration from. </param> /// <param name="source"> Model to copy attribute configuration from. </param>
public static void MergeAttributes(MdlFile target, MdlFile source) private static void MergeAttributes(MdlFile target, MdlFile source)
{ {
target.Attributes = source.Attributes; target.Attributes = source.Attributes;
@ -248,7 +248,7 @@ public partial class ModEditWindow
} }
private void FinalizeIo(Task<IoNotifier> task) private void FinalizeIo(Task<IoNotifier> task)
=> FinalizeIo<IoNotifier, object?>(task, notifier => null, notifier => notifier); => FinalizeIo<IoNotifier, object?>(task, _ => null, notifier => notifier);
private TResult? FinalizeIo<TResult>(Task<TResult> task) private TResult? FinalizeIo<TResult>(Task<TResult> task)
=> FinalizeIo(task, result => result, null); => FinalizeIo(task, result => result, null);