Merge pull request #80 from dknezevic/master

Ensure GLB data is padded to 8-byte alignment so that validation checks pass

Author: HeDo88TH

Obj2Gltf/BufferState.cs

@@ -173,7 +173,7 @@ public int MakeNormalAccessors(string name)
                     Name = "Normals",
                     Buffer = _model.AddBuffer(NormalsBuffer),
                     ByteStride = 12,
-                    //Target = BufferViewTarget.ARRAY_BUFFER
+                    Target = BufferViewTarget.ARRAY_BUFFER
                 };
                 NormalsBufferViewIndex = _model.AddBufferView(NormalsBufferView);
             }
@@ -203,7 +203,7 @@ internal int MakeUvAccessor(string name)
                     Name = "Uvs",
                     Buffer = _model.AddBuffer(UvsBuffer),
                     ByteStride = 8,
-                    //Target = BufferViewTarget.ARRAY_BUFFER
+                    Target = BufferViewTarget.ARRAY_BUFFER
                 };
                 UvsBufferViewIndex = _model.AddBufferView(UvsBufferView);
             }

Obj2Tiles/Stages/TilingStage.cs

@@ -16,7 +16,7 @@ public static void Tile(string sourcePath, string destPath, int lods, double bas
     {
 
         Console.WriteLine(" ?> Working on objs conversion");
-        
+
         ConvertAllB3dm(sourcePath, destPath, lods);
 
         Console.WriteLine(" -> Generating tileset.json");
@@ -26,7 +26,7 @@ public static void Tile(string sourcePath, string destPath, int lods, double bas
             Console.WriteLine(" ?> Using default coordinates");
             coords = DefaultGpsCoords;
         }
-       
+
         // Don't ask me why 100, I have no idea but it works
         // https://github.com/CesiumGS/3d-tiles/issues/162
         //const int baseError = 100;
@@ -40,9 +40,7 @@ public static void Tile(string sourcePath, string destPath, int lods, double bas
             {
                 GeometricError = baseError,
                 Refine = "ADD",
-
                 Transform = coords.ToEcefTransform(),
-                Children = new List<TileElement>()
             }
         };
 
@@ -54,11 +52,11 @@ public static void Tile(string sourcePath, string destPath, int lods, double bas
         var minZ = double.MaxValue;
 
         var masterDescriptors = boundsMapper[0].Keys;
-        
+
         foreach (var descriptor in masterDescriptors)
         {
             var currentTileElement = tileset.Root;
-            
+
             var refBox = boundsMapper[0][descriptor];
 
             for (var lod = lods - 1; lod >= 0; lod--)
@@ -87,14 +85,15 @@ public static void Tile(string sourcePath, string destPath, int lods, double bas
                     {
                         GeometricError = lod == 0 ? 0 : CalculateGeometricError(refBox, box3, lod),
                         Refine = "REPLACE",
-                        Children = new List<TileElement>(),
                         Content = new Content
                         {
                             Uri = $"LOD-{lod}/{Path.GetFileNameWithoutExtension(descriptor)}.b3dm"
                         },
                         BoundingVolume = box3.ToBoundingVolume()
                     };
 
+                    if (currentTileElement.Children == null)
+                        currentTileElement.Children = new List<TileElement>();
                     currentTileElement.Children.Add(tile);
                     currentTileElement = tile;
                 }
@@ -116,7 +115,7 @@ private static double CalculateGeometricError(Box3 refBox, Box3 box, int lod)
         var dW = Math.Abs(refBox.Width - box.Width) / box.Width + 1;
         var dH = Math.Abs(refBox.Height - box.Height) / box.Height + 1;
         var dD = Math.Abs(refBox.Depth - box.Depth) / box.Depth + 1;
-       
+
         return Math.Pow(dW + dH + dD, lod);
 
     }

Obj2Tiles/Tiles/B3dm.cs

@@ -30,11 +30,14 @@ public byte[] ToBytes()
         {
             const int headerLength = 28;
 
-            var featureTableJson = BufferPadding.AddPadding(FeatureTableJson);
+            var featureTableJson = BufferPadding.AddPadding(FeatureTableJson, headerLength);
             var batchTableJson = BufferPadding.AddPadding(BatchTableJson);
             var featureTableBinary = BufferPadding.AddPadding(FeatureTableBinary);
             var batchTableBinary = BufferPadding.AddPadding(BatchTableBinary);
 
+            // Ensure GLB data is padded to 8-byte alignment
+            GlbData = BufferPadding.AddPadding(GlbData);
+
             B3dmHeader.ByteLength = GlbData.Length + headerLength + featureTableJson.Length + Encoding.UTF8.GetByteCount(batchTableJson) + batchTableBinary.Length + FeatureTableBinary.Length;
 
             B3dmHeader.FeatureTableJsonByteLength = featureTableJson.Length;