Skip to content
This repository has been archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
fix: fixed with some bugs.
Browse files Browse the repository at this point in the history
  • Loading branch information
ArchiDog1998 committed Jun 3, 2023
1 parent c879958 commit a151047
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 8 deletions.
4 changes: 4 additions & 0 deletions Resources/AnimationLockTime.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
"2876": 0.6,
"2878": 0.6,
"2890": 0.6,
"3543": 0.6,
"3545": 0.6,
"3546": 0.6,
"3549": 0.6,
Expand Down Expand Up @@ -130,6 +131,7 @@
"7387": 0.6,
"7388": 0.6,
"7389": 0.6,
"7394": 0.6,
"7395": 0.6,
"7396": 0.6,
"7398": 0.6,
Expand Down Expand Up @@ -186,6 +188,7 @@
"7542": 0.6,
"7546": 0.6,
"7548": 0.6,
"7549": 0.6,
"7557": 0.6,
"7559": 0.6,
"7560": 0.6,
Expand Down Expand Up @@ -352,6 +355,7 @@
"25840": 0.6,
"25865": 0.1,
"25870": 0.6,
"25882": 0.6,
"25885": 0.6,
"26768": 0.1,
"26798": 2.1,
Expand Down
6 changes: 6 additions & 0 deletions Resources/HostileCastingArea.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@
8581,
9523,
9808,
11234,
11238,
11246,
11256,
11259,
11440,
13262,
13314,
13343,
Expand Down
22 changes: 15 additions & 7 deletions RotationSolver/UI/PainterManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ internal static class PainterManager
{
class PositionalDrawing : Drawing3DPoly
{
Drawing3DCircularSectorFO _noneCir, _flankCir, _rearCir;
Drawing3DCircularSectorO _noneCir, _flankCir, _rearCir;

public EnemyPositional Positional { get; set; }

Expand All @@ -19,11 +19,11 @@ public PositionalDrawing()
var right = ImGui.ColorConvertFloat4ToU32(new Vector4(1, 1, 1, 0.15f));
var wrong = ImGui.ColorConvertFloat4ToU32(new Vector4(0.3f, 0.8f, 0.2f, 0.15f));

_noneCir = new Drawing3DCircularSectorFO(null, 3, wrong, 2);
_noneCir = new Drawing3DCircularSectorO(null, 3, wrong, 2);

_flankCir = new Drawing3DCircularSectorFO(null, 3, wrong, 2, XIVPainter.Enum.RadiusInclude.IncludeBoth,
_flankCir = new Drawing3DCircularSectorO(null, 3, wrong, 2, XIVPainter.Enum.RadiusInclude.IncludeBoth,
new Vector2(MathF.PI * 0.25f, MathF.PI / 2), new Vector2(MathF.PI * 1.25f, MathF.PI / 2));
_rearCir = new Drawing3DCircularSectorFO(null, 3, wrong, 2, XIVPainter.Enum.RadiusInclude.IncludeBoth,
_rearCir = new Drawing3DCircularSectorO(null, 3, wrong, 2, XIVPainter.Enum.RadiusInclude.IncludeBoth,
new Vector2(MathF.PI * 0.75f, MathF.PI / 2));

_noneCir.InsideColor = _flankCir.InsideColor = _rearCir.InsideColor = right;
Expand Down Expand Up @@ -64,14 +64,14 @@ public override void UpdateOnFrame(XIVPainter.XIVPainter painter)

static XIVPainter.XIVPainter _painter;
static PositionalDrawing _positional;
static Drawing3DAnnulusFO _annulus;
static Drawing3DAnnulusO _annulus;

public static void Init()
{
_painter = Svc.PluginInterface.Create<XIVPainter.XIVPainter>("RotationSolverOverlay");
_painter.UseTaskForAccelerate = false;

_annulus = new Drawing3DAnnulusFO(Player.Object, 3, 3 + Service.Config.MeleeRangeOffset,
_annulus = new Drawing3DAnnulusO(Player.Object, 3, 3 + Service.Config.MeleeRangeOffset,
ImGui.ColorConvertFloat4ToU32(new Vector4(1f, 0.8f, 0.75f, 0.15f)), 2);
_annulus.InsideColor = ImGui.ColorConvertFloat4ToU32(new Vector4(0.8f, 0.3f, 0.2f, 0.15f));

Expand All @@ -91,7 +91,15 @@ public static void Init()
_positional = new PositionalDrawing();

_painter.AddDrawings(_positional, _annulus);
//_painter.AddDrawings(new Drawing3DCircularSectorFO(Player.Object, 3, ImGui.ColorConvertFloat4ToU32(new Vector4(1f, 0.5f, 0.4f, 0.15f)), 5));

#if DEBUG
//_painter.AddDrawings(new Drawing3DCircularSectorO(Player.Object, 3, ImGui.ColorConvertFloat4ToU32(new Vector4(1f, 0.5f, 0.4f, 0.15f)), 5));
var color = ImGui.ColorConvertFloat4ToU32(new Vector4(1f, 0.5f, 0.4f, 0.15f));

var p = new Drawing3DCircularSector(Player.Object.Position, 5, color, 5);
p.ClosestPtDis = 0.5f;
_painter.AddDrawings(p);
#endif
}

public static void UpdatePositional(EnemyPositional positional, GameObject target)
Expand Down
2 changes: 1 addition & 1 deletion XIVPainter

0 comments on commit a151047

Please sign in to comment.