Refactor materials/textures to MeshIO.Materials namespace

Moved all material and texture classes from MeshIO.Shaders to a new MeshIO.Materials namespace. Introduced a Texture class with filter and wrap enums, and extended PbrMaterial to support texture properties. Added GltfTextureBuilder and GltfConverter for glTF texture handling. Updated GltfMaterialBuilder to assign textures, and rewrote GltfMaterialNormalTextureInfo to implement IGltfTextureInfo. GlbFileBuilder now manages images, samplers, and textures. Renamed Camera.OrtographicZoom to OrthographicZoom. Updated all references and usages to reflect these changes.

Author: DomCR

src/MeshIO/Entities/Camera.cs

@@ -37,7 +37,7 @@ public class Camera : Entity
 	/// too low may result in rendering artifacts due to depth buffer precision limitations.</remarks>
 	public double NearPlane { get; set; } = 0;
 
-	public XY OrtographicZoom { get; set; }
+	public XY OrthographicZoom { get; set; }
 
 	/// <summary>
 	/// Gets or sets the position represented by this instance.

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

@@ -41,7 +41,7 @@ protected override void buildProperties(Dictionary<string, FbxProperty> properti
 
 		if (properties.Remove("OrthoZoom", out FbxProperty orthoZoom))
 		{
-			_element.OrtographicZoom = new XY((double)orthoZoom.ToProperty().Value);
+			_element.OrthographicZoom = new XY((double)orthoZoom.ToProperty().Value);
 		}
 
 		base.buildProperties(properties);
@@ -57,7 +57,7 @@ protected override bool setValue(FbxFileBuilderBase builder, FbxNode node)
 			case "AudioColor":
 				return true;
 			case FbxFileToken.CameraOrthoZoom:
-				_element.OrtographicZoom = new XY(node.GetValue<double>());
+				_element.OrthographicZoom = new XY(node.GetValue<double>());
 				return true;
 			case FbxFileToken.Position:
 				this._element.Position = this.nodeToXYZ(node);

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

@@ -1,7 +1,7 @@
 using MeshIO.Formats.Fbx.Readers;
-using MeshIO.Shaders;
 using System.Collections.Generic;
 using CSUtilities.Extensions;
+using MeshIO.Materials;
 
 namespace MeshIO.Formats.Fbx.Builders;
 

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

@@ -6,7 +6,7 @@
 using MeshIO.Entities;
 using MeshIO.Formats.Fbx.Connections;
 using MeshIO.Formats.Fbx.Readers;
-using MeshIO.Shaders;
+using MeshIO.Materials;
 using System.Collections.Generic;
 using System.Linq;
 

src/MeshIO/Formats/Fbx/Templates/FbxNodeTemplate.cs

@@ -4,7 +4,7 @@
 
 using MeshIO.Entities;
 using MeshIO.Formats.Fbx.Writers;
-using MeshIO.Shaders;
+using MeshIO.Materials;
 
 namespace MeshIO.Formats.Fbx.Templates;
 

src/MeshIO/Formats/Gltf/Builders/GltfCameraBuilder.cs

@@ -11,10 +11,10 @@ internal class GltfCameraBuilder : GltfObjectBuilder<GltfCamera>
 
 	public override void Build(GlbFileBuilder builder)
 	{
-		base.Build(builder);
-
 		this.Camera = new Camera(this.GltfObject.Name);
 
+		base.Build(builder);
+
 		switch (this.GltfObject.Type)
 		{
 			case GltfCamera.TypeEnum.perspective when this.GltfObject.Orthographic != null:
@@ -51,6 +51,6 @@ private void mapOrthographicCamera(GltfCameraOrthographic gltfCamera)
 		this.Camera.ProjectionType = ProjectionType.Orthographic;
 		this.Camera.NearPlane = gltfCamera.Znear;
 		this.Camera.FarPlane = gltfCamera.Zfar;
-		this.Camera.OrtographicZoom = new XY(gltfCamera.Xmag, gltfCamera.Ymag);
+		this.Camera.OrthographicZoom = new XY(gltfCamera.Xmag, gltfCamera.Ymag);
 	}
 }

src/MeshIO/Formats/Gltf/Builders/GltfMaterialBuilder.cs

@@ -1,6 +1,6 @@
 using MeshIO.Formats.Gltf.Readers;
 using MeshIO.Formats.Gltf.Schema.V2;
-using MeshIO.Shaders;
+using MeshIO.Materials;
 
 namespace MeshIO.Formats.Gltf.Builders;
 
@@ -10,6 +10,39 @@ internal class GltfMaterialBuilder : GltfObjectBuilder<GltfMaterial>
 
 	public override void Build(GlbFileBuilder builder)
 	{
+		this.Material = new PbrMaterial(this.GltfObject.Name);
+		var pbrMat = this.Material as PbrMaterial;
+
 		base.Build(builder);
+
+		if (this.GltfObject.PbrMetallicRoughness != null)
+		{
+		}
+
+		if (this.GltfObject.NormalTexture != null
+			&& builder.TryGetBuilder(this.GltfObject.NormalTexture.Index,
+			out GltfTextureBuilder normalBuilder))
+		{
+			pbrMat.NormalTexture = normalBuilder.Texture;
+		}
+
+		if (this.GltfObject.OcclusionTexture != null
+			&& builder.TryGetBuilder(this.GltfObject.NormalTexture.Index,
+			out GltfTextureBuilder occlusionBuilder))
+		{
+			pbrMat.OcclusionTexture = occlusionBuilder.Texture;
+		}
+
+		if (this.GltfObject.EmissiveTexture != null 
+			&& builder.TryGetBuilder(this.GltfObject.NormalTexture.Index,
+			out GltfTextureBuilder emissiveBuilder))
+		{
+			pbrMat.EmissiveTexture = emissiveBuilder.Texture;
+		}
+	}
+
+	private Texture processTexture(GlbFileBuilder builder)
+	{
+		throw new System.NotImplementedException();
 	}
 }

src/MeshIO/Formats/Gltf/Builders/GltfMeshBuilder.cs

@@ -3,7 +3,7 @@
 using MeshIO.Entities.Geometries.Layers;
 using MeshIO.Formats.Gltf.Readers;
 using MeshIO.Formats.Gltf.Schema.V2;
-using MeshIO.Shaders;
+using MeshIO.Materials;
 using System;
 using System.Collections.Generic;
 
@@ -88,8 +88,6 @@ public override void Build(GlbFileBuilder builder)
 				this.Materials.Add(material.Material);
 				var layer = new LayerElementMaterial();
 				mesh.Layers.Add(layer);
-
-				builder.Notify($"Material not implemented for mesh.", NotificationType.NotImplemented);
 			}
 		}
 	}

src/MeshIO/Formats/Gltf/Builders/GltfTextureBuilder.cs

@@ -0,0 +1,35 @@
+using MeshIO.Formats.Gltf.Readers;
+using MeshIO.Formats.Gltf.Schema;
+using MeshIO.Formats.Gltf.Schema.V2;
+using MeshIO.Materials;
+
+namespace MeshIO.Formats.Gltf.Builders;
+
+internal class GltfTextureBuilder : GltfObjectBuilder<GltfTexture>
+{
+	public Texture Texture { get; private set; }
+
+	public GltfTextureBuilder()
+	{ }
+
+	public override void Build(GlbFileBuilder builder)
+	{
+		this.Texture = new Texture(this.GltfObject.Name);
+
+		base.Build(builder);
+
+		if (builder.Samplers.TryGetValue(this.GltfObject.Sampler, out var sampler))
+		{
+			this.Texture.MagnificationFilter = ((int?)sampler.MagFilter).Convert();
+			this.Texture.MinificationFilter = ((int?)sampler.MinFilter).Convert(out TextureFilterType mipFilter);
+			this.Texture.MipFilter = mipFilter;
+
+			this.Texture.WrapModeT = ((int)sampler.WrapT).Convert();
+			this.Texture.WrapModeS = ((int)sampler.WrapS).Convert();
+		}
+
+		if (builder.Images.TryGetValue(this.GltfObject.Source, out var image))
+		{
+		}
+	}
+}

src/MeshIO/Formats/Gltf/Readers/GlbFileBuilder.cs

@@ -13,6 +13,10 @@ internal class GlbFileBuilder : IGlbFileBuilder
 {
 	public event NotificationEventHandler OnNotification;
 
+	public Dictionary<string, GltfImage> Images { get; } = new();
+
+	public Dictionary<string, GltfSampler> Samplers { get; } = new();
+
 	private readonly Dictionary<string, GltfAccessorBuilder> _accessors = new();
 
 	private readonly Dictionary<string, GltfBuffer> _buffers = new();
@@ -31,6 +35,8 @@ internal class GlbFileBuilder : IGlbFileBuilder
 
 	private readonly Dictionary<string, GltfSceneBuilder> _scenes = new();
 
+	private readonly Dictionary<string, GltfTextureBuilder> _textures = new();
+
 	private GltfRoot _root;
 
 	public GlbFileBuilder(GltfHeader header)
@@ -69,31 +75,13 @@ public Scene Build()
 		this.createBuilders(_cameras, this._root.Cameras);
 		this.createBuilders(_accessors, this._root.Accessors);
 		this.createBuilders(_materials, this._root.Materials);
+		this.createBuilders(_textures, this._root.Textures);
 
-		for (int i = 0; i < this._root.Buffers.Length; i++)
-		{
-			var gltf = this._root.Buffers[i];
-			if (this._header.Version == GltfVersion.V1)
-			{
-				_buffers.Add(gltf.Name, gltf);
-			}
-			else
-			{
-				_buffers.Add(i.ToString(), gltf);
-			}
-		}
-		for (int i = 0; i < this._root.BufferViews.Length; i++)
-		{
-			var gltf = this._root.BufferViews[i];
-			if (this._header.Version == GltfVersion.V1)
-			{
-				_bufferViews.Add(gltf.Name, gltf);
-			}
-			else
-			{
-				_bufferViews.Add(i.ToString(), gltf);
-			}
-		}
+		mapCollection(this._buffers, this._root.Buffers);
+		mapCollection(this._bufferViews, this._root.BufferViews);
+
+		mapCollection(this.Samplers, this._root.Samplers);
+		mapCollection(this.Images, this._root.Images);
 
 		sceneBuilder.Build(this);
 
@@ -152,6 +140,10 @@ public bool TryGetBuilder<T>(string id, out T builder, bool notify = true)
 		{
 			dict = this._materials as Dictionary<string, T>;
 		}
+		else if (builderType == typeof(GltfTextureBuilder))
+		{
+			dict = this._textures as Dictionary<string, T>;
+		}
 		else
 		{
 			throw new InvalidOperationException();
@@ -195,4 +187,21 @@ private void createBuilders<Builder, Gltf>(Dictionary<string, Builder> collectio
 			}
 		}
 	}
+
+	private void mapCollection<T>(Dictionary<string, T> map, T[] values)
+						where T : IGltfNamedObject
+	{
+		for (int i = 0; i < values.Length; i++)
+		{
+			var gltf = values[i];
+			if (this._header.Version == GltfVersion.V1)
+			{
+				map.Add(gltf.Name, gltf);
+			}
+			else
+			{
+				map.Add(i.ToString(), gltf);
+			}
+		}
+	}
 }