Assets: More GLTF loading, completed rount 1 of mesh loading and initial PBR material loading.

Author: amerkoleci

Directory.Packages.props

@@ -38,7 +38,6 @@
 
     <!-- Asset Pipeline -->
     <PackageVersion Include="Vortice.Dxc.Native" Version="1.0.4" />
-    <PackageVersion Include="SharpGLTF.Core" Version="1.0.6" />
     <PackageVersion Include="Silk.NET.Assimp" Version="2.23.0" />
     <PackageVersion Include="Vortice.SPIRV.Reflect" Version="1.0.6" />
     <PackageVersion Include="Alimer.Bindings.MeshOptimizer" Version="1.2.0" />

assets/Shaders/ShaderTypes.h

@@ -59,7 +59,7 @@ struct ALIGNMENT PBRMaterialData
 struct ALIGNMENT InstanceData
 {
     float4x4 worldMatrix;
-    float4 color;
+    //float4 color;
     uint32_t materialIndex;
     //float4x4 inverseWorldMatrix;
 };

assets/Shaders/VertexCommon.slang

@@ -12,7 +12,7 @@ VertexOutput vertexMain(in VertexInput input,
     InstanceData instance = instanceDataBuffer[instanceId];
 
     float4x4 worldMatrix = instance.worldMatrix;
-    const float4 instanceColor = instance.color;
+    //const float4 instanceColor = instance.color;
     const uint materialIndex = instance.materialIndex;
     float4 worldPosition = mul(float4(input.Position, 1.0f), worldMatrix);
 
@@ -37,7 +37,8 @@ VertexOutput vertexMain(in VertexInput input,
 #if defined(VERTEX_COLOR)
     output.Color = input.Color;
 #else
-    output.Color = instanceColor.xyz; // float3(1.0f);
+    // output.Color = instanceColor.xyz;
+    output.Color = float3(1.0f);
 #endif
     return output;
 }

samples/Alimer.Samples/Engine/ScenePBRRendererSample.cs

@@ -32,14 +32,9 @@ public ScenePBRRendererSample(IServiceRegistry services)
         root.Children.Add(_cameraEntity);
 
         // GLTF mesh
-        PhysicallyBasedMaterial sharedMaterial = new()
-        {
-            BaseColorFactor = Colors.White,
-        };
-
         string meshesPath = Path.Combine(AppContext.BaseDirectory, "Assets", "Meshes");
 
-        MeshImporter meshImporter = new();
+        MeshImporter meshImporter = new(GraphicsDevice);
         MeshMetadata meshMetadata = new()
         {
             FileFullPath = Path.Combine(meshesPath, "DamagedHelmet.glb")
@@ -68,7 +63,12 @@ public ScenePBRRendererSample(IServiceRegistry services)
             _damagedHelmetEntity = new("Damaged Helmet", new Vector3(0.0f, 2.0f, 0.0f));
 
             MeshComponent meshComponent = new(damagedHelmetMesh);
-            meshComponent.Materials.Add(sharedMaterial);
+
+            foreach(var material in meshAsset.Materials)
+            {
+                meshComponent.Materials.Add(ToDispose(material));
+            }
+
             _damagedHelmetEntity.AddComponent(meshComponent);
             root.Children.Add(_damagedHelmetEntity);
         }

samples/Alimer.Samples/Graphics/DrawMeshSample.cs

@@ -43,7 +43,7 @@ public DrawMeshSample(IServiceRegistry services, Window mainWindow)
         _texture = ToDispose(Texture.FromFile(GraphicsDevice, Path.Combine(texturesPath, "10points.png")));
         //_texture = ToDispose(Texture.FromFile(GraphicsDevice, Path.Combine(texturesPath, "environment.hdr")));
 
-        MeshImporter meshImporter = new();
+        MeshImporter meshImporter = new(GraphicsDevice);
         MeshMetadata meshMetadata = new()
         {
             FileFullPath = Path.Combine(meshesPath, "DamagedHelmet.glb")

src/Alimer/Assets/Asset.cs

@@ -8,6 +8,11 @@ namespace Alimer.Assets;
 /// </summary>
 public abstract class Asset
 {
+    /// <summary>
+    /// Gets or sets the name of the asset.
+    /// </summary>
+    public string? Name { get;set; }
+
     public Guid Id { get; set; } = Guid.NewGuid();
 
     public override string ToString()

src/Alimer/Engine/Components/MeshComponent.cs

@@ -31,7 +31,7 @@ public MeshComponent(Mesh mesh)
 
     public Mesh? Mesh { get; set; }
 
-    public IList<Material> Materials { get; } = [];
+    public List<Material> Materials { get; } = [];
     public BoundingBox LocalBoundingBox => _localBoundingBox;
 
     public BoundingBox WorldBoundingBox

src/Alimer/Rendering/Material.cs

@@ -15,8 +15,33 @@ public enum MaterialAlphaMode
 /// <summary>
 /// Base material class.
 /// </summary>
-public abstract class Material : Asset
+public abstract class Material : Asset, IDisposableObject
 {
+    private volatile uint _isDisposed = 0;
+
+    /// <inheritdoc />
+    public bool IsDisposed => _isDisposed != 0;
     public MaterialAlphaMode AlphaMode { get;set; } = MaterialAlphaMode.Opaque;
     public bool Transparent => AlphaMode == MaterialAlphaMode.Blend;
+
+    ~Material()
+    {
+        Dispose(false);
+    }
+
+    /// <inheritdoc />
+    public void Dispose()
+    {
+        if (Interlocked.Exchange(ref _isDisposed, 1) == 0)
+        {
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
+    }
+
+    /// <inheritdoc cref="Dispose()" />
+    /// <param name="disposing"><c>true</c> if the method was called from <see cref="Dispose()" />; otherwise, <c>false</c>.</param>
+    protected virtual void Dispose(bool disposing)
+    {
+    }
 }

src/Alimer/Rendering/Mesh.cs

@@ -1,19 +1,17 @@
 // Copyright (c) Amer Koleci and Contributors.
 // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information.
 
-using System.Buffers.Binary;
 using System.Numerics;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Alimer.Graphics;
+using Alimer.Serialization;
 using CommunityToolkit.Diagnostics;
-using XenoAtom.Collections;
 
 namespace Alimer.Rendering;
 
 // TODO: Mesh on GPU with CPU access
 
-public sealed unsafe partial class Mesh : DisposableObject
+public sealed unsafe partial class Mesh : DisposableObject, IBinarySerializable
 {
     //private readonly UnsafeList<Vector3> _positions = [];
     private VertexAttribute[] _vertexAttributes;
@@ -373,6 +371,10 @@ public bool RecalculateTangents()
         return false;
     }
 
+    public void Serialize(BinarySerializer serializer)
+    {
+    }
+
     public unsafe class CpuBuffer
     {
         protected byte* _data;

src/Alimer/Rendering/MeshData.cs

@@ -6,7 +6,7 @@
 
 namespace Alimer.Rendering;
 
-public struct MeshData
+public  struct MeshData
 {
     public MeshData()
     {