Mercurial > wow > buffalo2

changeset 50:d7655c4e6e06 v1.0-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
disambiguate local module names
author Nenue
date Fri, 29 Apr 2016 10:52:43 -0400
parents 16465f3fd919
children 4586229986e6
files BuffFrame/BuffAnchors.lua BuffFrame/BuffButton.lua BuffFrame/BuffFrame.lua
diffstat 3 files changed, 66 insertions(+), 66 deletions(-) [+]
line wrap: on
line diff
--- a/BuffFrame/BuffAnchors.lua	Fri Apr 29 10:50:27 2016 -0400
+++ b/BuffFrame/BuffAnchors.lua	Fri Apr 29 10:52:43 2016 -0400
@@ -7,7 +7,7 @@
 local MODULE = 'BuffFrame'
 local _, A = ...
 local B, _G = A.frame, _G
-local buffFrame = B:RegisterModule(MODULE)
+local Aura = B:RegisterModule(MODULE)
 local type, unpack, select, pairs, ipairs, wipe = type, unpack, select, pairs, ipairs, table.wipe
 local min, ceil, mod, tonumber, tostring = min, ceil, mod, tonumber, tostring
 local CreateFrame = CreateFrame
@@ -16,16 +16,16 @@
 local bprint = B.print('AnchorFrame')
 
 local GetAnchorFrame = function(name)
-  local c = buffFrame.displays[name].conf
-  local anchors = buffFrame.anchors
+  local c = Aura.displays[name].conf
+  local anchors = Aura.anchors
   local anchorFrom, anchorParent, anchorTo, offsetX, offsetY = unpack(c.Anchor)
   local print = bprint
   if anchors[name] and anchors[name].GetName then
-    print('get', buffFrame.anchors[name]:GetName())
-    return buffFrame.anchors[name], anchorFrom, anchorParent, anchorTo, offsetX, offsetY
+    print('get', Aura.anchors[name]:GetName())
+    return Aura.anchors[name], anchorFrom, anchorParent, anchorTo, offsetX, offsetY
   end
   print('new frame', name)
-  local frame = CreateFrame('Frame', name..'Anchor', UIParent, buffFrame.displays[name].anchorTemplate)
+  local frame = CreateFrame('Frame', name..'Anchor', UIParent, Aura.displays[name].anchorTemplate)
   frame.conf = c
 
   local x, dx, y, dy
@@ -52,7 +52,7 @@
     print('|cFFFFFF00**changing', name, 'anchor by', dx, dy)
     offsetX = offsetX + dx
     offsetY = offsetY + dy
-    buffFrame.Conf[name .. 'Anchor'] = {anchorFrom, anchorParent, anchorTo, offsetX, offsetY }
+    Aura.Conf[name .. 'Anchor'] = {anchorFrom, anchorParent, anchorTo, offsetX, offsetY }
     frame:SetPoint(anchorFrom, _G[anchorParent], anchorTo, offsetX, offsetY)
     frame.isMoving = nil
   end
@@ -60,11 +60,11 @@
   local AnchorButton_OnClick = function(self, anchor)
     local point, parent, relative = anchor:GetPoint(1)
     print('resetting anchors', point, parent:GetName(), relative)
-    buffFrame.Conf[name..'Point'] = {point, relative}
-    buffFrame.Conf[name..'RelativeX'] = (point:match('RIGHT')) and -1 or 1
-    buffFrame.Conf[name..'RelativeY'] = (point:match('TOP')) and -1 or 1
-    wipe(buffFrame.drawn[name])
-    buffFrame.UpdateBuffs(name)
+    Aura.Conf[name..'Point'] = {point, relative}
+    Aura.Conf[name..'RelativeX'] = (point:match('RIGHT')) and -1 or 1
+    Aura.Conf[name..'RelativeY'] = (point:match('TOP')) and -1 or 1
+    wipe(Aura.drawn[name])
+    Aura.UpdateBuffs(name)
   end
 
   frame.OnUpdate = function(self, elapsed)
@@ -88,19 +88,19 @@
     anchorButton:SetScript('OnClick', AnchorButton_OnClick)
   end
 
-  buffFrame.displays[name].anchor = frame
-  print('displays[name].anchor', buffFrame.displays[name].anchor:GetName())
-  print('anchors[name]', buffFrame.anchors[name]:GetName())
+  Aura.displays[name].anchor = frame
+  print('displays[name].anchor', Aura.displays[name].anchor:GetName())
+  print('anchors[name]', Aura.anchors[name]:GetName())
   return frame, anchorFrom, anchorParent, anchorTo, offsetX, offsetY
 end
 
 --- Handles the preliminary positioning calculation for buff guide anchors
-buffFrame.UpdateAnchorFrames = function(name)
+Aura.UpdateAnchorFrames = function(name)
   local print = fprint(name)
-  local c = buffFrame.displays[name].conf
+  local c = Aura.displays[name].conf
   local frame, anchorFrom, anchorParent, anchorTo, offsetX, offsetY = GetAnchorFrame(name)
   print('got', frame:GetName())
-  frame.buffs = buffFrame.guides[name]
+  frame.buffs = Aura.guides[name]
   frame.heading:SetText(name)
   B.SetConfigLayers(frame)
 
--- a/BuffFrame/BuffButton.lua	Fri Apr 29 10:50:27 2016 -0400
+++ b/BuffFrame/BuffButton.lua	Fri Apr 29 10:52:43 2016 -0400
@@ -14,12 +14,12 @@
 local BuffFrame, ConsolidatedBuffs = _G.BuffFrame, _G.ConsolidatedBuffs
 local UnitAura, UnitName, RegisterStateDriver = _G.UnitAura, _G.UnitName, _G.RegisterStateDriver
 
-local M = B:RegisterModule(MODULE)
-local displays = M.displays
+local Aura = B:RegisterModule(MODULE)
+local displays = Aura.displays
 local print, gprint, aprint, fprint = B.print('Buff'), B.print('SetGuides'), B.print('SetAnchors'), B.fprint
 
-M.GetBuffZoom = function(buffName)
-  local zoom = tonumber(M.displays[buffName].conf['Zoom']) / 100 / 2
+Aura.GetBuffZoom = function(buffName)
+  local zoom = tonumber(Aura.displays[buffName].conf['Zoom']) / 100 / 2
   local zoomL, zoomU, zoomR, zoomD = zoom, zoom, 1-zoom, 1-zoom
   print(buffName, zoom)
   return function(self, ...)
@@ -33,7 +33,7 @@
 
 
 
-M.UpdateButtonAlpha = function(self)
+Aura.UpdateButtonAlpha = function(self)
   if not self.parent.timeLeft or not self:IsVisible() then
     self:SetScript('OnUpdate', nil)
     return
@@ -48,12 +48,12 @@
 
 --- Called infrequently to align stencil frames
 local refreshCount = 0
-M.UpdateGuideFrames = function(buffName)
+Aura.UpdateGuideFrames = function(buffName)
   refreshCount = refreshCount + 1
   local print = fprint()
   print(buffName)
-  local displays, anchors = M.displays, M.anchors
-  local guides, decors = M.guides, M.decors
+  local displays, anchors = Aura.displays, Aura.anchors
+  local guides, decors = Aura.guides, Aura.decors
 
   local anchor = anchors[buffName]
   local c, g, d = displays[buffName].conf, guides[buffName], decors[buffName]
@@ -67,7 +67,7 @@
 
   local buffMax = min(c['Max'], displays[buffName].maxIcons)
   local anchorFrom, anchorTo = c.Point[1], c.Point[2]
-  anchor.Zoom = M.GetBuffZoom(buffName)
+  anchor.Zoom = Aura.GetBuffZoom(buffName)
 
 
 
@@ -195,13 +195,13 @@
   print(anchor:GetName(), anchor:GetSize())
 end
 
-M.UpdateButtonPositions = function(buffName, auraType)
+Aura.UpdateButtonPositions = function(buffName, auraType)
   local print = fprint()
   local c = auraType.conf
   local numBuffs = 0
   local actualIcons = auraType.actualIcons()
   local maxIcons = auraType.maxIcons
-  local guides, decors, anchors, drawn = M.guides, M.decors, M.anchors, M.drawn
+  local guides, decors, anchors, drawn = Aura.guides, Aura.decors, Aura.anchors, Aura.drawn
 
   local anchor = anchors[buffName]
   local buffMax = c['Max']
@@ -296,7 +296,7 @@
           buffDuration:SetText('WHAT')
 
           if buff.timeLeft and c.WarningFade then
-            deco:SetScript('OnUpdate', M.UpdateButtonAlpha)
+            deco:SetScript('OnUpdate', Aura.UpdateButtonAlpha)
           else
             deco:SetScript('OnUpdate', nil)
             deco:SetAlpha(1.0)
@@ -369,16 +369,16 @@
   end
 
   if anchor.attached then
-    M.UpdateAnchorChild(anchor, anchor.attached, anchor.attachmentConf)
+    Aura.UpdateAnchorChild(anchor, anchor.attached, anchor.attachmentConf)
   end
 
 end
 
-M.PostBuffAnchors  = function()
+Aura.PostBuffAnchors  = function()
   local print = fprint()
-  local anchors = M.anchors
-  if M.ShowConsolidatedBuffs then
-    M.UpdateRaidBuffs()
+  local anchors = Aura.anchors
+  if Aura.ShowConsolidatedBuffs then
+    Aura.UpdateRaidBuffs()
   end
   for buttonName, auraType in pairs(displays) do
     print('sending', buttonName, auraType)
@@ -389,15 +389,15 @@
 
     --if positioned[buttonName] == 0 then
       print('possibly reloaded UI, check positions')
-      M.UpdateGuideFrames(buttonName)
+      Aura.UpdateGuideFrames(buttonName)
     --end
 
-    M.UpdateButtonPositions(buttonName, auraType)
+    Aura.UpdateButtonPositions(buttonName, auraType)
   end
 end
 
-M.UpdateBuffs = function(buttonName, forced)
-  local displays, drawn = M.displays, M.drawn
+Aura.UpdateBuffs = function(buttonName, forced)
+  local displays, drawn = Aura.displays, Aura.drawn
   local print = B.fprint(buttonName)
   local c = displays[buttonName].conf
   if drawn[buttonName] then
@@ -406,9 +406,9 @@
     drawn[buttonName] = {}
   end
 
-  M.UpdateAnchorFrames(buttonName)
-  M.UpdateGuideFrames(buttonName)
-  M.UpdateButtonPositions(buttonName, displays[buttonName])
+  Aura.UpdateAnchorFrames(buttonName)
+  Aura.UpdateGuideFrames(buttonName)
+  Aura.UpdateButtonPositions(buttonName, displays[buttonName])
 end
 
 --- should only be called from user input
--- a/BuffFrame/BuffFrame.lua	Fri Apr 29 10:50:27 2016 -0400
+++ b/BuffFrame/BuffFrame.lua	Fri Apr 29 10:52:43 2016 -0400
@@ -7,57 +7,57 @@
 --------------------------------------------
 
 local B = select(2,...).frame
-local M = B:RegisterModule('BuffFrame')
+local Aura = B:RegisterModule('BuffFrame')
 
-M.PlayerBuffsActive = {}
-function M:OnInitialize()
-  local displays = M.displays
+Aura.PlayerBuffsActive = {}
+function Aura:OnInitialize()
+  local displays = Aura.displays
 
   -- suffix tables
-  M.drawn = B.Abstract(displays, 'drawn', M.drawn )
+  Aura.drawn = B.Abstract(displays, 'drawn', Aura.drawn )
   -- Lesser extent of guide frames that have been positioned
-  M.positioned = B.Abstract(displays, 'positioned', M.positioned)
+  Aura.positioned = B.Abstract(displays, 'positioned', Aura.positioned)
   -- Backdrop style frame
-  M.decors = B.Abstract(displays, 'decorator', M.decors)
+  Aura.decors = B.Abstract(displays, 'decorator', Aura.decors)
   -- Static positioning frames
-  M.guides = B.Abstract(displays, 'guides', M.guides)
+  Aura.guides = B.Abstract(displays, 'guides', Aura.guides)
   -- Anchor points for guides
-  M.anchors = B.Abstract(displays, 'anchor', M.anchors)
+  Aura.anchors = B.Abstract(displays, 'anchor', Aura.anchors)
   -- Stored functions for doing icon texture adjustments
-  M.zoom = B.Abstract(displays, 'zoom', M.zoom )
+  Aura.zoom = B.Abstract(displays, 'zoom', Aura.zoom )
 
 
   for name, display in pairs(displays) do
     display.conf = setmetatable({}, {
       __index = function(_, k)
         --print('config check '.. name .. k)
-        return M.Conf[name .. k] or M.Conf['BuffButton' .. k]
+        return Aura.Conf[name .. k] or Aura.Conf['BuffButton' .. k]
       end,
       __newindex = function(_, k , v)
-        M.Conf[name..k] = v
+        Aura.Conf[name..k] = v
       end,
     })
   end
 
-  M:RegisterUnitEvent("UNIT_AURA", "player", "vehicle")
-  M:RegisterEvent("GROUP_ROSTER_UPDATE")
-  M:RegisterEvent("PLAYER_SPECIALIZATION_CHANGED")
-  hooksecurefunc("BuffFrame_UpdateAllBuffAnchors", M.PostBuffAnchors)
-  hooksecurefunc("RaidBuffTray_Update", M.UpdateRaidBuffs)
+  Aura:RegisterUnitEvent("UNIT_AURA", "player", "vehicle")
+  Aura:RegisterEvent("GROUP_ROSTER_UPDATE")
+  Aura:RegisterEvent("PLAYER_SPECIALIZATION_CHANGED")
+  hooksecurefunc("BuffFrame_UpdateAllBuffAnchors", Aura.PostBuffAnchors)
+  hooksecurefunc("RaidBuffTray_Update", Aura.UpdateRaidBuffs)
 end
 
-function M:OnUpdate ()
-  local displays = M.displays
-  M.ShowConsolidated = (IsInGroup() and GetCVarBool("consolidateBuffs"))
-  M.ShowMissingBuffs = (IsInGroup() and M.Conf.RaidShowMissing)
+function Aura:OnUpdate ()
+  local displays = Aura.displays
+  Aura.ShowConsolidated = (IsInGroup() and GetCVarBool("consolidateBuffs"))
+  Aura.ShowMissingBuffs = (IsInGroup() and Aura.Conf.RaidShowMissing)
 
   for name, auraType in pairs(displays) do
 
-    M.UpdateBuffs(auraType.buffName, true)
+    Aura.UpdateBuffs(auraType.buffName, true)
     --print(name, auraType)
     _G[name..'Anchor']:EnableMouse(B.Conf.ConfigMode)
   end
 
-  M.UpdateRaidBuffs()
-  M.UpdateBuffsTodo()
+  Aura.UpdateRaidBuffs()
+  Aura.UpdateBuffsTodo()
 end
\ No newline at end of file