Version 2 upgrade (#2)

* Updated to NET 10.0
* Moved texture names to SA3D.Modeling
* Using Amicitia.IO for binary IO now
* Textures, Index Textures, Palettes and Palettes now available as interfaces
* Readonly classes available to prevent data from being modified
* Improved Image reading/loading system, now supporting more formats
* Added mipmap support and utilities for safe texture data handling

Author: Justin113D

.github/workflows/build-and-publish.yml

@@ -8,12 +8,16 @@ on:
       - "[0-9]+.[0-9]+.[0-9]+"
 
 jobs:
-  build:
+  build-and-publish:
     runs-on: ubuntu-latest
 
+    permissions:
+      id-token: write
+      contents: write
+
     steps:
     - name: Checkout Code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v7
       with:
         fetch-depth: 0
         submodules: 'recursive'
@@ -24,9 +28,15 @@ jobs:
     - name: Build
       run: dotnet build -c Release ./src
 
+    - name: NuGet login 
+      uses: NuGet/login@v1
+      id: login
+      with:
+        user: ${{ secrets.NUGET_USER  }}
+
     - name: "Upload Packages"
       uses: X-Hax/SA3D.ProjectConfigurations/.github/actions/upload-packages@main
       with:
-        nuget-key: ${{ secrets.NUGET_KEY }}
+        nuget-key: ${{ steps.login.outputs.NUGET_API_KEY }}
         is-release: ${{ startsWith(github.ref, 'refs/tags/') }}
-        release-tag: ${{ github.ref_name }}
+        release-tag: ${{ github.ref_name }}

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
     - name: Checkout Code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v7
       with:
         fetch-depth: 0
         submodules: 'recursive'
@@ -24,4 +24,4 @@ jobs:
       uses: X-Hax/SA3D.ProjectConfigurations/.github/actions/setup-sdks-components@main
 
     - name: Build
-      run: dotnet build -c Release ./src
+      run: dotnet build -c Release ./src

src/SA3D.ProjectConfigurations

@@ -0,0 +1,64 @@
+using System;
+
+namespace SA3D.Texturing
+{
+	/// <summary>
+	/// Index texture interface
+	/// </summary>
+	public interface IIndexTexture : ITexture
+	{
+		/// <summary>
+		/// Palette used to generate colored image data. If none is passed, grayscale values will be used
+		/// </summary>
+		public ITexturePalette? Palette { get; set; }
+
+		/// <summary>
+		/// Color-row-index of the palette to use (Row size of 16 when <see cref="IsIndex4"/>, otherwise 256).
+		/// </summary>
+		public int PaletteRow { get; set; }
+
+		/// <summary>
+		/// Whether the indices are actually 4 bits big, instead of 8 bits.
+		/// <br/> When setting to <see langword="true"/>, the lower 4 bits of every byte will be ignored.
+		/// </summary>
+		public bool IsIndex4 { get; }
+
+		TextureType ITexture.TextureType => IsIndex4 ? TextureType.Index4 : TextureType.Index8;
+
+
+		/// <summary>
+		/// Returns the image index pixel data, where each pixel is 1 byte
+		/// </summary>+
+		/// <param name="mipMapLevel">Mip map level of which to get the data</param>
+		public ReadOnlySpan<byte> GetIndexPixelData(int mipMapLevel = 0);
+
+		ReadOnlySpan<byte> ITexture.GetRGBA32Data(int mipmaplevel)
+		{
+			return TextureUtilities.ApplyPaletteToIndexTexture(this.GetUsedPaletteColors(), GetIndexPixelData(mipmaplevel), IsIndex4);
+		}
+	}
+
+	/// <summary>
+	/// Index texture extensions
+	/// </summary>
+	public static class IndexTextureExtensions
+	{
+		/// <summary>
+		/// Gets palette color data that will actually be used by the texture
+		/// </summary>
+		/// <returns></returns>
+		public static ReadOnlySpan<byte> GetUsedPaletteColors(this IIndexTexture texture)
+		{
+			ReadOnlySpan<byte> colorData = (texture.Palette ?? ITexturePalette.GetDefaultPalette(texture.IsIndex4)).GetColorData();
+			int paletteSize = (texture.IsIndex4 ? 16 : 256) * 4;
+			ReadOnlySpan<byte> result = colorData[(paletteSize * texture.PaletteRow % colorData.Length)..];
+
+			if(result.Length > paletteSize)
+			{
+				result = result[..paletteSize];
+			}
+
+			return result;
+		}
+	}
+}

src/SA3D.Texturing/ColorTexture.cs

@@ -0,0 +1,53 @@
+namespace SA3D.Texturing.IO
+{
+	/// <summary>
+	/// Image formats
+	/// </summary>
+	public enum ImageFormat
+	{
+		/// <summary>
+		/// Portable network graphic
+		/// </summary>
+		PNG,
+
+		/// <summary>
+		/// Bitmap
+		/// </summary>
+		BMP,
+
+		/// <summary>
+		/// Joint photographic (experts) group
+		/// </summary>
+		JPG,
+
+		/// <summary>
+		/// Portable bitmap
+		/// </summary>
+		PBM,
+
+		/// <summary>
+		/// Quite OK Image Format
+		/// </summary>
+		QOI,
+
+		/// <summary>
+		/// Truevision Graphics Adapter
+		/// </summary>
+		TGA,
+
+		/// <summary>
+		/// Tagged Image File Format
+		/// </summary>
+		TIFF,
+
+		/// <summary>
+		/// Web-picture
+		/// </summary>
+		WEBP,
+
+		/// <summary>
+		/// DirectDraw Surface
+		/// </summary>
+		DDS
+	}
+}