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

Remove Pfim references

Browse source 
* Only remove Pfim temporarily, thus commented out
This commit is contained in:
Mathias Lui 2022-11-19 15:56:18 +01:00
parent c706727e73
commit 44e1c48103
3 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
DamageCalculator/DamageCalculator.sln
View file

@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageCalculator", "DamageC
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamShared", "..\SteamShared\SteamShared\SteamShared\SteamShared.csproj", "{3632D445-DC7D-43FC-AC66-8503F50FCA2A}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamShared", "..\SteamShared\SteamShared\SteamShared\SteamShared.csproj", "{3632D445-DC7D-43FC-AC66-8503F50FCA2A}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pfim", "..\SteamShared\Pfim\src\Pfim\Pfim.csproj", "{0EA4ECBB-6036-4936-8ABC-3F8AC154AB93}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -23,10 +21,6 @@ Global
{3632D445-DC7D-43FC-AC66-8503F50FCA2A}.Debug|Any CPU.Build.0 = Debug|Any CPU {3632D445-DC7D-43FC-AC66-8503F50FCA2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3632D445-DC7D-43FC-AC66-8503F50FCA2A}.Release|Any CPU.ActiveCfg = Release|Any CPU {3632D445-DC7D-43FC-AC66-8503F50FCA2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3632D445-DC7D-43FC-AC66-8503F50FCA2A}.Release|Any CPU.Build.0 = Release|Any CPU {3632D445-DC7D-43FC-AC66-8503F50FCA2A}.Release|Any CPU.Build.0 = Release|Any CPU
{0EA4ECBB-6036-4936-8ABC-3F8AC154AB93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0EA4ECBB-6036-4936-8ABC-3F8AC154AB93}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0EA4ECBB-6036-4936-8ABC-3F8AC154AB93}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0EA4ECBB-6036-4936-8ABC-3F8AC154AB93}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

27
SteamShared/SteamShared/SteamShared/CsgoHelper.cs
View file

@ -205,22 +205,23 @@ namespace SteamShared
try try
{ {
// Read actual radar // Read actual radar
//image = new DDSImage(System.IO.File.ReadAllBytes(map.MapImagePath!)); image = new DDSImage(System.IO.File.ReadAllBytes(map.MapImagePath!));
using (var pfimImage = Pfim.Pfim.FromFile(map.MapImagePath)) // If this is still commented out after ages, I'm sorry @FutureMe
{ //using (var pfimImage = Pfim.Pfim.FromFile(map.MapImagePath))
// TODO: Do we need to support more pixel formats? //{
System.Drawing.Imaging.PixelFormat format = System.Drawing.Imaging.PixelFormat.Format24bppRgb; // // 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) // if (pfimImage.Format == Pfim.ImageFormat.Rgba32)
{ // {
format = System.Drawing.Imaging.PixelFormat.Format32bppArgb; // format = System.Drawing.Imaging.PixelFormat.Format32bppArgb;
} // }
// Maybe pin it so GC doesn't collect it, for now just ignore it // // Maybe pin it so GC doesn't collect it, for now just ignore it
var data = System.Runtime.InteropServices.Marshal.UnsafeAddrOfPinnedArrayElement(pfimImage.Data, 0); // var data = System.Runtime.InteropServices.Marshal.UnsafeAddrOfPinnedArrayElement(pfimImage.Data, 0);
image = new System.Drawing.Bitmap(pfimImage.Width, pfimImage.Height, pfimImage.Stride, format, data); // image = new System.Drawing.Bitmap(pfimImage.Width, pfimImage.Height, pfimImage.Stride, format, data);
} //}
} }
catch catch

3
SteamShared/SteamShared/SteamShared/SteamShared.csproj
View file

@ -29,9 +29,6 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="System.Drawing.Common" Version="6.0.0" /> <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Pfim\src\Pfim\Pfim.csproj" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<None Update="SourceConfig\test_source.cfg"> <None Update="SourceConfig\test_source.cfg">
<CopyToOutputDirectory>Never</CopyToOutputDirectory> <CopyToOutputDirectory>Never</CopyToOutputDirectory>