Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-09-14 20:46:45 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fixed non-zero SetProperties + fixed normal map textures

Browse Source
This commit is contained in:
iAmAsval
2020-09-03 23:29:18 +02:00
parent b5560d55b9
commit 5b8bfa6be6
5 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
FModel/FModel.csproj
View File

@@ -20,11 +20,10 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PlatformTarget>x64</PlatformTarget>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>1701;1702;NU1701</NoWarn>
<PlatformTarget>x64</PlatformTarget>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>1701;1702;NU1701</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PlatformTarget>x64</PlatformTarget>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

6
FModel/PakReader/Parsers/PropertyTagData/SetProperty.cs
View File

@@ -1,4 +1,3 @@
using System;
using PakReader.Parsers.Objects;
namespace PakReader.Parsers.PropertyTagData
@@ -10,10 +9,9 @@ namespace PakReader.Parsers.PropertyTagData
{
Position = reader.Position;
var NumKeysToRemove = reader.ReadInt32();
if (NumKeysToRemove != 0)
for (int i = 0; i < NumKeysToRemove; i++)
{
// Let me know if you find a package that has a non-zero NumKeysToRemove value
throw new NotImplementedException("Parsing of non-zero NumKeysToRemove sets aren't supported yet.");
ReadAsObject(reader, tag, tag.InnerType, ReadType.ARRAY); // read in the air? uh ok
}
var NumEntries = reader.ReadInt32();

4
FModel/PakReader/Textures/TextureDecoder.cs
View File

@@ -36,11 +36,11 @@ namespace PakReader.Textures
break;
case EPixelFormat.PF_BC5:
data = BCDecoder.DecodeBC5(sequence, width, height);
colorType = SKColorType.Bgra8888;
colorType = SKColorType.Rgb888x;
break;
case EPixelFormat.PF_BC4:
data = BCDecoder.DecodeBC4(sequence, width, height);
colorType = SKColorType.Bgra8888;
colorType = SKColorType.Rgb888x;
break;
case EPixelFormat.PF_G8:
data = sequence;

26
FModel/Properties/Settings.Designer.cs generated
View File

@@ -12,7 +12,7 @@ namespace FModel.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.6.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.7.0.0")]
public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -59,18 +59,6 @@ namespace FModel.Properties {
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool ReloadAesKeys {
get {
return ((bool)(this["ReloadAesKeys"]));
}
set {
this["ReloadAesKeys"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
@@ -514,5 +502,17 @@ namespace FModel.Properties {
this["SkipVersion"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool ReloadAesKeys {
get {
return ((bool)(this["ReloadAesKeys"]));
}
set {
this["ReloadAesKeys"] = value;
}
}
}
}

6
FModel/Properties/Settings.settings
View File

@@ -11,9 +11,6 @@
<Setting Name="UpdateSettings" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="ReloadAesKeys" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="AutoOpenSounds" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
@@ -125,5 +122,8 @@
<Setting Name="SkipVersion" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="ReloadAesKeys" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
</Settings>
</SettingsFile>