Merge pull request #44 from DomCR/fbx-writer

Fbx writer

Author: DomCR

README.md

@@ -16,12 +16,12 @@ MeshIO allows to read or create 3D files using .Net and also extract or modify e
 
 |      | Read-ASCII | Read-Binary | Write-ASCII | Write-Binary |
 ------ | :-------: | :-------: | :-------: | :-------: |
-FBX6000 |    :heavy_check_mark:    |   :heavy_check_mark:     |    :construction:    |    :construction:    |
+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:    |        |
-OBJ |    :construction:    |        |    :x:    |        |
+STL     |    :heavy_check_mark:    |   :heavy_check_mark:     |    :heavy_check_mark:    |    :heavy_check_mark:    |
+GLB     |                          |   :heavy_check_mark:     |        |    :construction:    |
+GLTF    |    :construction:    |        |    :construction:    |        |
+OBJ     |    :construction:    |        |    :x:    |        |
 
 The goal of this project is to give full support for all the formats in the table.
 

src/MeshIO.Tests/Common/IOTestsBase.cs

@@ -1,4 +1,5 @@
-using MeshIO.Tests.TestModels;
+using MeshIO.Formats;
+using MeshIO.Tests.TestModels;
 using System.IO;
 using Xunit;
 using Xunit.Abstractions;

src/MeshIO.Tests/Formats/Fbx/FbxWriterTests.cs

@@ -1,7 +1,10 @@
 using MeshIO.Entities.Geometries;
 using MeshIO.Entities.Primitives;
+using MeshIO.Formats;
 using MeshIO.Formats.Fbx;
 using MeshIO.Tests.Common;
+using MeshIO.Tests.TestModels;
+using System;
 using System.IO;
 using Xunit;
 using Xunit.Abstractions;
@@ -10,76 +13,37 @@ namespace MeshIO.Tests.Formats.Fbx;
 
 public class FbxWriterTests : IOTestsBase
 {
-	public static readonly TheoryData<FbxVersion> Versions = FbxTestCasesData.Versions;
-
-	public FbxWriterTests(ITestOutputHelper output) : base(output) { }
-
-	[Theory]
-	[MemberData(nameof(Versions))]
-	public void WriteEmptyAsciiStream(FbxVersion version)
-	{
-		FbxWriterOptions options = new FbxWriterOptions
-		{
-			IsBinaryFormat = false,
-			Version = version,
-		};
+	public static TheoryData<FbxFileModel> TestCases { get; } = new();
 
-		using (FbxWriter writer = new FbxWriter(new MemoryStream(), new Scene(), options))
-		{
-			writer.OnNotification += this.onNotification;
-			writer.Write(new FbxWriterOptions() { IsBinaryFormat = false });
-		}
-	}
+	public static readonly TheoryData<FbxVersion> Versions = FbxTestCasesData.Versions;
 
-	[Theory]
-	[MemberData(nameof(Versions))]
-	public void WriteAsciiFbxWithMesh(FbxVersion version)
+	static FbxWriterTests()
 	{
-		FbxWriterOptions options = new FbxWriterOptions
-		{
-			IsBinaryFormat = false,
-			Version = version,
-		};
-
-		string path = Path.Combine(FolderPath.OutFilesFbx, $"box_{version}_ascii.fbx");
-
-		Scene scene = this.createScene();
+		string folder = Path.Combine(TestVariables.OutputSamplesFolder, "fbx");
+		Directory.CreateDirectory(folder);
 
-		this.writeFile(path, scene, options);
+		TestCases.Add(new FbxFileModel(folder, FbxVersion.v6100, ContentType.ASCII));
+		TestCases.Add(new FbxFileModel(folder, FbxVersion.v6100, ContentType.Binary));
+		TestCases.Add(new FbxFileModel(folder, FbxVersion.v7700, ContentType.ASCII));
+		TestCases.Add(new FbxFileModel(folder, FbxVersion.v7700, ContentType.Binary));
 	}
 
-	[Theory]
-	[MemberData(nameof(Versions))]
-	public void WriteEmptyBinaryStream(FbxVersion version)
+	public FbxWriterTests(ITestOutputHelper output) : base(output)
 	{
-		FbxWriterOptions options = new FbxWriterOptions
-		{
-			IsBinaryFormat = true,
-			Version = version,
-		};
-
-		using (FbxWriter writer = new FbxWriter(new MemoryStream(), new Scene()))
-		{
-			writer.OnNotification += this.onNotification;
-			writer.Write(new FbxWriterOptions() { IsBinaryFormat = true });
-		}
 	}
 
 	[Theory]
-	[MemberData(nameof(Versions))]
-	public void WriteBinaryFbxWithMesh(FbxVersion version)
+	[MemberData(nameof(TestCases))]
+	public void WriteTest(FbxFileModel test)
 	{
 		FbxWriterOptions options = new FbxWriterOptions
 		{
-			IsBinaryFormat = true,
-			Version = version,
+			ContentType = test.Content,
+			Version = test.Version,
 		};
 
-		string path = Path.Combine(FolderPath.OutFilesFbx, $"box_{version}_binary.fbx");
-
 		Scene scene = this.createScene();
-
-		this.writeFile(path, scene, options);
+		this.writeFile(test.Path, scene, options);
 	}
 
 	private Scene createScene()
@@ -100,7 +64,7 @@ private void writeFile(string path, Scene scene, FbxWriterOptions options)
 		using (FbxWriter writer = new FbxWriter(path, scene, options))
 		{
 			writer.OnNotification += this.onNotification;
-			writer.Write(options);
+			writer.Write();
 		}
 	}
-}
+}

src/MeshIO.Tests/Formats/SceneWriterTests.cs

@@ -45,7 +45,7 @@ private Scene createScene()
 		return scene;
 	}
 
-	private void onNotification(object sender, MeshIO.NotificationEventArgs e)
+	private void onNotification(object sender, MeshIO.Formats.NotificationEventArgs e)
 	{
 		this._output.WriteLine(e.Message);
 	}

src/MeshIO.Tests/TestModels/FbxFileModel.cs

@@ -0,0 +1,45 @@
+using MeshIO.Formats;
+using MeshIO.Formats.Fbx;
+using Xunit.Abstractions;
+
+namespace MeshIO.Tests.TestModels;
+
+public class FbxFileModel : FileModel
+{
+	public ContentType Content { get; private set; }
+
+	public FbxVersion Version { get; private set; }
+
+	public FbxFileModel()
+				: base()
+	{
+	}
+
+	public FbxFileModel(string path)
+		: base(path)
+	{
+	}
+
+	public FbxFileModel(string folder, FbxVersion version, ContentType content)
+		: this(System.IO.Path.Combine(folder, $"{version}_{content}.fbx"))
+	{
+		this.Version = version;
+		this.Content = content;
+	}
+
+	public override void Deserialize(IXunitSerializationInfo info)
+	{
+		base.Deserialize(info);
+
+		this.Content = info.GetValue<ContentType>(nameof(this.Content));
+		this.Version = info.GetValue<FbxVersion>(nameof(this.Version));
+	}
+
+	public override void Serialize(IXunitSerializationInfo info)
+	{
+		base.Serialize(info);
+
+		info.AddValue(nameof(this.Version), this.Version);
+		info.AddValue(nameof(this.Content), this.Content);
+	}
+}

src/MeshIO.Tests/TestModels/FileModel.cs

@@ -8,14 +8,12 @@ public class FileModel : IXunitSerializable
 
 	public string FileName { get; private set; }
 
+	public string Folder { get { return System.IO.Path.GetDirectoryName(this.Path); } }
+
 	public string NoExtensionName { get { return System.IO.Path.GetFileNameWithoutExtension(this.Path); } }
 
 	public string Path { get; private set; }
 
-	public string Folder { get { return System.IO.Path.GetDirectoryName(this.Path); } }
-
-	public bool IsDxf { get { return System.IO.Path.GetExtension(this.Path) == ".dxf"; } }
-
 	public FileModel()
 	{
 		this.FileName = string.Empty;
@@ -27,13 +25,13 @@ public FileModel(string path)
 		this.FileName = System.IO.Path.GetFileName(this.Path);
 	}
 
-	public void Deserialize(IXunitSerializationInfo info)
+	public virtual void Deserialize(IXunitSerializationInfo info)
 	{
 		this.Path = info.GetValue<string>(nameof(this.Path));
 		this.FileName = info.GetValue<string>(nameof(this.FileName));
 	}
 
-	public void Serialize(IXunitSerializationInfo info)
+	public virtual void Serialize(IXunitSerializationInfo info)
 	{
 		info.AddValue(nameof(this.Path), this.Path);
 		info.AddValue(nameof(this.FileName), this.FileName);
@@ -43,4 +41,4 @@ public override string ToString()
 	{
 		return this.FileName;
 	}
-}
+}

src/MeshIO.sln

@@ -11,15 +11,6 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CSMath", "CSUtilities\CSMat
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CSUtilities", "CSUtilities\CSUtilities\CSUtilities.shproj", "{AD858F2B-04A1-41DD-BB3B-DDE4804CD2E6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repo", "repo", "{F37B65A4-9A24-41EA-9A72-D3439074C3D2}"
-	ProjectSection(SolutionItems) = preProject
-		..\.editorconfig = ..\.editorconfig
-		..\.gitignore = ..\.gitignore
-		..\.gitmodules = ..\.gitmodules
-		Directory.Build.props = Directory.Build.props
-		..\README.md = ..\README.md
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MeshIO.Tests", "MeshIO.Tests\MeshIO.Tests.csproj", "{94C45D19-8231-437F-AB4D-02FA072A923C}"
 EndProject
 Global

src/MeshIO/Formats/Fbx/Builders/FbxBuilderFactory.cs

@@ -29,7 +29,7 @@ public override void Build(FbxFileBuilderBase builder)
 		readLayers(builder.Version);
 	}
 
-	protected override void processProperties(Dictionary<string, FbxProperty> properties)
+	protected override void buildProperties(Dictionary<string, FbxProperty> properties)
 	{
 		if (properties.Remove("Primary Visibility", out FbxProperty isVisible))
 		{
@@ -46,7 +46,7 @@ protected override void processProperties(Dictionary<string, FbxProperty> proper
 			_element.ReceiveShadows = (bool)receiveShadows.ToProperty().Value;
 		}
 
-		base.processProperties(properties);
+		base.buildProperties(properties);
 	}
 
 	protected void readLayers(FbxVersion version)