Update to .net8.

This commit is contained in:
Ottermandias 2024-03-19 17:35:05 +01:00
parent 9f7b95746d
commit 05b7234748
12 changed files with 14 additions and 13 deletions

@ -1 +1 @@
Subproject commit 5a2e12a1acd6760a3a592447a92215135e79197c
Subproject commit b4b14367d8235eabedd561ad3626beb1d2a83889

@ -1 +1 @@
Subproject commit 34921fd2c5a9aff5d34aef664bdb78331e8b9436
Subproject commit 1df06807650a79813791effaa01fb7c4710b3dab

View file

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<LangVersion>preview</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<PlatformTarget>x64</PlatformTarget>

@ -1 +1 @@
Subproject commit c39f683d65d4541e9f97ed4ea1abcb10e8ca5690
Subproject commit 33b512746e80b7b1276b644430923eee9bec9fba

@ -1 +1 @@
Subproject commit 620a7edf009b92288257ce7d64fffb8fba44d8b5
Subproject commit 14e00f77d42bc677e02325660db765ef11932560

View file

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

View file

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<LangVersion>preview</LangVersion>
<PlatformTarget>x64</PlatformTarget>
<AssemblyTitle>Penumbra</AssemblyTitle>

View file

@ -16,7 +16,7 @@ public class FilenameService(DalamudPluginInterface pi) : IService
public readonly string ActiveCollectionsFile = Path.Combine(pi.ConfigDirectory.FullName, "active_collections.json");
public readonly string CrashHandlerExe =
Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, "Penumbra.CrashHandler.exe");
Path.Combine(pi.AssemblyLocation.DirectoryName!, "Penumbra.CrashHandler.exe");
public readonly string LogFileName =
Path.Combine(Path.GetDirectoryName(Path.GetDirectoryName(pi.ConfigDirectory.FullName)!)!, "Penumbra.log");

View file

@ -9,7 +9,8 @@ using OtterGui.Services;
namespace Penumbra.Services;
public class MessageService(Logger log, UiBuilder uiBuilder, IChatGui chat) : OtterGui.Classes.MessageService(log, uiBuilder, chat), IService
public class MessageService(Logger log, UiBuilder uiBuilder, IChatGui chat, INotificationManager notificationManager)
: OtterGui.Classes.MessageService(log, uiBuilder, chat, notificationManager), IService
{
public void LinkItem(Item item)
{

View file

@ -81,7 +81,8 @@ public static class ServiceManagerA
.AddDalamudService<ITextureProvider>(pi)
.AddDalamudService<ITextureSubstitutionProvider>(pi)
.AddDalamudService<IGameInteropProvider>(pi)
.AddDalamudService<IPluginLog>(pi);
.AddDalamudService<IPluginLog>(pi)
.AddDalamudService<INotificationManager>(pi);
private static ServiceManager AddInterop(this ServiceManager services)
=> services.AddSingleton<FrameworkManager>()

View file

@ -108,7 +108,7 @@ public class TutorialService
.Register("Initial Setup, Step 8: Mod Import",
"Click this button to open a file selector with which to select TTMP mod files. You can select multiple at once.\n\n"
+ "It is not recommended to import huge mod packs of all your TexTools mods, but rather import the mods themselves, otherwise you lose out on a lot of Penumbra features!\n\n"
+ "A feature to import raw texture mods for Tattoos etc. is available under Advanced Editing, but is currently a work in progress.") // TODO
+ "A feature to import raw texture mods for Tattoos etc. is available under Advanced Editing, but is currently a work in progress.")
.Register("Advanced Help", "Click this button to get detailed information on what you can do in the mod selector.\n\n"
+ "Import and select a mod now to continue.")
.Register("Mod Filters", "You can filter the available mods by name, author, changed items or various attributes here.")

View file

@ -1,7 +1,7 @@
{
"version": 1,
"dependencies": {
"net7.0-windows7.0": {
"net8.0-windows7.0": {
"EmbedIO": {
"type": "Direct",
"requested": "[3.4.3, )",