matty/CSGO-Projects
1
0
Fork 0
mirror of https://github.com/MathiasLui/CSGO-Projects.git synced 2025-05-06 22:01:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change DDSImage class to use Pfim instead, that supports DX10 headers

Browse source 
* While testing, one map couldn't be loaded (dz_county) because it had a DX10 header. It's not in the game anymore but change it anyways for more compatibility
This commit is contained in:
Mathias Lui 2022-12-10 18:36:30 +01:00
parent b21ea87e7a
commit f38a3ebef8
2 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
SteamShared/SteamShared/SteamShared/CsgoHelper.cs
View file

@ -11,6 +11,8 @@ using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Management; using System.Management;
using Pfim;
using System.Drawing;
namespace SteamShared namespace SteamShared
{ {
@ -228,36 +230,31 @@ namespace SteamShared
// Save map name without prefix // Save map name without prefix
map.MapFileName = System.IO.Path.GetFileNameWithoutExtension(file).Split('_').Last(); map.MapFileName = System.IO.Path.GetFileNameWithoutExtension(file).Split('_').Last();
DDSImage image; Bitmap image;
try try
{ {
// Read actual radar using (var pfimImage = Pfimage.FromFile(map.MapImagePath))
image = new DDSImage(System.IO.File.ReadAllBytes(map.MapImagePath!)); {
// TODO: Do we need to support more pixel formats?
System.Drawing.Imaging.PixelFormat format = System.Drawing.Imaging.PixelFormat.Format24bppRgb;
// If this is still commented out after ages, I'm sorry @FutureMe if (pfimImage.Format == Pfim.ImageFormat.Rgba32)
//using (var pfimImage = Pfim.Pfim.FromFile(map.MapImagePath)) {
//{ format = System.Drawing.Imaging.PixelFormat.Format32bppArgb;
// // TODO: Do we need to support more pixel formats? }
// System.Drawing.Imaging.PixelFormat format = System.Drawing.Imaging.PixelFormat.Format24bppRgb;
// if (pfimImage.Format == Pfim.ImageFormat.Rgba32)
// {
// format = System.Drawing.Imaging.PixelFormat.Format32bppArgb;
// }
// // Maybe pin it so GC doesn't collect it, for now just ignore it
// var data = System.Runtime.InteropServices.Marshal.UnsafeAddrOfPinnedArrayElement(pfimImage.Data, 0);
// image = new System.Drawing.Bitmap(pfimImage.Width, pfimImage.Height, pfimImage.Stride, format, data);
//}
// Maybe pin it so GC doesn't collect it, for now just ignore it
var data = System.Runtime.InteropServices.Marshal.UnsafeAddrOfPinnedArrayElement(pfimImage.Data, 0);
image = new System.Drawing.Bitmap(pfimImage.Width, pfimImage.Height, pfimImage.Stride, format, data);
}
} }
catch catch
{ {
continue; continue;
} }
if (image.BitmapImage.Width != image.BitmapImage.Height) if (image.Width != image.Height)
// We only want square map images, which should normally always be given // We only want square map images, which should normally always be given
continue; continue;
@ -265,7 +262,7 @@ namespace SteamShared
// Future self: We probably want to execute it on the thread that owns the image // Future self: We probably want to execute it on the thread that owns the image
System.Windows.Application.Current.Dispatcher.Invoke((Action)delegate System.Windows.Application.Current.Dispatcher.Invoke((Action)delegate
{ {
map.MapImage = Globals.BitmapToImageSource(image.BitmapImage); map.MapImage = Globals.BitmapToImageSource(image);
}); });
maps.Add(map); maps.Add(map);

1
SteamShared/SteamShared/SteamShared/SteamShared.csproj
View file

@ -27,6 +27,7 @@
<RuntimeHostConfigurationOption Include="System.Globalization.UseNls" Value="true" /> <RuntimeHostConfigurationOption Include="System.Globalization.UseNls" Value="true" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Pfim" Version="0.11.1" />
<PackageReference Include="System.Drawing.Common" Version="6.0.0" /> <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
<PackageReference Include="System.Management" Version="7.0.0" /> <PackageReference Include="System.Management" Version="7.0.0" />
</ItemGroup> </ItemGroup>