Merge branch 'master' of https://github.com/jackletter/SharpGLTF

Author: huqingjie

.github/workflows/publishAlpha.yml renamed to .github/workflows/PublishToNuget.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Setup .NET SDK
-      uses: actions/setup-dotnet@v3    
+      uses: actions/setup-dotnet@v4  
     - name: Install dependencies
       run: dotnet restore
     - name: Build

.github/workflows/dotnet.yml renamed to .github/workflows/TestCommit.yml

@@ -13,13 +13,18 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+  
       - name: Setup dotnet ${{ matrix.dotnet-version }}
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ matrix.dotnet-version }}
+
       - name: Install dependencies
         run: dotnet restore
+
       - name: Build
-        run: dotnet build
+        # https://github.com/dotnet/core/issues/7840  failed to build with 0 errors
+        run: dotnet build --configuration Debug --no-restore --disable-build-servers
+
       - name: Test
-        run: dotnet test ./tests/SharpGLTF.Ext.3DTiles.Tests/SharpGLTF.Ext.3DTiles.Tests.csproj
+        run: dotnet test ./tests/SharpGLTF.Ext.3DTiles.Tests/SharpGLTF.Ext.3DTiles.Tests.csproj --no-build --verbosity diagnostic

SharpGLTF.sln

@@ -6,10 +6,10 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{29566B60-311D-42A0-9E8D-C48DECDD587F}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
-		.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
-		.github\workflows\publishAlpha.yml = .github\workflows\publishAlpha.yml
+		.github\workflows\PublishToNuget.yml = .github\workflows\PublishToNuget.yml
 		README.md = README.md
 		SharpGLTF.ruleset = SharpGLTF.ruleset
+		.github\workflows\TestCommit.yml = .github\workflows\TestCommit.yml
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{072B725F-773F-4751-9616-E9778897C1D2}"
@@ -58,7 +58,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpGLTF.Plotly", "example
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpGLTF.ThirdParty.Tests", "tests\SharpGLTF.ThirdParty.Tests\SharpGLTF.ThirdParty.Tests.csproj", "{38B27C0B-DB22-4CB7-A6DA-4A6C2A8385A8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpGLTF.Trimmed.App", "tests\SharpGLTF.Trimmed.App\SharpGLTF.Trimmed.App.csproj", "{A09437F7-403C-44A2-B1FE-15CC535B64CA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpGLTF.Trimmed.App", "examples\SharpGLTF.Trimmed.App\SharpGLTF.Trimmed.App.csproj", "{A09437F7-403C-44A2-B1FE-15CC535B64CA}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpGLTF.Runtime", "src\SharpGLTF.Runtime\SharpGLTF.Runtime.csproj", "{E06015B0-8DBC-4DC9-81A2-605DAFE36821}"
 EndProject
@@ -170,7 +170,7 @@ Global
 		{7FEFC259-51D6-4409-8724-8DE0EA8D5CD9} = {0CBF510D-D836-40BA-95EC-E93FDBB90632}
 		{A63C2A2D-950F-4C76-9299-2B2D325A8653} = {83E7E49D-8A28-45E8-9DBD-1F3AEDEF3E42}
 		{38B27C0B-DB22-4CB7-A6DA-4A6C2A8385A8} = {0CBF510D-D836-40BA-95EC-E93FDBB90632}
-		{A09437F7-403C-44A2-B1FE-15CC535B64CA} = {0CBF510D-D836-40BA-95EC-E93FDBB90632}
+		{A09437F7-403C-44A2-B1FE-15CC535B64CA} = {83E7E49D-8A28-45E8-9DBD-1F3AEDEF3E42}
 		{E06015B0-8DBC-4DC9-81A2-605DAFE36821} = {072B725F-773F-4751-9616-E9778897C1D2}
 		{3925E45C-E7AA-4396-9567-4D8B1D1EF1C6} = {0CBF510D-D836-40BA-95EC-E93FDBB90632}
 		{F98E7E4B-EF27-48A0-BA56-730F14CEEEE1} = {072B725F-773F-4751-9616-E9778897C1D2}

build/SharpGLTF.CodeGen/SharpGLTF.CodeGen.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LibGit2Sharp" Version="0.29.0" />    
+    <PackageReference Include="LibGit2Sharp" Version="0.30.0" />    
     <PackageReference Include="NJsonSchema.CodeGeneration.CSharp" Version="11.0.0" />
     <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.0" />
   </ItemGroup>

tests/SharpGLTF.Trimmed.App/Program.cs renamed to examples/SharpGLTF.Trimmed.App/Program.cs

@@ -286,7 +286,13 @@ public static void VerifyAccessorBounds(MemoryAccessor memory, IReadOnlyList<dou
             xinfo.Dimensions = DIMENSIONS.SCALAR;
             memory = new MemoryAccessor(memory.Data, xinfo);
 
-            var array = new MultiArray(memory.Data, memory.Attribute.ByteOffset, memory.Attribute.ItemsCount, memory.Attribute.ByteStride, dimensions, memory.Attribute.Encoding, memory.Attribute.Normalized);
+            var array = new MultiArray(
+                memory.Data,
+                memory.Attribute.ByteOffset,
+                memory.Attribute.ItemsCount,
+                memory.Attribute.ByteStride,
+                dimensions, memory.Attribute.Encoding,
+                false); // bounds checks are done without normalization; https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#_accessor_max
 
             var current = new float[dimensions];
 

tests/SharpGLTF.Trimmed.App/Properties/PublishProfiles/FolderProfile.pubxml renamed to examples/SharpGLTF.Trimmed.App/Properties/PublishProfiles/FolderProfile.pubxml

@@ -307,6 +307,23 @@ public string MimeType
                 throw new InvalidOperationException("Image format not recognized.");
             }
         }
+        
+        /// <summary>
+        /// If the given path ends with an image extension, it removes the extension.
+        /// </summary>
+        /// <param name="path">A file path</param>
+        /// <returns>a trimmed path if it had an image extension, or the original path.</returns>
+        public static string TrimImageExtension(string path)
+        {
+            if (path == null) return null;
+
+            foreach (var ext in new string[] { ".jpg",".jpeg",".png",".dds",".webp",".ktx2" })
+            {
+                if (path.EndsWith(ext, StringComparison.OrdinalIgnoreCase)) return path.Substring(0, path.Length - ext.Length);
+            }
+
+            return path;
+        }
 
         #endregion