mirror of
https://github.com/xivdev/Penumbra.git
synced 2025-12-12 18:27:24 +01:00
Update to .net8.
This commit is contained in:
parent
9f7b95746d
commit
05b7234748
12 changed files with 14 additions and 13 deletions
2
OtterGui
2
OtterGui
|
|
@ -1 +1 @@
|
||||||
Subproject commit 5a2e12a1acd6760a3a592447a92215135e79197c
|
Subproject commit b4b14367d8235eabedd561ad3626beb1d2a83889
|
||||||
|
|
@ -1 +1 @@
|
||||||
Subproject commit 34921fd2c5a9aff5d34aef664bdb78331e8b9436
|
Subproject commit 1df06807650a79813791effaa01fb7c4710b3dab
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>net7.0-windows</TargetFramework>
|
<TargetFramework>net8.0-windows</TargetFramework>
|
||||||
<LangVersion>preview</LangVersion>
|
<LangVersion>preview</LangVersion>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<PlatformTarget>x64</PlatformTarget>
|
<PlatformTarget>x64</PlatformTarget>
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
Subproject commit c39f683d65d4541e9f97ed4ea1abcb10e8ca5690
|
Subproject commit 33b512746e80b7b1276b644430923eee9bec9fba
|
||||||
|
|
@ -1 +1 @@
|
||||||
Subproject commit 620a7edf009b92288257ce7d64fffb8fba44d8b5
|
Subproject commit 14e00f77d42bc677e02325660db765ef11932560
|
||||||
|
|
@ -144,8 +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 ;-; #TODO
|
var lerpedSpecularFactor = float.Lerp(prevRow.SpecularStrength, 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));
|
||||||
|
|
||||||
// Emissive (table)
|
// Emissive (table)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net7.0-windows</TargetFramework>
|
<TargetFramework>net8.0-windows</TargetFramework>
|
||||||
<LangVersion>preview</LangVersion>
|
<LangVersion>preview</LangVersion>
|
||||||
<PlatformTarget>x64</PlatformTarget>
|
<PlatformTarget>x64</PlatformTarget>
|
||||||
<AssemblyTitle>Penumbra</AssemblyTitle>
|
<AssemblyTitle>Penumbra</AssemblyTitle>
|
||||||
|
|
|
||||||
|
|
@ -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 ActiveCollectionsFile = Path.Combine(pi.ConfigDirectory.FullName, "active_collections.json");
|
||||||
|
|
||||||
public readonly string CrashHandlerExe =
|
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 =
|
public readonly string LogFileName =
|
||||||
Path.Combine(Path.GetDirectoryName(Path.GetDirectoryName(pi.ConfigDirectory.FullName)!)!, "Penumbra.log");
|
Path.Combine(Path.GetDirectoryName(Path.GetDirectoryName(pi.ConfigDirectory.FullName)!)!, "Penumbra.log");
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,8 @@ using OtterGui.Services;
|
||||||
|
|
||||||
namespace Penumbra.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)
|
public void LinkItem(Item item)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -81,7 +81,8 @@ public static class ServiceManagerA
|
||||||
.AddDalamudService<ITextureProvider>(pi)
|
.AddDalamudService<ITextureProvider>(pi)
|
||||||
.AddDalamudService<ITextureSubstitutionProvider>(pi)
|
.AddDalamudService<ITextureSubstitutionProvider>(pi)
|
||||||
.AddDalamudService<IGameInteropProvider>(pi)
|
.AddDalamudService<IGameInteropProvider>(pi)
|
||||||
.AddDalamudService<IPluginLog>(pi);
|
.AddDalamudService<IPluginLog>(pi)
|
||||||
|
.AddDalamudService<INotificationManager>(pi);
|
||||||
|
|
||||||
private static ServiceManager AddInterop(this ServiceManager services)
|
private static ServiceManager AddInterop(this ServiceManager services)
|
||||||
=> services.AddSingleton<FrameworkManager>()
|
=> services.AddSingleton<FrameworkManager>()
|
||||||
|
|
|
||||||
|
|
@ -108,7 +108,7 @@ public class TutorialService
|
||||||
.Register("Initial Setup, Step 8: Mod Import",
|
.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"
|
"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"
|
+ "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"
|
.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.")
|
+ "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.")
|
.Register("Mod Filters", "You can filter the available mods by name, author, changed items or various attributes here.")
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"net7.0-windows7.0": {
|
"net8.0-windows7.0": {
|
||||||
"EmbedIO": {
|
"EmbedIO": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[3.4.3, )",
|
"requested": "[3.4.3, )",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue