[Baker] Fixes to GLTF;

LittleCodingFox · LittleCodingFox · commit 9b71d2143382 · 2025-07-31T01:07:58.000+01:00
[Editor] Fixed executable not being copied properly;
[Serialization] Add back EXR to the list of texture formats;
diff --git a/Engine/Core/Serialization/Asset/AssetSerialization.cs b/Engine/Core/Serialization/Asset/AssetSerialization.cs
@@ -60,6 +60,7 @@ internal static partial class AssetSerialization
     [
         "bmp",
         "dds",
+        "exr",
         "gif",
         "jpg",
         "jpeg",
@@ -68,7 +69,7 @@ internal static partial class AssetSerialization
         "png",
         "psd",
         "pvr",
-        "tga"
+        "tga",
     ];
 
     /// <summary>
diff --git a/Engine/EditorApp/Staple.Editor.App.csproj b/Engine/EditorApp/Staple.Editor.App.csproj
@@ -45,7 +45,7 @@
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
 	<!-- For some reason visual studio on windows builds solutions with self contained, so... ignore that. -->
 	<PostBuildEvent>
-		$(SolutionDir)..\Dependencies\build\dotnet\bin\Release\net9.0\CrossCopy "$(SolutionDir)EditorApp/bin/$(Configuration)/net9.0/StapleEditorApp*" "$(SolutionDir)../Staging"
+		$(SolutionDir)..\Dependencies\build\dotnet\bin\Release\net9.0\CrossCopy "$(SolutionDir)EditorApp/bin/$(Configuration)/net9.0/Staple.Editor.App*" "$(SolutionDir)../Staging"
 		$(SolutionDir)..\Dependencies\build\dotnet\bin\Release\net9.0\CrossCopy "$(SolutionDir)EditorApp/bin/$(Configuration)/net9.0/*.dll" "$(SolutionDir)../Staging"
 		$(SolutionDir)..\Dependencies\build\dotnet\bin\Release\net9.0\CrossCopy "$(SolutionDir)EditorApp/bin/$(Configuration)/net9.0/*.[DLL]" "$(SolutionDir)../Staging"
 		$(SolutionDir)..\Dependencies\build\dotnet\bin\Release\net9.0\CrossCopy "$(SolutionDir)../Dependencies/build/native/bin/$(Configuration)/*.[DLL]" "$(SolutionDir)../Staging"
@@ -59,7 +59,7 @@
 
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Linux'))">
     <PostBuildEvent Condition="'$(SelfContained)'=='false'">
-		$(SolutionDir)..\Dependencies\build\dotnet\bin\Release\net9.0\CrossCopy "$(SolutionDir)EditorApp/bin/$(Configuration)/net9.0/StapleEditorApp*" "$(SolutionDir)../Staging"
+		$(SolutionDir)..\Dependencies\build\dotnet\bin\Release\net9.0\CrossCopy "$(SolutionDir)EditorApp/bin/$(Configuration)/net9.0/Staple.Editor.App*" "$(SolutionDir)../Staging"
 		$(SolutionDir)..\Dependencies\build\dotnet\bin\Release\net9.0\CrossCopy "$(SolutionDir)EditorApp/bin/$(Configuration)/net9.0/*.dll" "$(SolutionDir)../Staging"
 		$(SolutionDir)..\Dependencies\build\dotnet\bin\Release\net9.0\CrossCopy "$(SolutionDir)EditorApp/bin/$(Configuration)/net9.0/*.[DLL]" "$(SolutionDir)../Staging"
 		$(SolutionDir)..\Dependencies\build\dotnet\bin\Release\net9.0\CrossCopy "$(SolutionDir)../Dependencies/build/native/bin/$(Configuration)/*.[DLL]" "$(SolutionDir)../Staging"
@@ -73,7 +73,7 @@
 
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('macOS'))">
     <PostBuildEvent Condition="'$(SelfContained)'=='false'">
-		$(SolutionDir)..\Dependencies\build\dotnet\bin\Release\net9.0\CrossCopy "$(SolutionDir)EditorApp/bin/$(Configuration)/net9.0/StapleEditorApp*" "$(SolutionDir)../Staging"
+		$(SolutionDir)..\Dependencies\build\dotnet\bin\Release\net9.0\CrossCopy "$(SolutionDir)EditorApp/bin/$(Configuration)/net9.0/Staple.Editor.App*" "$(SolutionDir)../Staging"
 		$(SolutionDir)..\Dependencies\build\dotnet\bin\Release\net9.0\CrossCopy "$(SolutionDir)EditorApp/bin/$(Configuration)/net9.0/*.dll" "$(SolutionDir)../Staging"
 		$(SolutionDir)..\Dependencies\build\dotnet\bin\Release\net9.0\CrossCopy "$(SolutionDir)EditorApp/bin/$(Configuration)/net9.0/*.[DLL]" "$(SolutionDir)../Staging"
 		$(SolutionDir)..\Dependencies\build\dotnet\bin\Release\net9.0\CrossCopy "$(SolutionDir)../Dependencies/build/native/bin/$(Configuration)/*.[DLL]" "$(SolutionDir)../Staging"
diff --git a/Tools/Baker/Baker+Texture.cs b/Tools/Baker/Baker+Texture.cs
@@ -8,6 +8,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Text;
 
 namespace Baker;
 
@@ -539,13 +540,15 @@ bool ValidRegion(int x, int y)
                     }
                 };
 
-                Utilities.ExecuteAndCollectProcess(process, null);
+                var log = new StringBuilder();
+
+                Utilities.ExecuteAndCollectProcess(process, (msg) => log.AppendLine(msg));
 
                 if (process.ExitCode != 0)
                 {
                     Console.WriteLine($"\t\t\tArguments: {process.StartInfo.Arguments}");
 
-                    Console.WriteLine($"\t\tError:\n");
+                    Console.WriteLine($"\t\tError:\n{log}");
 
                     try
                     {
diff --git a/Tools/Baker/Meshes/Baker+SharpGLTF.cs b/Tools/Baker/Meshes/Baker+SharpGLTF.cs
@@ -579,7 +579,7 @@ void RegisterNode(SharpGLTF.Schema2.Node node, MeshAssetNode parent)
                     var m = new MeshAssetMeshInfo
                     {
                         name = $"{mesh.Name} {primitive.LogicalIndex}",
-                        materialGuid = primitive.Material.LogicalIndex >= 0 && primitive.Material.LogicalIndex < materialMapping.Count ?
+                        materialGuid = (primitive.Material?.LogicalIndex ?? -1) >= 0 && primitive.Material.LogicalIndex < materialMapping.Count ?
                             materialMapping[primitive.Material.LogicalIndex] : "",
                         type = node.Skin != null &&
                             primitive.VertexAccessors.ContainsKey("JOINTS_0") &&
@@ -629,30 +629,122 @@ void RegisterNode(SharpGLTF.Schema2.Node node, MeshAssetNode parent)
                             continue;
                     }
 
-                    var vert = primitive.GetVertexAccessor("POSITION").AsVector3Array();
-                    var tan = primitive.GetVertexAccessor("TANGENT")?.AsVector4Array();
-                    var nor = primitive.GetVertexAccessor("NORMAL")?.AsVector3Array();
-                    var bi = primitive.GetVertexAccessor("JOINTS_0")?.AsVector4Array();
-                    var bw = primitive.GetVertexAccessor("WEIGHTS_0")?.AsVector4Array();
+                    List<Vector2> SafeGetVertexAccessorVector2(string name, bool debug)
+                    {
+                        var accessor = primitive.GetVertexAccessor(name);
+
+                        if((accessor?.Count ?? 0) == 0)
+                        {
+                            return null;
+                        }
+
+                        if(accessor.Dimensions == SharpGLTF.Schema2.DimensionType.VEC2)
+                        {
+                            return [.. accessor.AsVector2Array()];
+                        }
+
+                        if (debug)
+                        {
+                            Log.Debug($"Failed to get Vector2 vertex accessor {name}: Dimensions were {accessor.Dimensions}");
+                        }
+
+                        return null;
+                    }
+
+                    List<Vector3> SafeGetVertexAccessorVector3(string name, bool debug)
+                    {
+                        var accessor = primitive.GetVertexAccessor(name);
+
+                        if ((accessor?.Count ?? 0) == 0)
+                        {
+                            return null;
+                        }
+
+                        if (accessor.Dimensions == SharpGLTF.Schema2.DimensionType.VEC3)
+                        {
+                            return [.. accessor.AsVector3Array()];
+                        }
+
+                        if(debug)
+                        {
+                            Log.Debug($"Failed to get Vector3 vertex accessor {name}: Dimensions were {accessor.Dimensions}");
+                        }
+
+                        return null;
+                    }
+
+                    List<Vector4> SafeGetVertexAccessorVector4(string name, bool debug)
+                    {
+                        var accessor = primitive.GetVertexAccessor(name);
+
+                        if ((accessor?.Count ?? 0) == 0)
+                        {
+                            return null;
+                        }
+
+                        if (accessor.Dimensions == SharpGLTF.Schema2.DimensionType.VEC4)
+                        {
+                            return [.. accessor.AsVector4Array()];
+                        }
+
+                        if (debug)
+                        {
+                            Log.Debug($"Failed to get Vector4 vertex accessor {name}: Dimensions were {accessor.Dimensions}");
+                        }
+
+                        return null;
+                    }
+
+                    List<Vector4> SafeGetVertexColor(string name)
+                    {
+                        var l = SafeGetVertexAccessorVector4(name, false);
+
+                        if(l != null)
+                        {
+                            return l;
+                        }
+
+                        var l2 = SafeGetVertexAccessorVector3(name, false);
+
+                        if(l2 != null)
+                        {
+                            var newList = new Vector4[l2.Count];
+
+                            for(var i = 0; i < l2.Count; i++)
+                            {
+                                newList[i] = new(l2[i], 1);
+                            }
+
+                            return [.. newList];
+                        }
+
+                        return null;
+                    }
+
+                    var vert = SafeGetVertexAccessorVector3("POSITION", true);
+                    var tan = SafeGetVertexAccessorVector4("TANGENT", true);
+                    var nor = SafeGetVertexAccessorVector3("NORMAL", true);
+                    var bi = SafeGetVertexAccessorVector4("JOINTS_0", true);
+                    var bw = SafeGetVertexAccessorVector4("WEIGHTS_0", true);
 
                     var texcoords = new IList<Vector2>[]
                     {
-                        primitive.GetVertexAccessor("TEXCOORD_0")?.AsVector2Array(),
-                        primitive.GetVertexAccessor("TEXCOORD_1")?.AsVector2Array(),
-                        primitive.GetVertexAccessor("TEXCOORD_2")?.AsVector2Array(),
-                        primitive.GetVertexAccessor("TEXCOORD_3")?.AsVector2Array(),
-                        primitive.GetVertexAccessor("TEXCOORD_4")?.AsVector2Array(),
-                        primitive.GetVertexAccessor("TEXCOORD_5")?.AsVector2Array(),
-                        primitive.GetVertexAccessor("TEXCOORD_6")?.AsVector2Array(),
-                        primitive.GetVertexAccessor("TEXCOORD_7")?.AsVector2Array(),
+                        SafeGetVertexAccessorVector2("TEXCOORD_0", true),
+                        SafeGetVertexAccessorVector2("TEXCOORD_1", true),
+                        SafeGetVertexAccessorVector2("TEXCOORD_2", true),
+                        SafeGetVertexAccessorVector2("TEXCOORD_3", true),
+                        SafeGetVertexAccessorVector2("TEXCOORD_4", true),
+                        SafeGetVertexAccessorVector2("TEXCOORD_5", true),
+                        SafeGetVertexAccessorVector2("TEXCOORD_6", true),
+                        SafeGetVertexAccessorVector2("TEXCOORD_7", true),
                     };
 
                     var colors = new IList<Vector4>[]
                     {
-                        primitive.GetVertexAccessor("COLOR_0")?.AsVector4Array(),
-                        primitive.GetVertexAccessor("COLOR_1")?.AsVector4Array(),
-                        primitive.GetVertexAccessor("COLOR_2")?.AsVector4Array(),
-                        primitive.GetVertexAccessor("COLOR_3")?.AsVector4Array(),
+                        SafeGetVertexColor("COLOR_0"),
+                        SafeGetVertexColor("COLOR_1"),
+                        SafeGetVertexColor("COLOR_2"),
+                        SafeGetVertexColor("COLOR_3"),
                     };
 
                     var vertexCount = vert.Count;

-Original file line number
+Diff line change
+    [
         "bmp",
         "dds",
 +        "exr",
         "gif",
         "jpg",
         "jpeg",
         "png",
         "psd",
         "pvr",
 -        "tga"
 +        "tga",
     ];
     /// <summary>
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`using System.Diagnostics;`
`9`	`9`	`using System.IO;`
`10`	`10`	`using System.Linq;`
	`11`	`+using System.Text;`
`11`	`12`
`12`	`13`	`namespace Baker;`
`13`	`14`
`@@ -539,13 +540,15 @@ bool ValidRegion(int x, int y)`
`539`	`540`	`}`
`540`	`541`	`};`
`541`	`542`
`542`		`- Utilities.ExecuteAndCollectProcess(process, null);`
	`543`	`+ var log = new StringBuilder();`
	`544`	`+`
	`545`	`+ Utilities.ExecuteAndCollectProcess(process, (msg) => log.AppendLine(msg));`
`543`	`546`
`544`	`547`	`if (process.ExitCode != 0)`
`545`	`548`	`{`
`546`	`549`	`Console.WriteLine($"\t\t\tArguments: {process.StartInfo.Arguments}");`
`547`	`550`
`548`		`- Console.WriteLine($"\t\tError:\n");`
	`551`	`+ Console.WriteLine($"\t\tError:\n{log}");`
`549`	`552`
`550`	`553`	`try`
`551`	`554`	`{`