Merge pull request vpenades#276 from bertt/fix_list_of_bools_serialization

3D Tiles: Fix list of booleans serialization

Author: vpenades

src/SharpGLTF.Ext.3DTiles/Memory/BinaryTable.cs

@@ -14,8 +14,14 @@ namespace SharpGLTF.Memory
     /// </summary>
     public static class BinaryTable
     {
-        public static List<byte> GetBytesForArray<T>(List<List<T>> values)
+        public static List<byte> ConvertJaggedListToBytes<T>(List<List<T>> values)
         {
+            var type = typeof(T);
+            if(type == typeof(bool))
+            {
+                var booleanBytes = ConvertJaggedListOfBooleansToBytes(values.Cast<List<bool>>().ToList());
+                return booleanBytes;
+            }
             var bytes = new List<byte>();
             foreach (var value in values)
             {
@@ -26,7 +32,6 @@ public static List<byte> GetBytesForArray<T>(List<List<T>> values)
             return bytes;
         }
 
-
         /// <summary>
         /// Converts a list of primitive types into a byte array
         /// </summary>
@@ -81,6 +86,14 @@ public static byte[] GetBytes<T>(IReadOnlyList<T> values)
             }
         }
 
+        private static List<byte> ConvertJaggedListOfBooleansToBytes(List<List<bool>> values)
+        {
+            var bits = new BitArray(values.SelectMany(x => x).ToArray());
+            var boolBytes = new byte[(bits.Length - 1) / 8 + 1];
+            bits.CopyTo(boolBytes, 0);
+            return boolBytes.ToList();
+        }
+
         private static byte[] Matrix4x4ToBytes<T>(IReadOnlyList<T> values)
         {
             var result = new byte[values.Count * 64];

src/SharpGLTF.Ext.3DTiles/Schema2/Ext.StructuralMetadataRoot.cs

@@ -874,7 +874,7 @@ private static int GetBufferView<T>(ModelRoot model, IReadOnlyList<T> values)
 
             private static int GetBufferView<T>(ModelRoot model, List<List<T>> values)
             {
-                List<byte> bytes = BinaryTable.GetBytesForArray(values);
+                List<byte> bytes = BinaryTable.ConvertJaggedListToBytes(values);
                 var bufferView = model.UseBufferView(bytes.ToArray());
                 int logicalIndex = bufferView.LogicalIndex;
                 return logicalIndex;

tests/SharpGLTF.Ext.3DTiles.Tests/Memory/BinaryTableTests.cs

@@ -8,12 +8,30 @@ namespace SharpGLTF.Memory
     public class BinaryTableTests
     {
         [Test]
-        public void ConvertListofListofIntToBytes()
+        public void ConvertJaggedListOfBoolsToBytes()
+        {
+            var values = new List<List<bool>>();
+            values.Add(new List<bool>() { true, false });
+            values.Add(new List<bool>() { false, true });
+            var bytes = BinaryTable.ConvertJaggedListToBytes(values);
+            // Check size, should be 1 byte for 4 bits
+            Assert.That(bytes.Count, Is.EqualTo(1));
+
+            // read the bits back
+            var bits = new System.Collections.BitArray(bytes.ToArray());
+            Assert.That(bits[0], Is.EqualTo(true));
+            Assert.That(bits[1], Is.EqualTo(false));
+            Assert.That(bits[2], Is.EqualTo(false));
+            Assert.That(bits[3], Is.EqualTo(true));
+        }
+
+        [Test]
+        public void ConvertJaggedListOfIntsToBytes()
         {
             var values = new List<List<int>>();
             values.Add(new List<int>() { 0, 1 });
             values.Add(new List<int>() { 2, 3 });
-            var bytes = BinaryTable.GetBytesForArray(values);
+            var bytes = BinaryTable.ConvertJaggedListToBytes(values);
             Assert.That(bytes.Count, Is.EqualTo(BinaryTable.GetSize<int>() * 4));
         }