StardewValley
/
SMAPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use IRawTextureData instead of intermediate tuple

This commit is contained in:
Jesse Plamondon-Willard 2022-05-30 01:22:51 -04:00
parent ba7f5701de
commit 565677c18c
No known key found for this signature in database
GPG Key ID: CF8B1456B3E29F49
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/SMAPI/Framework/ContentManagers/ModContentManager.cs
View File

@ -1,11 +1,11 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Drawing;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using BmFont; using BmFont;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Content; using Microsoft.Xna.Framework.Content;
using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Graphics;
using SkiaSharp; using SkiaSharp;
@ -19,7 +19,6 @@ using StardewValley;
using xTile; using xTile;
using xTile.Format; using xTile.Format;
using xTile.Tiles; using xTile.Tiles;
using Color = Microsoft.Xna.Framework.Color;
namespace StardewModdingAPI.Framework.ContentManagers namespace StardewModdingAPI.Framework.ContentManagers
{ {
@ -198,14 +197,14 @@ namespace StardewModdingAPI.Framework.ContentManagers
// load // load
if (asRawData || this.UseRawImageLoading) if (asRawData || this.UseRawImageLoading)
{ {
(Size size, Color[] pixels) = this.LoadRawImageData(file, asRawData); IRawTextureData raw = this.LoadRawImageData(file, asRawData);
if (asRawData) if (asRawData)
return (T)(object)new RawTextureData(size.Width, size.Height, pixels); return (T)raw;
else else
{ {
Texture2D texture = new(Game1.graphics.GraphicsDevice, size.Width, size.Height); Texture2D texture = new(Game1.graphics.GraphicsDevice, raw.Width, raw.Height);
texture.SetData(pixels); texture.SetData(raw.Data);
return (T)(object)texture; return (T)(object)texture;
} }
} }
@ -224,17 +223,18 @@ namespace StardewModdingAPI.Framework.ContentManagers
/// <remarks>This is separate to let framework mods intercept the data before it's loaded, if needed.</remarks> /// <remarks>This is separate to let framework mods intercept the data before it's loaded, if needed.</remarks>
[SuppressMessage("ReSharper", "UnusedParameter.Local", Justification = "The 'forRawData' parameter is only added for mods which may intercept this method.")] [SuppressMessage("ReSharper", "UnusedParameter.Local", Justification = "The 'forRawData' parameter is only added for mods which may intercept this method.")]
[SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "The 'forRawData' parameter is only added for mods which may intercept this method.")] [SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "The 'forRawData' parameter is only added for mods which may intercept this method.")]
private (Size Size, Color[] Data) LoadRawImageData(FileInfo file, bool forRawData) private IRawTextureData LoadRawImageData(FileInfo file, bool forRawData)
{ {
Size size;
// load raw data // load raw data
int width;
int height;
SKPMColor[] rawPixels; SKPMColor[] rawPixels;
{ {
using FileStream stream = File.OpenRead(file.FullName); using FileStream stream = File.OpenRead(file.FullName);
using SKBitmap bitmap = SKBitmap.Decode(stream); using SKBitmap bitmap = SKBitmap.Decode(stream);
rawPixels = SKPMColor.PreMultiply(bitmap.Pixels); rawPixels = SKPMColor.PreMultiply(bitmap.Pixels);
size = new(bitmap.Width, bitmap.Height); width = bitmap.Width;
height = bitmap.Height;
} }
// convert to XNA pixel format // convert to XNA pixel format
@ -247,7 +247,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
: new Color(r: pixel.Red, g: pixel.Green, b: pixel.Blue, alpha: pixel.Alpha); : new Color(r: pixel.Red, g: pixel.Green, b: pixel.Blue, alpha: pixel.Alpha);
} }
return (size, pixels); return new RawTextureData(width, height, pixels);
} }
/// <summary>Load an unpacked image file (<c>.tbin</c> or <c>.tmx</c>).</summary> /// <summary>Load an unpacked image file (<c>.tbin</c> or <c>.tmx</c>).</summary>