Merge pull request #46 from DomCR/glb-refactor

glb refactor

Author: DomCR

README.md

@@ -19,8 +19,10 @@ MeshIO allows to read or create 3D files using .Net and also extract or modify e
 FBX6000 |    :heavy_check_mark:    |   :heavy_check_mark:     |    :heavy_check_mark:    |    :heavy_check_mark:    |
 FBX7000 |    :heavy_check_mark:    |   :heavy_check_mark:     |    :heavy_check_mark:    |    :heavy_check_mark:    |
 STL     |    :heavy_check_mark:    |   :heavy_check_mark:     |    :heavy_check_mark:    |    :heavy_check_mark:    |
-GLB     |                          |   :heavy_check_mark:     |        |    :construction:    |
-GLTF    |    :construction:    |        |    :construction:    |        |
+GLB V1  |                          |   :heavy_check_mark:     |        |    :x:    |
+GLB V2  |                          |   :heavy_check_mark:     |        |    :construction:    |
+GLTF V1 |    :construction:    |        |    :x:    |        |
+GLTF V2 |    :construction:    |        |    :construction:    |        |
 OBJ     |    :heavy_check_mark:    |        |    :construction:    |        |
 
 The goal of this project is to give full support for all the formats in the table.

samples/in/glb/box_v1.glb

@@ -1,7 +1,6 @@
-//Execute this test only if is in local and debug
-#if DEBUG
-using MeshIO.Formats.Gltf;
+using MeshIO.Formats.Gltf;
 using MeshIO.Tests.Common;
+using MeshIO.Tests.TestModels;
 using System;
 using System.IO;
 using Xunit;
@@ -11,60 +10,63 @@ namespace MeshIO.Tests.Formats.Gltf;
 
 public class GltfReaderLocalTest : IOTestsBase
 {
-	public static readonly TheoryData<string> V1Files = new();
+	public static readonly TheoryData<FileModel> V1Files = new();
 
-	public static readonly TheoryData<string, string> V2Files = new();
+	public static readonly TheoryData<FileModel> V2Files = new();
 
 	private const string _samplesFolder = "..\\..\\..\\..\\..\\..\\glTF-Sample-Models";
 
 	static GltfReaderLocalTest()
 	{
 		if (!Directory.Exists(_samplesFolder))
 		{
-			V1Files.Add(string.Empty);
-			V2Files.Add(string.Empty, string.Empty);
+			V1Files.Add(new FileModel());
+			V2Files.Add(new FileModel());
 			return;
 		}
 
 		foreach (string file in Directory.GetFiles(Path.Combine(_samplesFolder, "1.0"), "*.glb", SearchOption.AllDirectories))
 		{
-			V1Files.Add(file);
+			FileModel model = new FileModel(file);
+			V1Files.Add(model);
 		}
 
 		foreach (string file in Directory.GetFiles(Path.Combine(_samplesFolder, "2.0"), "*.glb", SearchOption.AllDirectories))
 		{
-			V2Files.Add(Path.GetFileName(file), file);
+			V2Files.Add(new FileModel(file));
 		}
 	}
 
 	public GltfReaderLocalTest(ITestOutputHelper output) : base(output) { }
 
 	[Theory]
 	[MemberData(nameof(V1Files))]
-	public void ReadGlbV1(string path)
+	public void ReadGlbV1(FileModel test)
 	{
-		if (string.IsNullOrEmpty(path))
+		if (string.IsNullOrEmpty(test.Path))
 			return;
 
-		using (GltfReader reader = new GltfReader(path))
+		Scene scene = null;
+		using (GlbReader reader = new GlbReader(test.Path))
 		{
 			reader.OnNotification += this.onNotification;
-			Assert.Throws<NotSupportedException>(reader.Read);
+			scene = reader.Read();
 		}
+
+		Assert.NotNull(scene);
 	}
 
 	[Theory]
 	[MemberData(nameof(V2Files))]
-	public void ReadGlbV2(string file, string path)
+	public void ReadGlbV2(FileModel test)
 	{
-		if (string.IsNullOrEmpty(path))
+		if (string.IsNullOrEmpty(test.Path))
 			return;
 
-		using (GltfReader reader = new GltfReader(path))
+		using (GlbReader reader = new GlbReader(test.Path))
 		{
 			reader.OnNotification += this.onNotification;
 			reader.Read();
 		}
 	}
 }
-#endif

samples/in/glb/box_v2.glb

@@ -14,19 +14,19 @@ public class GltfReaderTests : IOTestsBase
 
 	static GltfReaderTests()
 	{
-		loadSamples("glb-gltf", "glb", GlbFiles);
-		loadSamples("glb-gltf", "gltf", GltfFiles);
+		loadSamples("glb", "glb", GlbFiles);
+		loadSamples("gltf", "gltf", GltfFiles);
 	}
 
 	public GltfReaderTests(ITestOutputHelper output) : base(output)
 	{
 	}
 
-	[Theory(Skip = "Gltf not implemented")]
+	[Theory]
 	[MemberData(nameof(GlbFiles))]
 	public void ReadGlb(FileModel test)
 	{
-		using (GltfReader reader = new GltfReader(test.Path))
+		using (GlbReader reader = new GlbReader(test.Path))
 		{
 			reader.OnNotification += this.onNotification;
 			reader.Read();
@@ -37,7 +37,7 @@ public void ReadGlb(FileModel test)
 	[MemberData(nameof(GltfFiles))]
 	public void ReadGltf(FileModel test)
 	{
-		using (GltfReader reader = new GltfReader(test.Path))
+		using (GlbReader reader = new GlbReader(test.Path))
 		{
 			reader.OnNotification += this.onNotification;
 			reader.Read();