Merge pull request #1093 from Zurphing/anbmaker-update

[ANBMaker] Add a motiontrigger BAR entry to created ANBs alongside outputting an MSET version of the ANB.
OpenKH · Aug 8, 2024 · 857d5eb · 857d5eb
2 parents 0fb213c + 11e9ac9
commit 857d5eb
Showing 1 changed file with 24 additions and 1 deletion.
diff --git a/OpenKh.Command.AnbMaker/Commands/AnbExCommand.cs b/OpenKh.Command.AnbMaker/Commands/AnbExCommand.cs
@@ -10,6 +10,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.IO;
 using System.Linq;
 using System.Numerics;
 using System.Reflection;
@@ -29,6 +30,7 @@ internal class AnbExCommand : IFbxSourceItemSelector, IMsetInjector
 
         [Argument(1, Description = "anb output")]
         public string Output { get; set; }
+        public string OutputMset { get; set; }
 
         [Option(Description = "specify root armature node name", ShortName = "r")]
         public string RootName { get; set; }
@@ -56,7 +58,7 @@ protected int OnExecute(CommandLineApplication app)
             var logger = LogManager.GetLogger("InterpolatedMotionMaker");
 
             Output = Path.GetFullPath(Output ?? Path.GetFileNameWithoutExtension(InputModel) + ".anb");
-
+            OutputMset = Path.GetFullPath(OutputMset ?? Path.GetFileNameWithoutExtension(InputModel) + ".mset");
             Console.WriteLine($"Writing to: {Output}");
 
             IEnumerable<BasicSourceMotion> parms;
@@ -117,12 +119,33 @@ protected int OnExecute(CommandLineApplication app)
                             Type = Bar.EntryType.Motion,
                             Name = "A999",
                             Stream = motionStream,
+                        },
+                        new Bar.Entry
+                        {
+                            Type = Bar.EntryType.MotionTriggers,
+                            Name = "A999",
+                            Stream = new MemoryStream()  // Replace null with MemoryStream containing "0"
                         }
                     }
                 );
 
+                var msetBarStream = new MemoryStream();
+                Bar.Write(
+                msetBarStream,
+                    new Bar.Entry[]
+                    {
+                        new Bar.Entry
+                        {
+                            Type = Bar.EntryType.Anb,
+                            Name = "A999",
+                            Stream = anbBarStream
+                        }
+                    }
+               );
+
                 File.WriteAllBytes(Output, anbBarStream.ToArray());
                 File.WriteAllBytes(Output + ".raw", motionStream.ToArray());
+                File.WriteAllBytes(OutputMset, msetBarStream.ToArray());
 
                 logger.Debug($"Motion data generation successful");