From cc2ff717590134b8dcfac1f0ee356e8e7e29ec4c Mon Sep 17 00:00:00 2001 From: LongerWarrior Date: Thu, 8 May 2025 00:55:28 +0300 Subject: [PATCH] Fixing 16bit bone weights and FMaterialInput converter --- CUE4Parse | 2 +- FModel/ViewModels/CUE4ParseViewModel.cs | 3 ++- FModel/Views/Snooper/Models/UModel.cs | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CUE4Parse b/CUE4Parse index 784b39af..340b7567 160000 --- a/CUE4Parse +++ b/CUE4Parse @@ -1 +1 @@ -Subproject commit 784b39afcec3d906f9830cc051c0d21378d02ebf +Subproject commit 340b7567fdc2ca050d9042389d09540be1044159 diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs index ea0b570f..eb4ad65e 100644 --- a/FModel/ViewModels/CUE4ParseViewModel.cs +++ b/FModel/ViewModels/CUE4ParseViewModel.cs @@ -606,6 +606,7 @@ public class CUE4ParseViewModel : ViewModel case "csv": case "pem": case "tps": + case "tgs": // State of Decay 2 case "lua": case "js": case "po": @@ -656,7 +657,7 @@ public class CUE4ParseViewModel : ViewModel { var archive = entry.CreateReader(); var wwise = new WwiseReader(archive); - TabControl.SelectedTab.SetDocumentText(JsonConvert.SerializeObject(wwise, Formatting.Indented), saveProperties, updateUi); + TabControl.SelectedTab.SetDocumentText(JsonConvert.SerializeObject(wwise, Formatting.Indented), saveProperties, updateUi); foreach (var (name, data) in wwise.WwiseEncodedMedias) { SaveAndPlaySound(entry.Path.SubstringBeforeWithLast('/') + name, "WEM", data); diff --git a/FModel/Views/Snooper/Models/UModel.cs b/FModel/Views/Snooper/Models/UModel.cs index a600d796..da3be5b4 100644 --- a/FModel/Views/Snooper/Models/UModel.cs +++ b/FModel/Views/Snooper/Models/UModel.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -163,8 +163,8 @@ public abstract class UModel : IRenderableModel int max = skelVert.Influences.Count; for (int j = 0; j < 8; j++) { - var boneID = j < max ? skelVert.Influences[j].Bone : (short) 0; - var weight = j < max ? skelVert.Influences[j].RawWeight : (byte) 0; + var boneID = j < max ? skelVert.Influences[j].Bone : (ushort) 0; + var weight = j < max ? skelVert.Influences[j].RawWeight : (ushort) 0; // Pack bone ID and weight Vertices[baseIndex + count++] = (boneID << 16) | weight;