Skip to content

Commit 5ae44a4

Browse files
BabyhamstaBabyhamsta
authored andcommitted
- Updated Nuget Packages to latest versions
- Added cleaned up code from Github Pulls (TY community members for your Pull Requests!) - Replaced BitmapToFloatArray with a more optimized version - Replaced old screengrab function with new DirectX one (reduced avg 6ms~ to under 1ms per grab) - Added a few cached varables to help save on processing time - Fixed model downloading (you should be able to download models/configs again) - Fixed MaterialThemes error due to new 5.0.0 update - Adjusted how CPU delays occured to prevent random CPU usage - Optimized the AI thread to allow higher performance - Adjusted how frame captures worked to prevent slowing down the AI thread
1 parent cdb29e8 commit 5ae44a4

15 files changed

+343
-111
lines changed

Aimmy2/AILogic/AIManager.cs

Lines changed: 331 additions & 101 deletions
Large diffs are not rendered by default.

Aimmy2/Aimmy2.csproj

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,20 @@
6565
<PrivateAssets>all</PrivateAssets>
6666
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6767
</PackageReference>
68-
<PackageReference Include="Fody" Version="6.9.1">
68+
<PackageReference Include="Fody" Version="6.9.2">
6969
<PrivateAssets>all</PrivateAssets>
7070
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
7171
</PackageReference>
7272
<PackageReference Include="MaterialDesignThemes" Version="5.2.1" />
73-
<PackageReference Include="Microsoft.ML.OnnxRuntime.DirectML" Version="1.20.1" />
73+
<PackageReference Include="Microsoft.ML.OnnxRuntime.DirectML" Version="1.22.0" />
7474
<PackageReference Include="MouseKeyHook" Version="5.7.1" />
7575
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
76+
<PackageReference Include="SharpDX.Direct3D11" Version="4.2.0" />
77+
<PackageReference Include="SharpDX.DXGI" Version="4.2.0" />
7678
<PackageReference Include="Supercluster.KDTree" Version="1.0.4" />
77-
<PackageReference Include="System.Management" Version="9.0.2" />
79+
<PackageReference Include="System.Management" Version="9.0.5" />
80+
<PackageReference Include="System.Net.Http" Version="4.3.4" />
81+
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
7882
<PackageReference Include="XamlRadialProgressBar" Version="1.0.3" />
7983
</ItemGroup>
8084

Aimmy2/App.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<ResourceDictionary Source="pack://application:,,,/AntWpf;component/Styles/Theme.xaml" />
99
<ResourceDictionary Source="pack://application:,,,/AntWpf;component/Styles/Controls.xaml" />
1010
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
11-
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
11+
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.Defaults.xaml" />
1212
</ResourceDictionary.MergedDictionaries>
1313

1414
<FontFamily x:Key="AKONY">pack://application:,,,/Graphics/Fonts/#AKONY</FontFamily>

Aimmy2/MainWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@
511511
FontSize="15" />
512512
<Label x:Name="AboutDesc"
513513
Foreground="White"
514-
Content="v2.1.5"
514+
Content="v2.3.0"
515515
FontFamily="{StaticResource Atkinson Hyperlegible}"
516516
VerticalContentAlignment="Center"
517517
Padding="0,0,0,0"

Aimmy2/MainWindow.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -858,8 +858,8 @@ private void LoadCreditsMenu()
858858
AddSeparator(CreditsPanel);
859859

860860
AddTitle(CreditsPanel, "Model Creators");
861-
AddCredit(CreditsPanel, "Babyhamsta", "UniversalV4, Phantom Forces");
862-
AddCredit(CreditsPanel, "Natdog400", "AIO V2, V7");
861+
AddCredit(CreditsPanel, "Babyhamsta", "Universal, Phantom Forces");
862+
AddCredit(CreditsPanel, "Natdog400", "AIO");
863863
AddCredit(CreditsPanel, "Themida", "Arsenal, Strucid, Bad Business, Blade Ball, etc.");
864864
AddCredit(CreditsPanel, "Hogthewog", "Da Hood, FN, etc.");
865865
AddSeparator(CreditsPanel);

Aimmy2/UILibrary/ADownloadGateway.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public ADownloadGateway(string Name, string Path)
2626
DownloadButton.Content = "\xE895";
2727
SetupHttpClientHeaders();
2828

29-
var downloadUri = new Uri($"https://github.com/BabyHamsta/Aimmy/raw/master/{Path}/{Name}");
29+
var downloadUri = new Uri($"https://github.com/BabyHamsta/Aimmy/raw/Aimmy-V2/{Path}/{Name}");
3030
var downloadResult = await DownloadFileAsync(downloadUri, Path, Name);
3131

3232
if (downloadResult)
-4 MB
Binary file not shown.
-4 MB
Binary file not shown.
-4 MB
Binary file not shown.
-4 MB
Binary file not shown.

0 commit comments

Comments
 (0)