pusblish

NAinfini · Aug 26, 2023 · aaf4873 · aaf4873
1 parent f48f44b
commit aaf4873
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 41 deletions.
diff --git a/GameZBDAlchemyStoneTapper.sln b/GameZBDAlchemyStoneTapper.sln
@@ -39,8 +39,8 @@ Global
  {7B54F7B9-2653-40D9-AD76-6928FF466FF9}.Release|ARM32.Build.0 = Release|ARM32
  {7B54F7B9-2653-40D9-AD76-6928FF466FF9}.Release|ARM64.ActiveCfg = Release|ARM64
  {7B54F7B9-2653-40D9-AD76-6928FF466FF9}.Release|ARM64.Build.0 = Release|ARM64
- {7B54F7B9-2653-40D9-AD76-6928FF466FF9}.Release|x64.ActiveCfg = Release|x64
- {7B54F7B9-2653-40D9-AD76-6928FF466FF9}.Release|x64.Build.0 = Release|x64
+ {7B54F7B9-2653-40D9-AD76-6928FF466FF9}.Release|x64.ActiveCfg = Release|Any CPU
+ {7B54F7B9-2653-40D9-AD76-6928FF466FF9}.Release|x64.Build.0 = Release|Any CPU
  {7B54F7B9-2653-40D9-AD76-6928FF466FF9}.Release|x86.ActiveCfg = Release|x86
  {7B54F7B9-2653-40D9-AD76-6928FF466FF9}.Release|x86.Build.0 = Release|x86
  {3AB215EA-4757-4C60-8681-9B5453AD4738}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

diff --git a/GameZBDAlchemyStoneTapper/FodyWeavers.xml b/GameZBDAlchemyStoneTapper/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+ <Costura />
+</Weavers>
diff --git a/GameZBDAlchemyStoneTapper/GameZBDAlchemyStoneTapper.csproj b/GameZBDAlchemyStoneTapper/GameZBDAlchemyStoneTapper.csproj
@@ -22,31 +22,19 @@
  <OutputPath>bin\x64\Release\</OutputPath>
  </PropertyGroup>
  <ItemGroup>
- <PackageReference Include="Emgu.CV">
- <Version>4.7.0.5276</Version>
+ <PackageReference Include="Costura.Fody" Version="5.7.0">
+ <PrivateAssets>all</PrivateAssets>
+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  </PackageReference>
- <PackageReference Include="Emgu.CV.Bitmap">
- <Version>4.7.0.5276</Version>
- </PackageReference>
- <PackageReference Include="Emgu.CV.runtime.windows">
- <Version>4.7.0.5276</Version>
- </PackageReference>
- <PackageReference Include="IronSoftware.System.Drawing" Version="2023.9.2" />
  <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers">
  <Version>0.4.421302</Version>
  </PackageReference>
  <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.15.1" />
- <PackageReference Include="OpenCV">
- <Version>2.4.11</Version>
- </PackageReference>
- <PackageReference Include="SixLabors.Fonts" Version="1.0.0" />
- <PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
  <PackageReference Include="Microsoft.AspNetCore.SystemWebAdapters" Version="1.2.0" />
  <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
- <PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
+ <PackageReference Include="NumSharp" Version="0.30.0" />
  <PackageReference Include="System.ComponentModel.Composition" Version="7.0.0" />
  </ItemGroup>
  <ItemGroup>
- <ProjectReference Include="..\..\..\..\..\Downloads\Yolov7net-master\Yolov7net-master\src\Yolov7net\IVilson.AI.Yolov7net.csproj" />
  </ItemGroup>
 </Project>
diff --git a/GameZBDAlchemyStoneTapper/ObjectDetection.cs b/GameZBDAlchemyStoneTapper/ObjectDetection.cs
@@ -1,6 +1,4 @@
-using IronSoftware.Drawing;
-using SixLabors.ImageSharp;
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
@@ -61,7 +59,6 @@ public Bitmap drawRectangles(Bitmap image, List<YoloPrediction> predictions)
  new System.Drawing.PointF(x, y));
  }
  }
- image.Save("./temp.png");
  return image;
  }
 

diff --git a/GameZBDAlchemyStoneTapper/SODForm.cs b/GameZBDAlchemyStoneTapper/SODForm.cs
@@ -1,5 +1,4 @@
-using IronSoftware.Drawing;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
@@ -142,7 +141,7 @@ private void startBtn_Click(object sender, EventArgs e)
  this.ScreenHeight = tempArea.Height;
  }
  }
- AnyBitmap tempMap = CaptureScreen.Snip(ScreenX, ScreenY, ScreenWidth, ScreenHeight);
+ Bitmap tempMap = CaptureScreen.Snip(ScreenX, ScreenY, ScreenWidth, ScreenHeight);
 
  OBJ = new ObjectDetection();
  OBJ.loadLists(selectedAlchemyStone, selectedMaterial);

diff --git a/GameZBDAlchemyStoneTapper/SOLForm.cs b/GameZBDAlchemyStoneTapper/SOLForm.cs
@@ -1,5 +1,4 @@
-using IronSoftware.Drawing;
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -148,7 +147,7 @@ private void startBtn_Click(object sender, EventArgs e)
  this.ScreenHeight = tempArea.Height;
  }
  }
- AnyBitmap tempMap = CaptureScreen.Snip(ScreenX, ScreenY, ScreenWidth, ScreenHeight);
+ Bitmap tempMap = CaptureScreen.Snip(ScreenX, ScreenY, ScreenWidth, ScreenHeight);
 
  OBJ = new ObjectDetection();
  OBJ.loadLists(selectedAlchemyStone, selectedMaterial);

diff --git a/GameZBDAlchemyStoneTapper/SOPForm.cs b/GameZBDAlchemyStoneTapper/SOPForm.cs
@@ -1,5 +1,4 @@
-using IronSoftware.Drawing;
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -147,7 +146,7 @@ private void startBtn_Click(object sender, EventArgs e)
  this.ScreenHeight = tempArea.Height;
  }
  }
- AnyBitmap tempMap = CaptureScreen.Snip(ScreenX, ScreenY, ScreenWidth, ScreenHeight);
+ Bitmap tempMap = CaptureScreen.Snip(ScreenX, ScreenY, ScreenWidth, ScreenHeight);
 
  OBJ = new ObjectDetection();
  OBJ.loadLists(selectedAlchemyStone, selectedMaterial);

diff --git a/GameZBDAlchemyStoneTapper/Yolov7net/IVilson.AI.Yolov7net.csproj b/GameZBDAlchemyStoneTapper/Yolov7net/IVilson.AI.Yolov7net.csproj
@@ -8,6 +8,7 @@
  <Authors>ivilson.com</Authors>
  <Version>1.0.3</Version>
  <Description>yolov7 onnx interface for .net 6</Description>
+ <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/GameZBDAlchemyStoneTapper/Yolov7net/Yolov8.cs b/GameZBDAlchemyStoneTapper/Yolov7net/Yolov8.cs
@@ -16,7 +16,6 @@ public class Yolov8 : IDisposable
 
  public Yolov8(string modelPath, bool useCuda = false)
  {
-
  if (useCuda)
  {
  SessionOptions opts = SessionOptions.MakeSessionOptionWithCudaProvider();
@@ -47,7 +46,7 @@ public void SetupYoloDefaultLabels()
  SetupLabels(s);
  }
 
- public List<YoloPrediction> Predict(Image image, float conf_thres = 0, float iou_thres = 0,bool useNumpy = false)
+ public List<YoloPrediction> Predict(Image image, float conf_thres = 0, float iou_thres = 0, bool useNumpy = false)
  {
  if (conf_thres > 0f)
  {
@@ -137,9 +136,9 @@ private List<YoloPrediction> ParseDetect(DenseTensor<float> output, Image image)
  {
  var result = new ConcurrentBag<YoloPrediction>();
 
- var (w, h) = (image.Width, image.Height); 
+ var (w, h) = (image.Width, image.Height);
  var (xGain, yGain) = (_model.Width / (float)w, _model.Height / (float)h);
- var gain = Math.Min(xGain, yGain); 
+ var gain = Math.Min(xGain, yGain);
 
  var (xPad, yPad) = ((_model.Width - w * gain) / 2, (_model.Height - h * gain) / 2);
 
@@ -178,7 +177,6 @@ private List<YoloPrediction> ParseDetect(DenseTensor<float> output, Image image)
  return result.ToList();
  }
 
-
  private List<YoloPrediction> ParseDetectNumpy(DenseTensor<float> output, Image image)
  {
  float[] outputArray = output.ToArray();
@@ -209,10 +207,8 @@ private List<YoloPrediction> ProcessResult(NDArray data, Image image)
  return result.ToList();
  }
 
-
  private int[] nms(NDArray boxes, NDArray scores, float iou_threshold = .5f)
  {
-
  // Sort by score
  var sortedIndices = np.argsort<float>(scores)["::-1"];
 
@@ -275,7 +271,6 @@ public NDArray Xywh2Xyxy(NDArray x)
 
  private NDArray rescale_boxes(NDArray boxes, int width, int height)
  {
-
  NDArray inputShape = np.array(new float[] { _model.Width, _model.Height, _model.Width, _model.Height });
  NDArray resizedBoxes = np.divide(boxes, inputShape);
  resizedBoxes = np.multiply(resizedBoxes, new float[] { width, height, width, height });
@@ -285,7 +280,6 @@ private NDArray rescale_boxes(NDArray boxes, int width, int height)
  private void prepare_input(Image img)
  {
  Bitmap bmp = Utils.ResizeImage(img, _model.Width, _model.Height);
-
  }
 
  private void get_input_details()
@@ -306,4 +300,4 @@ public void Dispose()
  _inferenceSession.Dispose();
  }
  }
-}
+}