fix: fixed auto cancel and texture icon.

ArchiDog1998 · Jun 19, 2023 · f5af92c · f5af92c
1 parent a1315ca
commit f5af92c
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 25 deletions.
diff --git a/RotationSolver.Basic/Data/IconSet.cs b/RotationSolver.Basic/Data/IconSet.cs
@@ -37,6 +37,20 @@ public static class IconSet
     static readonly SortedDictionary<string, TextureWrap> _texturesPath = new();
     static readonly HashSet<string> _loadingTexturePath = new();
 
+    static readonly Dictionary<uint, uint> _actionIcons = new();
+
+    public static TextureWrap GetTexture(this IAction action, bool isAdjust = true)
+    {
+        uint iconId = 0;
+        if (action != null && !_actionIcons.TryGetValue(isAdjust ? action.AdjustedID : action.ID, out iconId))
+        {
+            iconId = action is IBaseAction ? Service.GetSheet<Lumina.Excel.GeneratedSheets.Action>().GetRow(action.AdjustedID).Icon
+                : Service.GetSheet<Lumina.Excel.GeneratedSheets.Item>().GetRow(action.AdjustedID).Icon;
+            _actionIcons[action.AdjustedID] = iconId;
+        }
+        return GetTexture(iconId);
+    }
+
     public static TextureWrap GetTexture(this ITexture text) => GetTexture(text?.IconID ?? 0);
 
     public static TextureWrap GetTexture(uint id)

diff --git a/RotationSolver/Commands/RSCommands_Actions.cs b/RotationSolver/Commands/RSCommands_Actions.cs
@@ -117,7 +117,8 @@ private static void CancelState()
         static float _lastCountdownTime = 0;
         internal static void UpdateRotationState()
         {
-            if(DataCenter.StateType == StateCommandType.Cancel && ActionUpdater._cancelTime != DateTime.MinValue)
+            if(ActionUpdater._cancelTime != DateTime.MinValue && 
+                (DataCenter.StateType == StateCommandType.Cancel || DataCenter.InCombat))
             {
                 ActionUpdater._cancelTime = DateTime.MinValue;
             }

diff --git a/RotationSolver/UI/ControlWindow.cs b/RotationSolver/UI/ControlWindow.cs
@@ -195,11 +195,11 @@ static void DrawCommandAction(IAction gcd, IAction ability, SpecialCommandType c
 
         ImGui.SetCursorPosX(ImGui.GetCursorPosX() + Math.Max(0, strWidth / 2 - width / 2));
 
-        var texture = GetTexture(gcd);
+        var texture = IconSet.GetTexture(gcd);
         if(texture != null)
         {
             DrawIAction(texture.ImGuiHandle, baseId + nameof(gcd), gcdW, command, help);
-            texture = GetTexture(ability);
+            texture = IconSet.GetTexture(ability);
             if (texture != null)
             {
                 ImGui.SameLine();
@@ -234,7 +234,7 @@ static void HighLight(Vector2 pt, Vector2 size, float thickness = 2f)
 
     static void DrawCommandAction(IAction ability, SpecialCommandType command, Vector4 color)
     {
-        DrawCommandAction(GetTexture(ability), command, color);
+        DrawCommandAction(IconSet.GetTexture(ability), command, color);
     }
 
     static void DrawCommandAction(uint iconId, SpecialCommandType command, Vector4 color)
@@ -346,19 +346,6 @@ static string GetHelp(StateCommandType command)
         return help += "\n \n" + LocalizationManager.RightLang.ConfigWindow_Control_ResetButtonOrKeyCommand;
     }
 
-    static readonly Dictionary<uint, uint> _actionIcons = new();
-
-    static TextureWrap GetTexture(IAction action, bool isAdjust = true)
-    {
-        uint iconId = 0;
-        if(action != null && !_actionIcons.TryGetValue(isAdjust ? action.AdjustedID : action.ID, out iconId))
-        {
-            iconId = action is IBaseAction ? Service.GetSheet<Lumina.Excel.GeneratedSheets.Action>().GetRow(action.AdjustedID).Icon
-                : Service.GetSheet<Lumina.Excel.GeneratedSheets.Item>().GetRow(action.AdjustedID).Icon;
-            _actionIcons[action.AdjustedID] = iconId;
-        }
-        return IconSet.GetTexture(iconId);
-    }
 
     static void DrawIAction(nint handle, string id, float width, SpecialCommandType command, string help)
     {
@@ -440,7 +427,7 @@ static void DrawIAction(nint handle, string id, float width, StateCommandType co
 
     internal static (Vector2, Vector2) DrawIAction(IAction action, float width, float percent, bool isAdjust = true)
     {
-        var texture = GetTexture(action, isAdjust);
+        var texture = IconSet.GetTexture(action, isAdjust);
         if (texture == null) return (default, default);
         var result = DrawIAction(texture.ImGuiHandle, width, action == null ? -1 : percent);
         if (action != null) ImGuiHelper.HoveredString(action.Name, () =>

diff --git a/RotationSolver/UI/PainterManager.cs b/RotationSolver/UI/PainterManager.cs
@@ -108,14 +108,21 @@ public override void UpdateOnFrame(XIVPainter.XIVPainter painter)
 
             var d = DateTime.Now.Millisecond / 1000f;
             var ratio = (float)DrawingHelper.EaseFuncRemap(EaseFuncType.None, EaseFuncType.Cubic)(d);
-            List<IDrawing3D> subItems = new List<IDrawing3D>() { _target, _targetImage };
+            List<IDrawing3D> subItems = new List<IDrawing3D>();
 
-            _target.Color = ImGui.GetColorU32(Service.Config.TargetColor);
-            _target.Center = act.Target.Position;
-            _target.Radius = targetRadius * ratio;
-
-            _targetImage.Position = act.Target.Position;
-            _targetImage.SetTexture(act.GetTexture(), Service.Config.TargetIconSize);
+            if(Service.Config.TargetIconSize > 0)
+            {
+                _targetImage.Position = act.Target.Position;
+                _targetImage.SetTexture(act.GetTexture(true), Service.Config.TargetIconSize);
+                subItems.Add(_targetImage);
+            }
+            else
+            {
+                _target.Color = ImGui.GetColorU32(Service.Config.TargetColor);
+                _target.Center = act.Target.Position;
+                _target.Radius = targetRadius * ratio;
+                subItems.Add(_target);
+            }
 
             if (DataCenter.HostileTargets.Contains(act.Target) || act.Target == Player.Object && !act.IsFriendly)
             {