Fixes

Shadowth117 · Dec 29, 2022 · ffac323 · ffac323
1 parent 015ecec
commit ffac323
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 36 deletions.
diff --git a/CharFileLibrary/CharFileLibrary.csproj b/CharFileLibrary/CharFileLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWPF>true</UseWPF>
@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Pfim" Version="0.10.0" />
+    <PackageReference Include="Pfim" Version="0.11.1" />
     <PackageReference Include="Reloaded.Memory" Version="4.1.1" />
     <PackageReference Include="System.Drawing.Common" Version="6.0.0-preview.5.21301.5" />
   </ItemGroup>

diff --git a/CharFileLibrary/Character_Making_File_Tool/IceHandler.cs b/CharFileLibrary/Character_Making_File_Tool/IceHandler.cs
@@ -205,7 +205,7 @@ public unsafe static BitmapSource GetFirstImageFromIce(string fileName)
 
         private unsafe static BitmapSource GetDDSBitMapSource(byte[] trueFile)
         {
-            using (var image = Pfim.Pfim.FromStream(new MemoryStream(trueFile)))
+            using (var image = Pfim.Pfimage.FromStream(new MemoryStream(trueFile)))
             {
                 PixelFormat format;
 

diff --git a/CharFileLibrary/Character_Making_File_Tool/Utilities/ModelUtility.cs b/CharFileLibrary/Character_Making_File_Tool/Utilities/ModelUtility.cs
@@ -627,7 +627,7 @@ public static TransformSet InterpolateTransforms(TransformSet tfmMin, TransformS
                     {
                         for (int j = 0; j < data.vector4Keys.Count; j++)
                         {
-                            int frame = data.frameTimings[j] / 0x10;
+                            int frame = (int)(data.frameTimings[j] / 0x10);
                             TransformSet tfm;
                             if (!propTransforms[frame].ContainsKey(i))
                             {
@@ -725,7 +725,7 @@ public static TransformSet InterpolateTransforms(TransformSet tfmMin, TransformS
                     {
                         for (int j = 0; j < data.vector4Keys.Count; j++)
                         {
-                            int frame = data.frameTimings[j] / 0x10;
+                            int frame = (int)(data.frameTimings[j] / 0x10);
                             TransformSet tfm;
                             if (!propTransforms[frame].ContainsKey(i))
                             {

diff --git a/CharFileLibrary/Libraries/AquaLib/AquaModelLibrary.Native.X64.dll b/CharFileLibrary/Libraries/AquaLib/AquaModelLibrary.Native.X64.dll
diff --git a/CharFileLibrary/Libraries/AquaLib/AquaModelLibrary.Native.X64.pdb b/CharFileLibrary/Libraries/AquaLib/AquaModelLibrary.Native.X64.pdb
diff --git a/CharFileLibrary/Libraries/AquaLib/AquaModelLibrary.Native.X86.dll.metagen b/CharFileLibrary/Libraries/AquaLib/AquaModelLibrary.Native.X86.dll.metagen
diff --git a/CharFileLibrary/Libraries/AquaLib/AquaModelLibrary.dll b/CharFileLibrary/Libraries/AquaLib/AquaModelLibrary.dll
diff --git a/CharFileLibrary/Libraries/AquaLib/ZamboniLib.dll b/CharFileLibrary/Libraries/AquaLib/ZamboniLib.dll
diff --git a/CharFileLibrary/Libraries/AquaLib/ZamboniLib.pdb b/CharFileLibrary/Libraries/AquaLib/ZamboniLib.pdb
diff --git a/Character Making File Tool/PSO2 Salon Tool.csproj b/Character Making File Tool/PSO2 Salon Tool.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <RootNamespace>PSO2_Salon_Tool</RootNamespace>

diff --git a/NGS Salon Tool/MainWindow.xaml.cs b/NGS Salon Tool/MainWindow.xaml.cs
@@ -73,6 +73,7 @@ public unsafe MainWindow()
 #if !DEBUG
             menu.Items.Remove(debugOptions);
 #endif
+            Debug.WriteLine($"test");
 
             //Disable unused items
             saveButton.IsEnabled = false;

diff --git a/NGS Salon Tool/NGS Salon Tool.csproj b/NGS Salon Tool/NGS Salon Tool.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <RootNamespace>NGS_Salon_Tool</RootNamespace>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
@@ -25,8 +25,8 @@
   <ItemGroup>
     <PackageReference Include="Extended.Wpf.Toolkit" Version="4.1.0" />
     <PackageReference Include="Microsoft-WindowsAPICodePack-ShellExtensions" Version="1.1.4" />
-    <PackageReference Include="Pfim" Version="0.10.0" />
-    <PackageReference Include="Reloaded.Memory" Version="4.1.2" />
+    <PackageReference Include="Pfim" Version="0.11.1" />
+    <PackageReference Include="Reloaded.Memory" Version="8.0.1" />
     <PackageReference Include="System.Drawing.Common" Version="6.0.0-preview.5.21301.5" />
   </ItemGroup>