mirror of
https://github.com/parnic/ice-hud.git
synced 2025-06-15 22:30:13 -05:00
Added optional lag indicator to the GCD module
Ticket #196 - thanks nandchan!
This commit is contained in:
@ -18,14 +18,23 @@ end
|
|||||||
function GlobalCoolDown.prototype:Enable(core)
|
function GlobalCoolDown.prototype:Enable(core)
|
||||||
GlobalCoolDown.super.prototype.Enable(self, core)
|
GlobalCoolDown.super.prototype.Enable(self, core)
|
||||||
|
|
||||||
|
if self.moduleSettings.inverse == "EXPAND" then
|
||||||
|
self.moduleSettings.inverse = "NORMAL"
|
||||||
|
end
|
||||||
|
|
||||||
--self:RegisterEvent("ACTIONBAR_UPDATE_COOLDOWN", "CooldownStateChanged")
|
--self:RegisterEvent("ACTIONBAR_UPDATE_COOLDOWN", "CooldownStateChanged")
|
||||||
self:RegisterEvent("UNIT_SPELLCAST_START","CooldownStateChanged")
|
self:RegisterEvent("UNIT_SPELLCAST_START","CooldownStateChanged")
|
||||||
self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_START","CooldownStateChanged")
|
self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_START","CooldownStateChanged")
|
||||||
self:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED","CooldownStateChanged")
|
self:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED","CooldownStateChanged")
|
||||||
|
self:RegisterEvent("UNIT_SPELLCAST_SENT","SpellCastSent")
|
||||||
|
|
||||||
self:RegisterEvent("UNIT_SPELLCAST_INTERRUPTED","CooldownAborted")
|
self:RegisterEvent("UNIT_SPELLCAST_INTERRUPTED","CooldownAborted")
|
||||||
self:RegisterEvent("UNIT_SPELLCAST_FAILED","CooldownAborted")
|
self:RegisterEvent("UNIT_SPELLCAST_FAILED","CooldownAborted")
|
||||||
|
|
||||||
|
self:RegisterEvent("CVAR_UPDATE", "CVarUpdate")
|
||||||
|
|
||||||
|
self:CVarUpdate()
|
||||||
|
|
||||||
self:Show(false)
|
self:Show(false)
|
||||||
|
|
||||||
self.frame:SetFrameStrata("LOW")
|
self.frame:SetFrameStrata("LOW")
|
||||||
@ -33,6 +42,11 @@ function GlobalCoolDown.prototype:Enable(core)
|
|||||||
self.CDSpellId = self:GetSpellId()
|
self.CDSpellId = self:GetSpellId()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function GlobalCoolDown.prototype:CVarUpdate()
|
||||||
|
self.useFixedLatency = GetCVar("reducedLagTolerance") == "1"
|
||||||
|
self.fixedLatency = tonumber(GetCVar("maxSpellStartRecoveryoffset")) / 1000.0
|
||||||
|
end
|
||||||
|
|
||||||
function GlobalCoolDown.prototype:CooldownAborted(event, unit, spell)
|
function GlobalCoolDown.prototype:CooldownAborted(event, unit, spell)
|
||||||
if unit ~= "player" or not spell or not self.CurrSpell or self.CurrSpell ~= spell then
|
if unit ~= "player" or not spell or not self.CurrSpell or self.CurrSpell ~= spell then
|
||||||
return
|
return
|
||||||
@ -58,6 +72,8 @@ function GlobalCoolDown.prototype:GetDefaultSettings()
|
|||||||
settings["bHideMarkerSettings"] = true
|
settings["bHideMarkerSettings"] = true
|
||||||
settings["showDuringCast"] = true
|
settings["showDuringCast"] = true
|
||||||
settings["barVisible"]["bg"] = false
|
settings["barVisible"]["bg"] = false
|
||||||
|
settings["bAllowExpand"] = false
|
||||||
|
settings["lagAlpha"] = 0.7
|
||||||
|
|
||||||
return settings
|
return settings
|
||||||
end
|
end
|
||||||
@ -85,6 +101,27 @@ function GlobalCoolDown.prototype:GetOptions()
|
|||||||
order = 21,
|
order = 21,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
opts["lagAlpha"] =
|
||||||
|
{
|
||||||
|
type = 'range',
|
||||||
|
name = L["Lag Indicator alpha"],
|
||||||
|
desc = L["Lag indicator alpha (0 is disabled)"],
|
||||||
|
min = 0,
|
||||||
|
max = 1,
|
||||||
|
step = 0.1,
|
||||||
|
get = function()
|
||||||
|
return self.moduleSettings.lagAlpha
|
||||||
|
end,
|
||||||
|
set = function(info, value)
|
||||||
|
self.moduleSettings.lagAlpha = value
|
||||||
|
self:Redraw()
|
||||||
|
end,
|
||||||
|
disabled = function()
|
||||||
|
return not self.moduleSettings.enabled
|
||||||
|
end,
|
||||||
|
order = 42
|
||||||
|
}
|
||||||
|
|
||||||
return opts
|
return opts
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -92,6 +129,14 @@ function GlobalCoolDown.prototype:IsFull(scale)
|
|||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function GlobalCoolDown.prototype:SpellCastSent(event, unit, spell)
|
||||||
|
if unit ~= "player" or not spell then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
self.spellCastSent = GetTime()
|
||||||
|
end
|
||||||
|
|
||||||
function GlobalCoolDown.prototype:GetSpellCastTime(spell)
|
function GlobalCoolDown.prototype:GetSpellCastTime(spell)
|
||||||
if not spell then
|
if not spell then
|
||||||
return nil, nil
|
return nil, nil
|
||||||
@ -142,6 +187,19 @@ function GlobalCoolDown.prototype:CooldownStateChanged(event, unit, spell, _, _,
|
|||||||
|
|
||||||
self:UpdateBar(0, "GlobalCoolDown")
|
self:UpdateBar(0, "GlobalCoolDown")
|
||||||
self:Show(true)
|
self:Show(true)
|
||||||
|
|
||||||
|
-- Update latency indicator
|
||||||
|
local scale = 0
|
||||||
|
if self.useFixedLatency then
|
||||||
|
scale = IceHUD:Clamp(self.fixedLatency / self.duration, 0, 1)
|
||||||
|
else
|
||||||
|
local now = GetTime()
|
||||||
|
local lag = now - (self.spellCastSent or now)
|
||||||
|
scale = IceHUD:Clamp(lag / self.duration, 0, 1)
|
||||||
|
end
|
||||||
|
|
||||||
|
self:SetBarCoord(self.lagBar, scale, false, true)
|
||||||
|
self.spellCastSent = nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -165,6 +223,20 @@ function GlobalCoolDown.prototype:CreateFrame()
|
|||||||
self.barFrame.bar:SetVertexColor(self:GetColor("GlobalCoolDown", 0.8))
|
self.barFrame.bar:SetVertexColor(self:GetColor("GlobalCoolDown", 0.8))
|
||||||
local r, g, b = self.settings.backgroundColor.r, self.settings.backgroundColor.g, self.settings.backgroundColor.b
|
local r, g, b = self.settings.backgroundColor.r, self.settings.backgroundColor.g, self.settings.backgroundColor.b
|
||||||
self.frame.bg:SetVertexColor(r, g, b, 0.6)
|
self.frame.bg:SetVertexColor(r, g, b, 0.6)
|
||||||
|
|
||||||
|
self:CreateLagBar()
|
||||||
|
end
|
||||||
|
|
||||||
|
function GlobalCoolDown.prototype:CreateLagBar()
|
||||||
|
self.lagBar = self:BarFactory(self.lagBar, "LOW", "OVERLAY")
|
||||||
|
|
||||||
|
local r, g, b = self:GetColor("CastLag")
|
||||||
|
if (self.settings.backgroundToggle) then
|
||||||
|
r, g, b = self:GetColor("CastCasting")
|
||||||
|
end
|
||||||
|
|
||||||
|
self.lagBar.bar:SetVertexColor(r, g, b, self.moduleSettings.lagAlpha)
|
||||||
|
self.lagBar.bar:Hide()
|
||||||
end
|
end
|
||||||
|
|
||||||
function GlobalCoolDown.prototype:GetSpellId()
|
function GlobalCoolDown.prototype:GetSpellId()
|
||||||
|
Reference in New Issue
Block a user