fix: fixed the drawing bug.

ArchiDog1998 · Jun 8, 2023 · af7198a · af7198a
1 parent 881cda7
commit af7198a
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 21 deletions.
diff --git a/RotationSolver.Basic/Configuration/PluginConfiguration.cs b/RotationSolver.Basic/Configuration/PluginConfiguration.cs
@@ -69,9 +69,9 @@ public class PluginConfiguration : IPluginConfiguration
     public bool FilterStopMark = true;
     public bool TeachingMode = true;
     public Vector3 TeachingModeColor = new(0f, 1f, 0.8f);
-    public Vector3 MovingTargetColor = new(0f, 1f, 0.8f);
-    public Vector3 TargetColor = new(1f, 0.2f, 0f);
-    public Vector3 SubTargetColor = new(1f, 0.9f, 0f);
+    public Vector4 MovingTargetColor = new(0f, 1f, 0.8f, 0.6f);
+    public Vector4 TargetColor = new(1f, 0.2f, 0f, 0.8f);
+    public Vector4 SubTargetColor = new(1f, 0.9f, 0f, 0.8f);
 
     public float DrawingHeight = 3;
     public float SampleLength = 0.2f;

diff --git a/RotationSolver/RotationSolver.csproj b/RotationSolver/RotationSolver.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
 	  <Description>Based on the pve combat information in one frame, find the best action.</Description>
 	  <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+	  <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/RotationSolver/RotationSolverPlugin.cs b/RotationSolver/RotationSolverPlugin.cs
@@ -1,3 +1,4 @@
+using Clipper2Lib;
 using Dalamud.Game.ClientState.Conditions;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Game.Text.SeStringHandling.Payloads;
@@ -15,6 +16,7 @@
 using RotationSolver.Localization;
 using RotationSolver.UI;
 using RotationSolver.Updaters;
+using System.IO;
 using Module = ECommons.Module;
 
 namespace RotationSolver;
@@ -35,8 +37,10 @@ public sealed class RotationSolverPlugin : IDalamudPlugin, IDisposable
     public RotationSolverPlugin(DalamudPluginInterface pluginInterface)
     {
         ECommonsMain.Init(pluginInterface, this, Module.DalamudReflector);
-        ThreadLoadImageHandler.TryGetIconTextureWrap(0, false, out _);
 
+        //Init!
+        //ThreadLoadImageHandler.TryGetIconTextureWrap(0, false, out _);
+        Clipper.InflatePaths(new PathsD(new PathD[] { Clipper.MakePath(new double[] {0, 0, 1, 1 }) }), 0, JoinType.Round, EndType.Joined);
         try
         {
             Service.Config = JsonConvert.DeserializeObject<PluginConfiguration>(

diff --git a/RotationSolver/UI/PainterManager.cs b/RotationSolver/UI/PainterManager.cs
@@ -80,8 +80,7 @@ class TargetDrawing : Drawing3DPoly
 
         public TargetDrawing()
         {
-            var c = Service.Config.TargetColor;
-            var TColor = ImGui.GetColorU32(new Vector4(c.X, c.Y, c.Z, 1));
+            var TColor = ImGui.GetColorU32(Service.Config.TargetColor);
             _target = new Drawing3DCircularSector(default, 0, TColor, 3)
             {
                 IsFill = false,
@@ -102,18 +101,15 @@ public override void UpdateOnFrame(XIVPainter.XIVPainter painter)
             var d = DateTime.Now.Millisecond / 1000f;
             var ratio = (float)DrawingHelper.EaseFuncRemap(EaseFuncType.None, EaseFuncType.Cubic)(d);
 
-            var c = Service.Config.TargetColor;
-            var TColor = ImGui.GetColorU32(new Vector4(c.X, c.Y, c.Z, 1));
-            _target.Color = TColor;
+            _target.Color = ImGui.GetColorU32(Service.Config.TargetColor);
 
             List<IDrawing3D> subItems = new List<IDrawing3D>() { _target };
             _target.Center = act.Target.Position;
             _target.Radius = targetRadius * ratio;
 
             if (DataCenter.HostileTargets.Contains(act.Target) || act.Target == Player.Object && !act.IsFriendly)
             {
-                c = Service.Config.SubTargetColor;
-                var SColor = ImGui.GetColorU32(new Vector4(c.X, c.Y, c.Z, 1));
+                var SColor = ImGui.GetColorU32(Service.Config.SubTargetColor);
 
                 foreach (var t in DataCenter.HostileTargets)
                 {
@@ -205,8 +201,7 @@ public static void Init()
 
         _positional = new PositionalDrawing();
 
-        var c = Service.Config.MovingTargetColor;
-        var color = ImGui.GetColorU32(new Vector4(c.X, c.Y, c.Z, 1));
+        var color = ImGui.GetColorU32(Service.Config.MovingTargetColor);
         var movingTarget = new Drawing3DHighlightLine(default, default, 0, color, 3);
         movingTarget.UpdateEveryFrame = () =>
         {
@@ -220,8 +215,7 @@ public static void Init()
 
             movingTarget.Radius = 0.5f;
 
-            var c = Service.Config.MovingTargetColor;
-            movingTarget.Color = ImGui.GetColorU32(new Vector4(c.X, c.Y, c.Z, 1));
+            movingTarget.Color = ImGui.GetColorU32(Service.Config.MovingTargetColor);
 
             movingTarget.From = Player.Object.Position;
             movingTarget.To = tar.Value;
@@ -230,9 +224,24 @@ public static void Init()
         _painter.AddDrawings(_positional, annulus, movingTarget, new TargetDrawing(), new TargetText());
 
 #if DEBUG
-        //_painter.AddDrawings(new Drawing3DCircularSectorO(Player.Object, 3, ImGui.ColorConvertFloat4ToU32(new Vector4(1f, 0.5f, 0.4f, 0.15f)), 5), 
+        //_painter.AddDrawings(
+        //    new Drawing3DCircularSectorO(Player.Object, 3, ImGui.ColorConvertFloat4ToU32(new Vector4(1f, 0.5f, 0.4f, 0.5f)), -5, arcStartSpan: new Vector2(0, MathF.PI /2))
+        //    {
+        //        IsFill = false,
+        //    },
+
         //    new Drawing3DAnnulus(Player.Object.Position, 10, 10 + Service.Config.MeleeRangeOffset,
-        //    ImGui.ColorConvertFloat4ToU32(new Vector4(1f, 0.8f, 0.75f, 0.15f)), 2));
+        //    ImGui.ColorConvertFloat4ToU32(new Vector4(1f, 0.8f, 0.75f, 0.15f)), 2)
+        //    {
+        //        DeadTime = DateTime.Now.AddSeconds(5),
+        //    }
+
+            //new Drawing3DCircularSector(Player.Object.Position, 10, 
+            //ImGui.ColorConvertFloat4ToU32(new Vector4(1f, 0.8f, 0.75f, 0.15f)), 2)
+            //{
+            //    DeadTime = DateTime.Now.AddSeconds(5),
+            //}
+        //    );
         //var color = ImGui.ColorConvertFloat4ToU32(new Vector4(1f, 0.5f, 0.4f, 0.15f));
 
         //var p = new Drawing3DCircularSector(Player.Object.Position, 5, color, 5);

diff --git a/RotationSolver/UI/RotationConfigWindow_Param.cs b/RotationSolver/UI/RotationConfigWindow_Param.cs
@@ -187,7 +187,7 @@ private void DrawParamDisplay()
         {
             ImGuiHelper.Spacing();
 
-            DrawColor3(LocalizationManager.RightLang.ConfigWindow_Param_MovingTargetColor,
+            DrawColor4(LocalizationManager.RightLang.ConfigWindow_Param_MovingTargetColor,
                 ref Service.Config.MovingTargetColor, Service.Default.MovingTargetColor);
         }
 
@@ -198,12 +198,12 @@ private void DrawParamDisplay()
         {
             ImGuiHelper.Spacing();
 
-            DrawColor3(LocalizationManager.RightLang.ConfigWindow_Param_TargetColor,
+            DrawColor4(LocalizationManager.RightLang.ConfigWindow_Param_TargetColor,
                 ref Service.Config.TargetColor, Service.Default.TargetColor);
 
             ImGuiHelper.Spacing();
 
-            DrawColor3(LocalizationManager.RightLang.ConfigWindow_Param_SubTargetColor,
+            DrawColor4(LocalizationManager.RightLang.ConfigWindow_Param_SubTargetColor,
                 ref Service.Config.SubTargetColor, Service.Default.SubTargetColor);
         }
 

diff --git a/XIVPainter b/XIVPainter