mirror of
https://github.com/4sval/FModel.git
synced 2026-04-26 00:04:53 -05:00
Merge branch '4sval:dev' into dev
This commit is contained in:
commit
6ff3c987d1
|
|
@ -1 +1 @@
|
||||||
Subproject commit b5a3fd7fc4463740e885ea1d17dc9a1697b3b9b9
|
Subproject commit 48c7cbbfe032ba1a2745d81c96d578718348a775
|
||||||
|
|
@ -177,6 +177,7 @@ public class CUE4ParseViewModel : ViewModel
|
||||||
new(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData) + "\\KONAMI\\eFootball\\ST\\Download")
|
new(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData) + "\\KONAMI\\eFootball\\ST\\Download")
|
||||||
], SearchOption.AllDirectories, versionContainer, pathComparer),
|
], SearchOption.AllDirectories, versionContainer, pathComparer),
|
||||||
_ when versionContainer.Game is EGame.GAME_AshEchoes => new AEDefaultFileProvider(gameDirectory, SearchOption.AllDirectories, versionContainer, pathComparer),
|
_ when versionContainer.Game is EGame.GAME_AshEchoes => new AEDefaultFileProvider(gameDirectory, SearchOption.AllDirectories, versionContainer, pathComparer),
|
||||||
|
_ when versionContainer.Game is EGame.GAME_BlackStigma => new DefaultFileProvider(gameDirectory, SearchOption.AllDirectories, versionContainer, StringComparer.Ordinal),
|
||||||
_ => new DefaultFileProvider(gameDirectory, SearchOption.AllDirectories, versionContainer, pathComparer)
|
_ => new DefaultFileProvider(gameDirectory, SearchOption.AllDirectories, versionContainer, pathComparer)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -131,7 +131,7 @@ public class Material : IDisposable
|
||||||
"Emissive Texture UVs RG_TopLeft BA_BottomRight",
|
"Emissive Texture UVs RG_TopLeft BA_BottomRight",
|
||||||
"Emissive 2 UV Positioning (RG)UpperLeft (BA)LowerRight",
|
"Emissive 2 UV Positioning (RG)UpperLeft (BA)LowerRight",
|
||||||
"EmissiveUVPositioning (RG)UpperLeft (BA)LowerRight",
|
"EmissiveUVPositioning (RG)UpperLeft (BA)LowerRight",
|
||||||
"Emissive_CH"))
|
"Emissive_CH", "EmissiveColor4LM"))
|
||||||
EmissiveRegion = new Vector4(EmissiveUVs.R, EmissiveUVs.G, EmissiveUVs.B, EmissiveUVs.A);
|
EmissiveRegion = new Vector4(EmissiveUVs.R, EmissiveUVs.G, EmissiveUVs.B, EmissiveUVs.A);
|
||||||
|
|
||||||
if ((Parameters.TryGetSwitch(out var swizzleRoughnessToGreen, "SwizzleRoughnessToGreen") && swizzleRoughnessToGreen) ||
|
if ((Parameters.TryGetSwitch(out var swizzleRoughnessToGreen, "SwizzleRoughnessToGreen") && swizzleRoughnessToGreen) ||
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user