[Feature]: KitbashTool: Possible to set animation matrix, for things such as building animations.

donkeyProgramming · donkeyProgramming · commit 5dda5d3bdd43 · 2025-03-01T21:00:47.000+01:00
diff --git a/Editors/ImportExportEditor/Editors.ImportExport/Importing/Importers/GltfToRmv/Helper/Rmv2FromGltfFIleConverter.cs b/Editors/ImportExportEditor/Editors.ImportExport/Importing/Importers/GltfToRmv/Helper/Rmv2FromGltfFIleConverter.cs
@@ -156,7 +156,7 @@ RmvModel CreateRmvModel(ModelMaterialEnum rigidMaterial, VertexFormat vertexForm
             {
                 var boneNames = skeleton.BoneNames;
                 var attachmentPoints = AttachmentPointHelper.CreateFromBoneList(boneNames);
-                newModel.Material.EnrichDataBeforeSaving(attachmentPoints);
+                newModel.Material.EnrichDataBeforeSaving(attachmentPoints, -1);
             }
 
             return newModel;
diff --git a/Editors/ImportExportEditor/Editors.ImportExport/Importing/Importers/GltfToRmv/Helper/RmvMeshBuilder.cs b/Editors/ImportExportEditor/Editors.ImportExport/Importing/Importers/GltfToRmv/Helper/RmvMeshBuilder.cs
@@ -202,7 +202,7 @@ private static RmvModel CreateRmvModel(RmvMesh rmv2Mesh, string modelName, Anima
             {
                 var boneNames = animSkeletonFile.Bones.Select(x => x.Name).ToList();
                 var attachmentPoints = AttachmentPointHelper.CreateFromBoneList(boneNames);
-                newModel.Material.EnrichDataBeforeSaving(attachmentPoints);
+                newModel.Material.EnrichDataBeforeSaving(attachmentPoints, -1);
             }
 
             return newModel;
diff --git a/Editors/Kitbashing/KitbasherEditor/Core/SceneNodeEditor/Nodes/MeshNode/Mesh.Animation/AnimationView.xaml b/Editors/Kitbashing/KitbasherEditor/Core/SceneNodeEditor/Nodes/MeshNode/Mesh.Animation/AnimationView.xaml
@@ -58,14 +58,23 @@
             <DockPanel DockPanel.Dock="Top" >
                 <Label Width ="{StaticResource labelWidth}" DockPanel.Dock="Left" Content="Attach To"/>
                 <Label>:</Label>
-                <ComboBox Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="0" 
+                <ComboBox
                           IsEditable="True"
                           IsTextSearchEnabled="false"
                           DisplayMemberPath="Name.Value"
                           Text="{Binding Animation.AttachableBones.Filter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" 
                           ItemsSource="{Binding Animation.AttachableBones.Values}" 
                           SelectedItem="{Binding Animation.AttachableBones.SelectedItem, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"/>
+
+               
+            </DockPanel>
+
+            <DockPanel DockPanel.Dock="Top"  >
+                <Label Width ="{StaticResource labelWidth}" DockPanel.Dock="Left" Content="Animation Matrix "/>
+                <Label>:</Label>
+                <TextBox DockPanel.Dock="Top" Margin="0,2,0,2"  Text="{Binding Animation.AnimationMatrixOverride, UpdateSourceTrigger=LostFocus}" MaxLength="8"  VerticalContentAlignment="Center" Width="100" HorizontalAlignment="Left" HorizontalContentAlignment="Right"/>
             </DockPanel>
+            
         </DockPanel>
     </Expander>
 </UserControl>
diff --git a/Editors/Kitbashing/KitbasherEditor/Core/SceneNodeEditor/Nodes/MeshNode/Mesh.Animation/AnimationViewModel.cs b/Editors/Kitbashing/KitbasherEditor/Core/SceneNodeEditor/Nodes/MeshNode/Mesh.Animation/AnimationViewModel.cs
@@ -13,11 +13,12 @@ public partial class AnimationViewModel : ObservableObject, IDisposable
     {
         private readonly KitbasherRootScene _kitbasherRootScene;
         private readonly SkeletonAnimationLookUpHelper _animLookUp;
-        Rmv2MeshNode _meshNode;
+        Rmv2MeshNode? _meshNode;
 
-        [ObservableProperty] string _skeletonName = string.Empty;
-        [ObservableProperty] List<AnimatedBone> _animatedBones;
-        [ObservableProperty] FilterCollection<AnimatedBone> _attachableBones = new(null);
+        [ObservableProperty] public partial string SkeletonName { get; set; } = string.Empty;
+        [ObservableProperty] public partial List<AnimatedBone> AnimatedBones  { get; set; }
+        [ObservableProperty] public partial FilterCollection<AnimatedBone> AttachableBones { get; set; } = new(null);
+        [ObservableProperty] public partial int AnimationMatrixOverride { get; set; } = -1;
 
         public AnimationViewModel(KitbasherRootScene kitbasherRootScene, SkeletonAnimationLookUpHelper animLookUp)
         {
@@ -29,6 +30,7 @@ public void Initialize(Rmv2MeshNode meshNode)
         {
             _meshNode = meshNode;
 
+            AnimationMatrixOverride = _meshNode.AnimationMatrixOverride;
             SkeletonName = _meshNode.Geometry.SkeletonName;
 
             var skeletonFile = _animLookUp.GetSkeletonFileFromName(SkeletonName);
@@ -89,6 +91,13 @@ private void ModelBoneList_SelectedItemChanged(AnimatedBone newValue)
             }
         }
 
+        partial void OnAnimationMatrixOverrideChanged(int value)
+        {
+            if(_meshNode==null) 
+                return;
+            _meshNode.AnimationMatrixOverride = value;
+        }
+
         public void Dispose()
         {
             AttachableBones.SelectedItemChanged -= ModelBoneList_SelectedItemChanged;
diff --git a/GameWorld/View3D/SceneNodes/Rmv2MeshNode.cs b/GameWorld/View3D/SceneNodes/Rmv2MeshNode.cs
@@ -33,7 +33,8 @@ public class Rmv2MeshNode : SceneNode, ITransformable, IEditableGeometry, ISelec
         public Vector3 PivotPoint { get; set; }
 
         public string AttachmentPointName { get; set; } = "";
-     
+        public int AnimationMatrixOverride { get; set; } = -1;
+
         public bool DisplayBoundingBox { get; set; } = false;
         public bool DisplayPivotPoint { get; set; } = false;
         public bool ReduceMeshOnLodGeneration { get; set; } = true;
@@ -58,6 +59,9 @@ public Rmv2MeshNode(MeshObject meshObject, IRmvMaterial material, CapabilityMate
 
             Name = material.ModelName;
             PivotPoint = material.PivotPoint;
+
+            if(material != null && material is WeightedMaterial weightedMaterial)
+                AnimationMatrixOverride = weightedMaterial.MatrixIndex;
         }
 
         private Rmv2MeshNode() { }
@@ -138,6 +142,7 @@ public void CopyInto(ISceneNode target, bool includeMesh)
             typedTarget.PivotPoint = PivotPoint;
 
             typedTarget.RmvMaterial = RmvMaterial.Clone();
+            typedTarget.AnimationMatrixOverride = AnimationMatrixOverride;
             typedTarget.Geometry = Geometry.Clone();
             typedTarget.Material = Material.Clone();
            
diff --git a/GameWorld/View3D/Services/SceneSaving/Geometry/NodeToRmvSaveHelper.cs b/GameWorld/View3D/Services/SceneSaving/Geometry/NodeToRmvSaveHelper.cs
@@ -80,7 +80,7 @@ RmvFile GenerateBytes(Rmv2ModelNode modelNode, RmvVersionEnum version, GameSkele
                 for (var meshIndex = 0; meshIndex < meshes.Count; meshIndex++)
                 {
                     var modelname = meshes[meshIndex].Name;
-                    rmvFile.ModelList[lodIndex][meshIndex] = CreateRmvModel(modelname, meshes[meshIndex].PivotPoint, meshes[meshIndex].Material, meshes[meshIndex].Geometry, skeleton, saveSettings.AttachmentPoints);
+                    rmvFile.ModelList[lodIndex][meshIndex] = CreateRmvModel(modelname, meshes[meshIndex].PivotPoint, meshes[meshIndex].Material, meshes[meshIndex].Geometry, skeleton, saveSettings.AttachmentPoints, meshes[meshIndex].AnimationMatrixOverride);
                 }
             }
 
@@ -90,7 +90,7 @@ RmvFile GenerateBytes(Rmv2ModelNode modelNode, RmvVersionEnum version, GameSkele
             return rmvFile;
         }
 
-        RmvModel CreateRmvModel(string modelName, Vector3 pivotPoint, CapabilityMaterial capabilityMaterial, MeshObject geometry, GameSkeleton? skeleton, List<RmvAttachmentPoint> attachmentPoints)
+        RmvModel CreateRmvModel(string modelName, Vector3 pivotPoint, CapabilityMaterial capabilityMaterial, MeshObject geometry, GameSkeleton? skeleton, List<RmvAttachmentPoint> attachmentPoints, int animationMatrixOverride)
         {
             var newRmvMaterial = new MaterialToRmvSerializer().CreateMaterialFromCapabilityMaterial(capabilityMaterial);
             newRmvMaterial.UpdateInternalState(geometry.VertexFormat);
@@ -108,7 +108,7 @@ RmvModel CreateRmvModel(string modelName, Vector3 pivotPoint, CapabilityMaterial
             newModel.UpdateModelTypeFlag(newModel.Material.MaterialId);
 
      
-            newModel.Material.EnrichDataBeforeSaving(attachmentPoints);
+            newModel.Material.EnrichDataBeforeSaving(attachmentPoints, animationMatrixOverride);
             
 
             return newModel;
diff --git a/Shared/GameFiles/RigidModel/MaterialHeaders/CustomTerrainMaterial.cs b/Shared/GameFiles/RigidModel/MaterialHeaders/CustomTerrainMaterial.cs
@@ -58,7 +58,7 @@ public List<RmvTexture> GetAllTextures()
             return new List<RmvTexture>();
         }
 
-        public void EnrichDataBeforeSaving(List<RmvAttachmentPoint> attachmentPoints)
+        public void EnrichDataBeforeSaving(List<RmvAttachmentPoint> attachmentPoints, int matrixOverride)
         {
             throw new NotImplementedException();
         }
diff --git a/Shared/GameFiles/RigidModel/MaterialHeaders/IRmvMaterial.cs b/Shared/GameFiles/RigidModel/MaterialHeaders/IRmvMaterial.cs
@@ -18,7 +18,7 @@ public interface IRmvMaterial
         void SetTexture(TextureType texureType, string path);
 
         void UpdateInternalState(UiVertexFormat uiVertexFormat);
-        void EnrichDataBeforeSaving(List<RmvAttachmentPoint> attachmentPoints);
+        void EnrichDataBeforeSaving(List<RmvAttachmentPoint> attachmentPoints, int matrixOverride);
     }
 
     public interface IMaterialCreator
diff --git a/Shared/GameFiles/RigidModel/MaterialHeaders/TerrainTileMaterial.cs b/Shared/GameFiles/RigidModel/MaterialHeaders/TerrainTileMaterial.cs
@@ -67,7 +67,7 @@ public void UpdateInternalState(UiVertexFormat uiVertexFormat)
             throw new NotImplementedException();
         }
 
-        public void EnrichDataBeforeSaving(List<RmvAttachmentPoint> attachmentPoints)
+        public void EnrichDataBeforeSaving(List<RmvAttachmentPoint> attachmentPoints, int matrixOverride)
         {
             throw new NotImplementedException();
         }
diff --git a/Shared/GameFiles/RigidModel/MaterialHeaders/WeightedMaterial.cs b/Shared/GameFiles/RigidModel/MaterialHeaders/WeightedMaterial.cs
@@ -212,10 +212,12 @@ internal void DetermineMaterial()
             }
         }
 
-        public void EnrichDataBeforeSaving(List<RmvAttachmentPoint> attachmentPoints)
+        public void EnrichDataBeforeSaving(List<RmvAttachmentPoint> attachmentPoints, int matrixOverride)
         {
             AttachmentPointParams.Clear();
             AttachmentPointParams.AddRange(attachmentPoints);
+
+            MatrixIndex = matrixOverride;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ RmvModel CreateRmvModel(ModelMaterialEnum rigidMaterial, VertexFormat vertexForm`
`156`	`156`	`{`
`157`	`157`	`var boneNames = skeleton.BoneNames;`
`158`	`158`	`var attachmentPoints = AttachmentPointHelper.CreateFromBoneList(boneNames);`
`159`		`- newModel.Material.EnrichDataBeforeSaving(attachmentPoints);`
	`159`	`+ newModel.Material.EnrichDataBeforeSaving(attachmentPoints, -1);`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`return newModel;`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ private static RmvModel CreateRmvModel(RmvMesh rmv2Mesh, string modelName, Anima`
`202`	`202`	`{`
`203`	`203`	`var boneNames = animSkeletonFile.Bones.Select(x => x.Name).ToList();`
`204`	`204`	`var attachmentPoints = AttachmentPointHelper.CreateFromBoneList(boneNames);`
`205`		`- newModel.Material.EnrichDataBeforeSaving(attachmentPoints);`
	`205`	`+ newModel.Material.EnrichDataBeforeSaving(attachmentPoints, -1);`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`return newModel;`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,12 @@ public partial class AnimationViewModel : ObservableObject, IDisposable`
`13`	`13`	`{`
`14`	`14`	`private readonly KitbasherRootScene _kitbasherRootScene;`
`15`	`15`	`private readonly SkeletonAnimationLookUpHelper _animLookUp;`
`16`		`- Rmv2MeshNode _meshNode;`
	`16`	`+ Rmv2MeshNode? _meshNode;`
`17`	`17`
`18`		`- [ObservableProperty] string _skeletonName = string.Empty;`
`19`		`- [ObservableProperty] List<AnimatedBone> _animatedBones;`
`20`		`- [ObservableProperty] FilterCollection<AnimatedBone> _attachableBones = new(null);`
	`18`	`+ [ObservableProperty] public partial string SkeletonName { get; set; } = string.Empty;`
	`19`	`+ [ObservableProperty] public partial List<AnimatedBone> AnimatedBones { get; set; }`
	`20`	`+ [ObservableProperty] public partial FilterCollection<AnimatedBone> AttachableBones { get; set; } = new(null);`
	`21`	`+ [ObservableProperty] public partial int AnimationMatrixOverride { get; set; } = -1;`
`21`	`22`
`22`	`23`	`public AnimationViewModel(KitbasherRootScene kitbasherRootScene, SkeletonAnimationLookUpHelper animLookUp)`
`23`	`24`	`{`
`@@ -29,6 +30,7 @@ public void Initialize(Rmv2MeshNode meshNode)`
`29`	`30`	`{`
`30`	`31`	`_meshNode = meshNode;`
`31`	`32`
	`33`	`+ AnimationMatrixOverride = _meshNode.AnimationMatrixOverride;`
`32`	`34`	`SkeletonName = _meshNode.Geometry.SkeletonName;`
`33`	`35`
`34`	`36`	`var skeletonFile = _animLookUp.GetSkeletonFileFromName(SkeletonName);`
`@@ -89,6 +91,13 @@ private void ModelBoneList_SelectedItemChanged(AnimatedBone newValue)`
`89`	`91`	`}`
`90`	`92`	`}`
`91`	`93`
	`94`	`+ partial void OnAnimationMatrixOverrideChanged(int value)`
	`95`	`+ {`
	`96`	`+ if(_meshNode==null)`
	`97`	`+ return;`
	`98`	`+ _meshNode.AnimationMatrixOverride = value;`
	`99`	`+ }`
	`100`	`+`
`92`	`101`	`public void Dispose()`
`93`	`102`	`{`
`94`	`103`	`AttachableBones.SelectedItemChanged -= ModelBoneList_SelectedItemChanged;`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ RmvFile GenerateBytes(Rmv2ModelNode modelNode, RmvVersionEnum version, GameSkele`
`80`	`80`	`for (var meshIndex = 0; meshIndex < meshes.Count; meshIndex++)`
`81`	`81`	`{`
`82`	`82`	`var modelname = meshes[meshIndex].Name;`
`83`		`- rmvFile.ModelList[lodIndex][meshIndex] = CreateRmvModel(modelname, meshes[meshIndex].PivotPoint, meshes[meshIndex].Material, meshes[meshIndex].Geometry, skeleton, saveSettings.AttachmentPoints);`
	`83`	`+ rmvFile.ModelList[lodIndex][meshIndex] = CreateRmvModel(modelname, meshes[meshIndex].PivotPoint, meshes[meshIndex].Material, meshes[meshIndex].Geometry, skeleton, saveSettings.AttachmentPoints, meshes[meshIndex].AnimationMatrixOverride);`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
`@@ -90,7 +90,7 @@ RmvFile GenerateBytes(Rmv2ModelNode modelNode, RmvVersionEnum version, GameSkele`
`90`	`90`	`return rmvFile;`
`91`	`91`	`}`
`92`	`92`
`93`		`- RmvModel CreateRmvModel(string modelName, Vector3 pivotPoint, CapabilityMaterial capabilityMaterial, MeshObject geometry, GameSkeleton? skeleton, List<RmvAttachmentPoint> attachmentPoints)`
	`93`	`+ RmvModel CreateRmvModel(string modelName, Vector3 pivotPoint, CapabilityMaterial capabilityMaterial, MeshObject geometry, GameSkeleton? skeleton, List<RmvAttachmentPoint> attachmentPoints, int animationMatrixOverride)`
`94`	`94`	`{`
`95`	`95`	`var newRmvMaterial = new MaterialToRmvSerializer().CreateMaterialFromCapabilityMaterial(capabilityMaterial);`
`96`	`96`	`newRmvMaterial.UpdateInternalState(geometry.VertexFormat);`
`@@ -108,7 +108,7 @@ RmvModel CreateRmvModel(string modelName, Vector3 pivotPoint, CapabilityMaterial`
`108`	`108`	`newModel.UpdateModelTypeFlag(newModel.Material.MaterialId);`
`109`	`109`
`110`	`110`
`111`		`- newModel.Material.EnrichDataBeforeSaving(attachmentPoints);`
	`111`	`+ newModel.Material.EnrichDataBeforeSaving(attachmentPoints, animationMatrixOverride);`
`112`	`112`
`113`	`113`
`114`	`114`	`return newModel;`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public List<RmvTexture> GetAllTextures()`
`58`	`58`	`return new List<RmvTexture>();`
`59`	`59`	`}`
`60`	`60`
`61`		`- public void EnrichDataBeforeSaving(List<RmvAttachmentPoint> attachmentPoints)`
	`61`	`+ public void EnrichDataBeforeSaving(List<RmvAttachmentPoint> attachmentPoints, int matrixOverride)`
`62`	`62`	`{`
`63`	`63`	`throw new NotImplementedException();`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public interface IRmvMaterial`
`18`	`18`	`void SetTexture(TextureType texureType, string path);`
`19`	`19`
`20`	`20`	`void UpdateInternalState(UiVertexFormat uiVertexFormat);`
`21`		`- void EnrichDataBeforeSaving(List<RmvAttachmentPoint> attachmentPoints);`
	`21`	`+ void EnrichDataBeforeSaving(List<RmvAttachmentPoint> attachmentPoints, int matrixOverride);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`public interface IMaterialCreator`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public void UpdateInternalState(UiVertexFormat uiVertexFormat)`
`67`	`67`	`throw new NotImplementedException();`
`68`	`68`	`}`
`69`	`69`
`70`		`- public void EnrichDataBeforeSaving(List<RmvAttachmentPoint> attachmentPoints)`
	`70`	`+ public void EnrichDataBeforeSaving(List<RmvAttachmentPoint> attachmentPoints, int matrixOverride)`
`71`	`71`	`{`
`72`	`72`	`throw new NotImplementedException();`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -212,10 +212,12 @@ internal void DetermineMaterial()`
`212`	`212`	`}`
`213`	`213`	`}`
`214`	`214`
`215`		`- public void EnrichDataBeforeSaving(List<RmvAttachmentPoint> attachmentPoints)`
	`215`	`+ public void EnrichDataBeforeSaving(List<RmvAttachmentPoint> attachmentPoints, int matrixOverride)`
`216`	`216`	`{`
`217`	`217`	`AttachmentPointParams.Clear();`
`218`	`218`	`AttachmentPointParams.AddRange(attachmentPoints);`
	`219`	`+`
	`220`	`+ MatrixIndex = matrixOverride;`
`219`	`221`	`}`
`220`	`222`	`}`
`221`	`223`