Support binary files

.gitignore

@@ -194,3 +194,4 @@ _scratch*
 *.pyc
 .vs
 .DS_Store
+*.blend1

FbxCli/InflateCommand.cs

@@ -0,0 +1,83 @@
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using NCommander;
+
+namespace FbxCli;
+
+public class InflateCommand : Command
+{
+    public static readonly InflateCommand Value = new();
+
+    private InflateCommand()
+    {
+        Name = "inflate";
+        Description = "Decompress a sequence of bytes";
+        Params =
+        [
+            new Parameter
+            {
+                Name = "filename",
+                Description = "File to get the bytes from",
+                ParameterType = ParameterType.String,
+                IsOptional = true,
+            }
+        ];
+        Options =
+        [
+            new Option
+            {
+                Name = "hex-out",
+                Description = "Display the output as a space-separated sequence of hexadecimal bytes",
+                Type = ParameterType.Flag,
+            }
+        ];
+    }
+
+    protected override void InternalExecute(Dictionary<string, object> args)
+    {
+        var filename = string.Empty;
+        if (args.ContainsKey("filename"))
+            filename = (string)args["filename"];
+
+        var hexOut = false;
+        if (args.ContainsKey("hex-out"))
+            hexOut = (bool)args["hex-out"];
+
+        using var stream = (
+            string.IsNullOrWhiteSpace(filename) || filename == "-"
+                ? System.Console.OpenStandardInput()
+                : File.Open(filename, FileMode.Open));
+        using var zs = new ZLibStream(stream, CompressionMode.Decompress,
+            true);
+        using var stdout = System.Console.OpenStandardOutput();
+        using var writer = System.Console.Out;
+
+        var total = 0;
+        var buffer = new byte[4096];
+        while (true)
+        {
+            var numBytesRead = zs.Read(buffer, 0, 4096);
+            if (numBytesRead < 1)
+                break;
+            total += numBytesRead;
+            if (hexOut)
+            {
+                int i;
+                for (i = 0; i < numBytesRead; i++)
+                {
+                    writer.Write("{0:x2} ", buffer[i]);
+                    if (i % 16 == 7)
+                        writer.Write(" ");
+                    if (i % 16 == 15)
+                        writer.WriteLine();
+                }
+
+                if (i % 16 != 0)
+                    writer.WriteLine();
+            }
+            else
+                stdout.Write(buffer, 0, numBytesRead);
+        }
+    }
+}

FbxCli/LsCommand.cs

@@ -251,8 +251,8 @@ void SetIndexes(int n)
                     Console.WriteLine($"    Frame count precise: {t.GetFrameCountPrecise()}");
                     Console.WriteLine($"    Field count:         {t.GetFieldCount()}");
                     Console.WriteLine($"  Global time mode:      {FbxTime.GetGlobalTimeMode()}");
-                    Console.WriteLine($"  FBXSDK_TC_MILLISECOND: {FbxTime.FBXSDK_TC_MILLISECOND}");
-                    Console.WriteLine($"  FBXSDK_TC_SECOND:      {FbxTime.FBXSDK_TC_SECOND}");
+                    Console.WriteLine($"  FBXSDK_TC_MILLISECOND: {FbxTimeCode.FBXSDK_TC_MILLISECOND}");
+                    Console.WriteLine($"  FBXSDK_TC_SECOND:      {FbxTimeCode.FBXSDK_TC_SECOND}");
                     break;
                 case "sprop":
                     N = obj.GetSrcPropertyCount();

FbxCli/PrintCommand.cs

@@ -70,14 +70,24 @@ protected override void InternalExecute(Dictionary<string, object> args)
                 }
                 if (parse)
                 {
-                    using (var reader = new StreamReader(filename))
+                    var fhi = FbxImporter.GetFileHeaderInfo(filename);
+                    List<ParseObject> parseObjects = null;
+                    if (fhi.mBinary)
+                    {
+                        using var fs = File.OpenRead(filename);
+                        var bp = BinaryParser.FromFileVersion(fhi.mFileVersion, fs, filename);
+                        fs.Seek(27, SeekOrigin.Begin);
+                        parseObjects = bp.ReadFile();
+                    }
+                    else
                     {
+                        using var reader = new StreamReader(filename);
                         var p = new Parser(new Tokenizer(reader, filename:filename));
-                        var objs = p.ReadFile();
-                        foreach (var obj in objs)
-                        {
-                            PrintParseObject(obj);
-                        }
+                        parseObjects = p.ReadFile();
+                    }
+                    foreach (var obj in parseObjects)
+                    {
+                        PrintParseObject(obj);
                     }
                     continue;
                 }

FbxCli/Program.cs

@@ -11,6 +11,7 @@ public static void Main(string[] args)
                 PrintCommand.Value);
             commander.Commands.Add(ExploreCommand.Value.Name,
                 ExploreCommand.Value);
+            commander.Commands.Add(InflateCommand.Value.Name, InflateCommand.Value);
             if (args == null || args.Length < 1)
             {
                 commander.ProcessArgs("help");

FbxCppTests/AnimCurveNodeTest.cpp

@@ -12,7 +12,7 @@ void AnimCurveNodeTest_Create_NoChannels()
     FbxAnimCurveNode* acn = FbxAnimCurveNode::Create(manager, "");
 
     // then:
-    AssertEqual(0, acn->GetChannelsCount());
+    AssertEqual(0, (signed int)acn->GetChannelsCount());
     AssertEqual(1, CountProperties(acn));
 }
 
@@ -23,15 +23,15 @@ void AnimCurveNodeTest_AddChannel_TwoPropertiesOneChannel()
     FbxAnimCurveNode* acn = FbxAnimCurveNode::Create(manager, "");
 
     // require:
-    AssertEqual(0, acn->GetChannelsCount());
+    AssertEqual(0, (signed int)acn->GetChannelsCount());
     AssertEqual(1, CountProperties(acn));
 
     // when:
     acn->AddChannel<float>("channel1", 0.0f);
 
     // then:
     AssertEqual(2, CountProperties(acn));
-    AssertEqual(1, acn->GetChannelsCount());
+    AssertEqual(1, (signed int)acn->GetChannelsCount());
     AssertEqual(0, acn->GetCurveCount(0));
 
     FbxProperty prop = acn->GetFirstProperty();
@@ -51,15 +51,15 @@ void AnimCurveNodeTest_ConnectToChannel_AddsSrcConnection()
 
     // require:
     AssertEqual(2, CountProperties(acn));
-    AssertEqual(1, acn->GetChannelsCount());
+    AssertEqual(1, (signed int)acn->GetChannelsCount());
     AssertEqual(0, acn->GetCurveCount(0));
 
     // when:
     acn->ConnectToChannel(ac, 0U);
 
     // then:
     AssertEqual(2, CountProperties(acn));
-    AssertEqual(1, acn->GetChannelsCount());
+    AssertEqual(1, (signed int)acn->GetChannelsCount());
     AssertEqual(1, acn->GetCurveCount(0));
     AssertEqual(1, ac->GetDstPropertyCount());
     AssertEqual("channel1", ac->GetDstProperty(0).GetName());

FbxCppTests/AnimCurveTest.cpp

@@ -496,6 +496,75 @@ void FbxAnimCurve_Create_HasNamespacePrefix()
     AssertEqual("AnimCurve::", obj->GetNameSpacePrefix());
 }
 
+void FbxAnimCurve_KeyGet()
+{
+    // given:
+    FbxManager* manager = FbxManager::Create();
+    FbxAnimCurve* ac = FbxAnimCurve::Create(manager, "asdf");
+
+    // expect:
+    AssertEqual(0, ac->KeyGetCount());
+
+    // when:
+    FbxTime* time;
+    time = new FbxTime(100);
+    FbxAnimCurveKey key = FbxAnimCurveKey(*time, 1.5f);
+    int i;
+    i = ac->KeyAdd(*time, key);
+    AssertEqual(0, i);
+
+    // then:
+    AssertEqual(1, ac->KeyGetCount());
+    FbxAnimCurveKey key2;
+    key2 = ac->KeyGet(0);
+    AssertEqual(100LL, key2.GetTime().Get());
+    AssertEqual(1.5f, key.GetValue());
+}
+
+void FbxAnimCurve_KeyGet_KeysAreSortedByTimeValue()
+{
+    // given:
+    FbxManager* manager = FbxManager::Create();
+    FbxAnimCurve* ac = FbxAnimCurve::Create(manager, "asdf");
+    FbxTime* time;
+    time = new FbxTime(0);
+    FbxAnimCurveKey key1 = FbxAnimCurveKey(*time, 0.5f);
+    int i;
+    i = ac->KeyAdd(*time, key1);
+    AssertEqual(0, i);
+    time = new FbxTime(2000);
+    FbxAnimCurveKey key2 = FbxAnimCurveKey(*time, 2.5f);
+    i = ac->KeyAdd(*time, key2);
+    AssertEqual(1, i);
+
+    // expect:
+    AssertEqual(2, ac->KeyGetCount());
+    FbxAnimCurveKey key = ac->KeyGet(0);
+    AssertEqual(0LL, key.GetTime().Get());
+    AssertEqual(0.5f, key.GetValue());
+    key = ac->KeyGet(1);
+    AssertEqual(2000LL, key.GetTime().Get());
+    AssertEqual(2.5f, key.GetValue());
+
+    // when:
+    time = new FbxTime(1000);
+    FbxAnimCurveKey key3 = FbxAnimCurveKey(*time, 1.5f);
+    i = ac->KeyAdd(*time, key3);
+    AssertEqual(1, i);
+
+    // then:
+    AssertEqual(3, ac->KeyGetCount());
+    key = ac->KeyGet(0);
+    AssertEqual(0LL, key.GetTime().Get());
+    AssertEqual(0.5f, key.GetValue());
+    key = ac->KeyGet(1);
+    AssertEqual(1000LL, key.GetTime().Get());
+    AssertEqual(1.5f, key.GetValue());
+    key = ac->KeyGet(2);
+    AssertEqual(2000LL, key.GetTime().Get());
+    AssertEqual(2.5f, key.GetValue());
+}
+
 void AnimCurveTest::RegisterTestCases()
 {
     AddTestCase(AnimCurveDef_Defaults);
@@ -509,5 +578,7 @@ void AnimCurveTest::RegisterTestCases()
     AddTestCase(AnimCurve_ThreeKeyVaryInTime_EvaluationsAreCorrect);
     AddTestCase(AnimCurve_ThreeKeyVaryInValue_EvaluationsAreCorrect);
     AddTestCase(FbxAnimCurve_Create_HasNamespacePrefix);
+    AddTestCase(FbxAnimCurve_KeyGet);
+    AddTestCase(FbxAnimCurve_KeyGet_KeysAreSortedByTimeValue);
 }
 

FbxCppTests/Assertions.cpp

@@ -1,5 +1,6 @@
 
 #include "Assertions.h"
+#include "print.h"
 
 #include <sstream>
 
@@ -40,6 +41,11 @@ void _AssertEqual(const char* expected, FbxString& actual, const char* filename,
     _AssertEqual(expected, actual.Buffer(), filename, line);
 }
 
+void _AssertEqual(string& expected, FbxString& actual, const char* filename, int line)
+{
+    _AssertEqual(expected.c_str(), actual.Buffer(), filename, line);
+}
+
 void _AssertEqual(FbxVector4 expected, FbxVector4 actual, const char* filename, int line)
 {
     if (expected != actual)
@@ -153,12 +159,72 @@ void _AssertEqual(FbxLongLong expected, FbxLongLong actual, const char* filename
     }
 }
 
-void _AssertNotEqual(void* expected, void* actual, const char* filename, int line)
+void _AssertEqual(FbxDateTime expected, FbxDateTime actual, const char* filename, int line)
+{
+    if (expected != actual)
+    {
+        stringstream ss;
+        ss << "Expected " << expected << " but got " << actual << ", at " << filename << ":" << line;
+        throw new string(ss.str());
+    }
+}
+
+void _AssertEqual(FbxDataType expected, FbxDataType actual, const char* filename, int line)
+{
+    if (!(expected == actual))
+    {
+        stringstream ss;
+        ss << "Expected " << expected << " but got " << actual << ", at " << filename << ":" << line;
+        throw new string(ss.str());
+    }
+}
+
+void _AssertEqual(long expected, long actual, const char* filename, int line)
+{
+    if (!(expected == actual))
+    {
+        stringstream ss;
+        ss << "Expected " << expected << " but got " << actual << ", at " << filename << ":" << line;
+        throw new string(ss.str());
+    }
+}
+
+void _AssertEqual(long expected, FbxLongLong actual, const char* filename, int line)
+{
+    if (!(expected == actual))
+    {
+        stringstream ss;
+        ss << "Expected " << expected << " but got " << actual << ", at " << filename << ":" << line;
+        throw new string(ss.str());
+    }
+}
+
+void _AssertEqual(int expected, long actual, const char* filename, int line)
+{
+    _AssertEqual((long)expected, actual, filename, line);
+}
+
+void _AssertEqual(FbxTime expected, FbxTime actual, const char* filename, int line)
+{
+    _AssertEqual(expected.Get(), actual.Get(), filename, line);
+}
+
+void _AssertNotEqual(void* not_expected, void* actual, const char* filename, int line)
+{
+    if (not_expected == actual)
+    {
+        stringstream ss;
+        ss << "Expected not(" << not_expected << ") but got " << actual << ", at " << filename << ":" << line;
+        throw new string(ss.str());
+    }
+}
+
+void _AssertNotEqual(FbxDataType not_expected, FbxDataType actual, const char* filename, int line)
 {
-    if (expected == actual)
+    if (not_expected == actual)
     {
         stringstream ss;
-        ss << "Expected not(" << expected << ") but got " << actual << ", at " << filename << ":" << line;
+        ss << "Expected not equal to " << not_expected << " but got " << actual << ", at " << filename << ":" << line;
         throw new string(ss.str());
     }
 }

FbxCppTests/Assertions.h

@@ -2,18 +2,27 @@
 #ifndef __FBXCPPTESTS_ASSERTIONS_H
 #define __FBXCPPTESTS_ASSERTIONS_H
 
+#include <string>
 #include <fbxsdk.h>
 
 void _AssertEqual(int expected, int actual, const char* filename, int line);
 void _AssertEqual(void* expected, void* actual, const char* filename, int line);
 void _AssertEqual(const char* expected, const char* actual, const char* filename, int line);
 void _AssertEqual(const char* expected, FbxString& actual, const char* filename, int line);
+void _AssertEqual(std::string& expected, FbxString& actual, const char* filename, int line);
 void _AssertEqual(FbxVector4 expected, FbxVector4 actual, const char* filename, int line);
 void _AssertEqual(double expected, double actual, const char* filename, int line, double epsilon=0);
 void _AssertEqual(FbxMatrix expected, FbxMatrix actual, const char* filename, int line, double epsilon=0);
 void _AssertEqual(FbxAMatrix expected, FbxAMatrix actual, const char* filename, int line, double epsilon=0);
 void _AssertEqual(FbxLongLong expected, FbxLongLong actual, const char* filename, int line);
+void _AssertEqual(FbxDateTime expected, FbxDateTime actual, const char* filename, int line);
+void _AssertEqual(FbxDataType expected, FbxDataType actual, const char* filename, int line);
+void _AssertEqual(long expected, long actual, const char* filename, int line);
+void _AssertEqual(long expected, FbxLongLong actual, const char* filename, int line);
+void _AssertEqual(int expected, long actual, const char* filename, int line);
+void _AssertEqual(FbxTime expected, FbxTime actual, const char* filename, int line);
 void _AssertNotEqual(void* expected, void* actual, const char* filename, int line);
+void _AssertNotEqual(FbxDataType expected, FbxDataType actual, const char* filename, int line);
 void _AssertNull(void* actual, const char* filename, int line);
 void _AssertNotNull(void* actual, const char* filename, int line);
 void _AssertTrue(bool condition, const char* filename, int line);