wow/buffalo2: Modules/BuffFrame.lua comparison

comparison Modules/BuffFrame.lua @ 61:3f083d389c18

- don't send updates for BuffAnchors hook

author	Nenue
date	Mon, 15 Aug 2016 09:35:46 -0400
parents	2a636b00c31e
children	ef4116179e2f

comparison

equal deleted inserted replaced

-:2a636b00c31e
+:3f083d389c18
 -- Veneer
 -- BuffFrame.lua
 -- Created: 7/27/2016 8:08 PM
 -- %file-revision%
---
+-- Adds progress bars and cooldown swirls to buffbutton frames
 local PLUGIN_NAME = 'BuffFrame'
 local plugin = {}
 local vn, print = LibStub("LibKraken").register(VeneerController, plugin)
 local veneer = CreateFrame('Frame', name..'Veneer', UIParent)
 local id = frame:GetID()
 veneer:SetAllPoints(frame)
 veneer:SetParent(frame)
 veneer.bg = veneer:CreateTexture()
-veneer.bg:SetColorTexture((id / 16),0,1-(id/16),0.5)
+veneer.bg:SetColorTexture(1,1,1,0)
-print(id, id/16)
 veneer.bg:SetAllPoints(veneer)
 veneer.bg:Show()
 veneer:Hide()
 veneer:EnableMouse(false)
 veneer.progress:Hide()
 veneer.progress:SetPoint('BOTTOMLEFT', veneer, 'BOTTOMLEFT', 3, -6)
 veneer.progress:SetPoint('TOPRIGHT', veneer, 'BOTTOMRIGHT', -3, -1)
 veneer.progress.bg = veneer.progress:CreateTexture(nil, 'BACKGROUND')
-veneer.progress.bg:SetColorTexture(0,0,0,0.5)
+veneer.progress.bg:SetColorTexture(0,0,0,1)
 veneer.progress.bg:SetAllPoints(veneer.progress)
 veneer.progress.fg = veneer.progress:CreateTexture(nil, 'ARTWORK')
 veneer.progress.fg:SetColorTexture(0,1,0,1)
 veneer.progress.fg:SetPoint('BOTTOMLEFT', 1,1)
 veneer.progress.status = veneer.progress:CreateFontString()
 veneer.progress.status:SetFontObject(VeneerNumberFont)
 veneer.progress.status:SetPoint('TOP')
+veneer.cooldown = CreateFrame('Cooldown', name ..'VeneerCooldown', veneer, 'CooldownFrameTemplate')
+veneer.cooldown:SetAllPoints(frame)
+veneer.cooldown:SetReverse(true)
 end
 return _G[name..'Veneer']
 end
+--- Set widgets to reflect the passed parameters
 local UpdateVeneer = function (frame, duration, expires)
 local veneer = GetVeneer(frame)
-if expires and (duration ~= 0) then
+if expires and duration then
-veneer.progress:Show()
+if duration ~= 0 then
 local startTime = (expires - duration)
 local endTime = expires or 0
-print('|cFF0088FF'..frame:GetName()..'|r', 'has expiration', startTime, 'to', endTime, 'over', duration, 'frame', veneer.progress:GetWidth())
+print('|cFF0088FF'..frame:GetName()..'|r', duration, expires)
-veneer.progress:SetScript('OnUpdate', function(self)
+veneer.progress:Show()
-local w = floor(veneer.progress:GetWidth()+.5)
+veneer.elapsed = 0
-local t = GetTime()
+veneer.progress:SetScript('OnUpdate', function(self, elapsed)
-local progress = (t - startTime) / duration
+veneer.elapsed = veneer.elapsed + elapsed
-local nw = w - ceil(w * progress)
+local w = floor(veneer.progress:GetWidth()+.5)
-print(progress, nw, w)
+local t = GetTime()
-if (progress >= 1) or not frame:IsVisible() then
+local progress = (t - startTime) / duration
-veneer.startTime = nil
-self:Hide()
+local nw = (w-2) - ceil(w * progress)
-self:SetScript('OnUpdate', nil)
+if veneer.elapsed >= 0.25 then
-else
-self.fg:SetWidth(nw)
+print(progress, nw, w)
-end
+veneer.elapsed = 0.25 - veneer.elapsed
-end)
+end
-end
+if (progress >= 1) or not frame:IsVisible() then
+veneer.startTime = nil
+self:Hide()
+self:SetScript('OnUpdate', nil)
+else
+self.fg:SetWidth(nw)
+end
+end)
+veneer.cooldown:Show()
+veneer.cooldown:SetCooldown(startTime, duration)
+else
+print('|cFF00FF88'..frame:GetName()..'|r', 'duration zero')
+veneer.progress:SetScript('OnUpdate', nil)
+veneer.progress:Hide()
+veneer.cooldown:Hide()
+end
+else
+veneer.progress:Hide()
+veneer.cooldown:SetCooldown(0,0)
+veneer.cooldown:Hide()
+print('|cFF88FF00'..frame:GetName()..'|r', 'nil duration')
+end
 veneer:Show()
 end
 -- Associates skinning elements with said button
 if border then
 border:SetSize(50,50)
 end
 if duration then
 duration:ClearAllPoints()
-duration:SetPoint('BOTTOM')
+duration:SetPoint('TOP', frame, 'BOTTOM', 0, -8)
 duration:SetFontObject(VeneerNumberFont)
 duration:SetDrawLayer('OVERLAY')
 end
 local bName = name..index
 local frame = _G[bName]
 if frame and frame:IsVisible() then
 tickCounter[frame] = (tickCounter[frame] or 0) + 1
 local cacheDiff = CacheCheck(frame, UnitAura(frame.unit, frame:GetID(), frame.filter))
--- did something change?
+-- if the name or expirationTime changed
-if (cacheDiff >= 1) or not skinnedFrames[frame] then
+if (cacheDiff >= 1) then
 print(frame:GetName(), 'diff:', cacheDiff)
-tinsert(pendingFrames, frame)
+if not skinnedFrames[frame] then
-end
+tinsert(pendingFrames, frame)
+end
-if frame.expirationTime ~= expirationCache[name] then
-print('|cFFBBFF00expirationTime|r', name, frame.expirationTime)
 expirationCache[name] = frame.expirationTime
 print(unpack(aurasCache[frame]))
 UpdateVeneer(frame, aurasCache[frame][6], aurasCache[frame][7])
 end
 print('|cFFBBFF00AllBuffAnchors|r', #pendingFrames)
 while pendingFrames[1] do
 local frame = tremove(pendingFrames)
 tinsert(todo, frame:GetName())
-UpdateVeneer(frame)
+-- re-apply custom anchors
 end
 print(table.concat(todo, ', '))
 end
 --BuffButton1
 --DebuffButton1
+--todo: separate frame groups and iterate over them at appropriate times
 if BuffButton1 then
-TempEnchant1:SetPoint('TOPRIGHT', BuffButton1, 'TOPRIGHT', BuffButton1:GetWidth()+4, 0)
+--TempEnchant1:SetPoint('TOPRIGHT', BuffButton1, 'TOPRIGHT', BuffButton1:GetWidth()+4, 0)
 end
 end
 local AuraButton_UpdateDuration = function(frame, timeLeft)
 local timeString = '%ds'
 if timeLeft > 3600 then
 timeString = format('%d:%02d', hours, minutes)
 elseif timeLeft > 60 then
 timeString = format('%d:%02d', minutes, seconds)
-elseif timeLeft > 10 then
+else
 timeString = format('%d', seconds)
-else
-timeString = format('%0.1f', mod(timeLeft, 60))
 end
 frame.duration:SetText(timeString)
 frame.duration:SetVertexColor(1,1,1)
 end
 local visibility = {}
 local TempEnchantButton_OnHide = function(self)
 local isVisible = self:IsVisible()
 end
 end
 local BuffFrame_Update = function(...)
---print('Time for udpate!', ...)
 end
 hooksecurefunc("BuffFrame_Update", BuffFrame_Update)
 hooksecurefunc("AuraButton_UpdateDuration", AuraButton_UpdateDuration)
 end
 plugin.init = function ()
 plugin.db = vn.db[PLUGIN_NAME]
 end

Mercurial > wow > buffalo2

comparison Modules/BuffFrame.lua @ 61:3f083d389c18