f9d67d6 - Detach cast bars from OnUpdate

diff --git a/OmaUF/CastBar.lua b/OmaUF/CastBar.lua
index 8da7d22..a8382fd 100644 (file)
--- a/OmaUF/CastBar.lua
+++ b/OmaUF/CastBar.lua
@@ -6,18 +6,20 @@ local min = math.min;
 local ceil = math.ceil;
 local UnitCastingInfo, UnitChannelInfo = UnitCastingInfo, UnitChannelInfo;
 local GetTime = GetTime;
 local ceil = math.ceil;
 local UnitCastingInfo, UnitChannelInfo = UnitCastingInfo, UnitChannelInfo;
 local GetTime = GetTime;

+local CTimerAfter = C_Timer.After;

 
 local barTexture = "Interface\\AddOns\\OmaRF\\images\\minimalist";
 local castingColor = {1, 0.49, 0}; -- from Quartz defaults
 local nointerruptColor = {0.6, 0.6, 0.6};
 local channelingColor = {0.32, 0.3, 1};
 
 local barTexture = "Interface\\AddOns\\OmaRF\\images\\minimalist";
 local castingColor = {1, 0.49, 0}; -- from Quartz defaults
 local nointerruptColor = {0.6, 0.6, 0.6};
 local channelingColor = {0.32, 0.3, 1};

+local updaters = {};

 
 local M = {};
 OmaUFCastBar = M;
 
 local function onUpdate(bar)
 
 local M = {};
 OmaUFCastBar = M;
 
 local function onUpdate(bar)

-    if not bar:IsShown() then return end
-    local width = bar.icon:IsShown() and bar.cast.width or bar.cast.width; -- TODO fullwidth
+    if not bar.updating then return end
+    --local width = bar.icon:IsShown() and bar.cast.width or bar.cast.width; -- TODO fullwidth

     local startTime, endTime = bar.startTime, bar.endTime;
     local currentClamped = min(GetTime(), endTime);
     local remaining = endTime - currentClamped;
     local startTime, endTime = bar.startTime, bar.endTime;
     local currentClamped = min(GetTime(), endTime);
     local remaining = endTime - currentClamped;


@@ -28,23 +30,26 @@ local function onUpdate(bar)
         percent = (currentClamped - startTime) / (endTime - startTime);
     end
 
         percent = (currentClamped - startTime) / (endTime - startTime);
     end
 

-    width = percent*width;
+    local width = percent*bar.cast.width;

     if width <= 0 then
         bar.cast:SetWidth(0.1);
     else
         bar.cast:SetWidth(width);
     end
     bar.time:SetFormattedText("%.1f", remaining);
     if width <= 0 then
         bar.cast:SetWidth(0.1);
     else
         bar.cast:SetWidth(width);
     end
     bar.time:SetFormattedText("%.1f", remaining);

+    CTimerAfter(0.03, updaters[bar]);

 end
 end

+M.OnUpdate = onUpdate;

 
 local function showBar(bar)
     bar:Show();
 
 local function showBar(bar)
     bar:Show();

-    bar:SetScript("OnUpdate", onUpdate);
+    bar.updating = true;
+    onUpdate(bar);

 end
 
 local function hideBar(bar)
     bar:Hide();
 end
 
 local function hideBar(bar)
     bar:Hide();

-    bar:SetScript("OnUpdate", nil);
+    bar.updating = nil;

 end
 
 local function toggleInterruptible(bar, nointr)
 end
 
 local function toggleInterruptible(bar, nointr)


@@ -89,6 +94,7 @@ local function startCast(bar, unit, channeling)
     toggleInterruptible(bar, noInterrupt);
     return true;
 end
     toggleInterruptible(bar, noInterrupt);
     return true;
 end

+M.StartCast = startCast;

 
 local function applyDelay(bar, unit, channeling)
     local startTime, endTime;
 
 local function applyDelay(bar, unit, channeling)
     local startTime, endTime;


@@ -102,6 +108,7 @@ local function applyDelay(bar, unit, channeling)
     bar.endTime = endTime / 1000;
     -- TODO show delay text
 end
     bar.endTime = endTime / 1000;
     -- TODO show delay text
 end

+M.ApplyDelay = applyDelay;

 
 local events = {
     ["UNIT_SPELLCAST_START"] = function(bar, unit)
 
 local events = {
     ["UNIT_SPELLCAST_START"] = function(bar, unit)


@@ -201,5 +208,6 @@ function M.CreateCastBar(parent, unit, yoffset)
     bar.time = bar:CreateFontString(nil, "OVERLAY", "GameFontHighlight");
     bar.time:SetPoint("RIGHT", bar, "RIGHT", -2, 0);
     bar:SetScript("OnEvent", onEvent);
     bar.time = bar:CreateFontString(nil, "OVERLAY", "GameFontHighlight");
     bar.time:SetPoint("RIGHT", bar, "RIGHT", -2, 0);
     bar:SetScript("OnEvent", onEvent);

+    updaters[bar] = function() onUpdate(bar) end

     return bar;
 end
     return bar;
 end