wow/buffalo2: ObjectiveFrame.lua comparison

comparison ObjectiveFrame.lua @ 19:605e8f0e46db

ObjectiveCore / Style / Events / Frame - polishing the execution path for better performance - make use of the Blizzard_ObjectiveTracker bitfield values to ensure compatibility in possible secure hooks - avoid full updates when possible (using said bitfield values to indicate targeted sections) - extreme streamlining of event handling layout: specific reason updates are invoked from API hooks; broader updates are invoked by when the event listener catches something vague like 'QUEST_LOG_UPDATE'

author	Nenue
date	Wed, 06 Apr 2016 07:38:35 -0400
parents	d1812fb10ae6
children	d5ee940de273

comparison

equal deleted inserted replaced

-:d1812fb10ae6
+:605e8f0e46db
 local B = select(2,...).frame
 local mod = B:RegisterModule("ObjectiveTracker", _G.VeneerObjectiveWrapper, 'BuffFrame')
 local ipairs, max, min, unpack, floor, pairs, tostring, type, band = ipairs, max, min, unpack, floor, pairs, tostring, type, bit.band
 local IsResting, UnitXP, UnitXPMax, GetXPExhaustion = IsResting, UnitXP, UnitXPMax, GetXPExhaustion
 local UnitLevel, IsQuestWatched, UIParent = UnitLevel, IsQuestWatched, UIParent
-local Quest, Bonus, Cheevs = mod.Quest, mod.Bonus, mod.Cheevs
+local DefaultTracker, Quest, Bonus, Cheevs = mod.DefaultTracker, mod.Quest, mod.Bonus, mod.Cheevs
 local CreateFrame = CreateFrame
-local print = B.print('Objectives')
+local print = B.print('ObjWrapper')
 local unitLevel = 1
+local OBJECTIVE_TRACKER_UPDATE_REASON = OBJECTIVE_TRACKER_UPDATE_REASON
 --------------------------------------------------------------------
 --- Global frame layout
 --------------------------------------------------------------------
 --- Upvalues
 local wrapperHeadFont, wrapperHeadSize, wrapperHeadOutline = [[Interface\Addons\SharedMedia_MyMedia\font\ArchivoNarrow-Bold.ttf]], 16, 'NONE'
 local headerFont, headerSize, headerHeight = [[Interface\Addons\SharedMedia_MyMedia\font\ArchivoNarrow-Bold.ttf]], 18, 24
 local headerOutline, headerColor, headerSpacing = 'OUTLINE', {1,1,1,1}, 2
 local wrapperPosition = {'RIGHT', UIParent, 'RIGHT', -84, 0}
-mod.InitializeWrapper = function()
+local band = bit.band
+local currentPosition, anchorFrame, anchorPoint
-mod.SetBlockStyle(Scroller, 'Scroller', 'Normal')
+function mod:Update (reason, dataID)
-mod.SetBlockStyle(Scroller, 'Scroll', 'Normal')
+local updateWrapper = 0
-mod.SetBlockStyle(Wrapper, 'Wrapper', 'Normal')
+local hasStuff
+local insertingStuff
-for i, name in ipairs(orderedNames) do
+reason = reason or OBJECTIVE_TRACKER_UPDATE_REASON
-if not mod.orderedHandlers[i] then
+currentPosition = 0
-if mod.Tracker(name, i) then
+anchorPoint = 'TOPLEFT'
-local handler = mod[name]
+anchorFrame = Scroll
-local tracker = CreateFrame('Frame', 'Veneer'..name..'Tracker', Scroll, 'VeneerTrackerTemplate')
-tracker.title:SetText(handler.displayName)
+local wrapperHeight = 0
-mod.SetBlockStyle(tracker, 'Tracker', 'Normal')
+for id, handler in pairs(mod.orderedHandlers) do
-handler.Tracker = tracker
+local frame = handler.frame
-mod.orderedTrackers[i] = tracker
-mod.namedTrackers[name] = tracker
+print(format('|cFF00FFFFbitcheck (%04X vs %04x+%04x):|r', reason, handler.updateReasonModule, handler.updateReasonEvents), band(reason, handler.updateReasonModule + handler.updateReasonEvents))
-mod.indexedTrackers[handler] = tracker
+if band(reason, handler.updateReasonModule + handler.updateReasonEvents) > 0 then
-print('created new tracker frames for new handler')
+handler:Update(reason, dataID)
-end
+print('|cFF00FF00'..id..'|r', handler.displayName, 'count:', handler.numWatched)
-end
+insertingStuff = true
-end
+else
+print('|cFFFF0088'..id..'|r', 'no reason')
-Scroller:SetScrollChild(Scroll)
+end
-mod.InitializeWrapperWidgets()
+if handler.numWatched >= 1 then
-if B.Conf.ObjectiveTrackerMinimized then
+hasStuff = true
-Scroller_OnShow(Scroller)
+currentPosition = currentPosition + 1
-end
+frame:SetParent(Scroll)
-mod.UpdateWrapperStyle()
+frame:SetPoint('TOPLEFT', anchorFrame, anchorPoint, 0, 0)
-end
+print('  |cFF00BBFFpinning to', anchorFrame:GetName(), anchorPoint)
+anchorFrame = handler.frame
-mod.InitializeXPTracker = function()
+anchorPoint = 'BOTTOMLEFT'
-local XPBar = Wrapper.XPBar
-if UnitLevel('player') == 100 then
+print('current frame height:', frame.height)
-XPBar:Hide()
+wrapperHeight = wrapperHeight + frame.height
-return
+print('|cFFFF0088total height:', wrapperHeight)
-end
+else
+handler.frame:Hide()
---- xp bar
+end
-XPBar:SetWidth(mod.Conf.Wrapper.WrapperWidth - Wrapper.CloseButton:GetWidth())
+end
-XPBar.statusbg:SetAllPoints(XPBar)
-XPBar:RegisterEvent('DISABLE_XP_GAIN')
-XPBar:RegisterEvent('ENABLE_XP_GAIN')
+if  hasStuff or insertingStuff then
-XPBar:SetScript('OnEvent', mod.UpdateXP)
+print('updating height to', wrapperHeight)
-if not IsXPUserDisabled() then
+Wrapper:SetHeight(wrapperHeight)
-mod.EnableXP(XPBar)
+Scroller:SetHeight(wrapperHeight)
-else
+Scroll:SetHeight(wrapperHeight)
-mod.DisableXP(XPBar)
+print('|cFFFF8800Wrapper:', Wrapper:GetSize())
-end
+for i = 1, Wrapper:GetNumPoints() do
+print(' ', Wrapper:GetPoint(i))
-mod.UpdateXP(XPBar)
+end
-end
+print('  |cFF00FFFFScroller:', Scroller:GetSize())
+for i = 1, Scroller:GetNumPoints() do
-mod.EnableXP = function(self)
+print(' ', Scroller:GetPoint(i))
-self:RegisterEvent('PLAYER_XP_UPDATE')
+end
-self:RegisterEvent('PLAYER_LEVEL_UP')
+print('  |cFF00FFFFScroll:', Scroll:GetSize())
-self:RegisterEvent('PLAYER_UPDATE_RESTING')
+for i = 1, Scroll:GetNumPoints() do
-self.statusbg:SetTexture(0,0,0,.25)
+print(' ', Scroll:GetPoint(i))
-self:Show()
+end
-end
+Wrapper:Show()
-mod.DisableXP = function(self)
+Scroller:Show()
-self:UnregisterEvent('PLAYER_XP_UPDATE')
+Scroll:Show()
-self:UnregisterEvent('PLAYER_LEVEL_UP')
+end
-self:UnregisterEvent('PLAYER_UPDATE_RESTING')
-self.statusbg:SetTexture(0.5,0.5,0.5,0.5)
+end
-self:Hide()
-end
+DefaultTracker.GetBlock = function(handler, blockIndex)
+local block = handler.usedBlocks[blockIndex]
-mod.UpdateXP = function(self, event)
+if not handler.usedBlocks[blockIndex] then
-if event == 'DISABLE_XP_GAIN' then
+if #handler.freeBlocks >= 1 then
-mod.DisableXP(self)
+block = handler.freeBlocks[#handler.freeBlocks]
-elseif event == 'ENABLE_XP_GAIN' then
+handler.freeBlocks[#handler.freeBlocks] = nil
-mod.EnableXP(self)
+else
-end
+block = CreateFrame('Frame', 'Veneer'..tostring(handler)..'Block'..blockIndex, Scroll, 'VeneerTrackerBlock')
+block.SetStyle = mod.SetBlockStyle
-if not IsXPUserDisabled() then
+block.Select = handler.Select
+block.Open = handler.Open
-local xp = UnitXP('player')
+block.Remove = handler.Remove
-local xpmax = UnitXPMax('player')
+block.Link = handler.Link
-local rest = GetXPExhaustion()
+block:SetScript('OnMouseUp', handler.OnMouseUp)
-self.foreground:SetWidth((xp/xpmax) * self:GetWidth())
+block:SetScript('OnMouseDown', handler.OnMouseDown)
-if rest then
+block.attachmentHeight = 0
-self.rested:ClearAllPoints()
+block:ClearAllPoints()
-if xp == 0 then
+end
-self.rested:SetPoint('TOPLEFT', self, 'TOPLEFT', 0, 0)
-else
+handler.usedBlocks[blockIndex] = block
-self.rested:SetPoint('TOPLEFT', self.fg, 'TOPRIGHT', 0, 0)
+end
-end
+return handler.usedBlocks[blockIndex]
+end
-if (xp + rest) > xpmax then
-self.rested:SetPoint('BOTTOMRIGHT', self, 'BOTTOMRIGHT', 0, 0)
+DefaultTracker.Update = function (self, reason, dataID)
-else
+local tracker = self.frame
-self.rested:SetWidth((rest/xpmax) * self:GetWidth())
-end
-self.rested:SetPoint('BOTTOM', self, 'BOTTOM')
-self.rested:Show()
-else
-self.rested:Hide()
-end
-if IsResting() then
-self.statusbg:SetTexture(.2,.8,.2,.5)
-else
-self.statusbg:SetTexture(0,0,0,.25)
-end
-self.xpText:SetText(xp .. '/'.. xpmax .. (rest and (' ('..tostring(rest)..')') or ''))
-end
-end
-mod.UpdateTracker = function(handler)
-local tracker = handler.Tracker
 print('|cFFFF4400'..tracker:GetName().. '|r:Update()')
 local blockIndex = 0
-local trackerHeight = tracker.titleHeight
+local trackerHeight = 0
-previousBlock = tracker.title
+self.currentAnchor = tracker.titlebg
-local numWatched = handler.GetNumWatched()
+local numWatched = self:GetNumWatched()
-local numBlocks = handler.numBlocks
+local numBlocks = self.numBlocks
 local actualBlocks = 0
 for watchIndex = 1, 25 do
 blockIndex = blockIndex + 1
 if watchIndex <= numWatched then
-local info = handler:GetInfo(watchIndex)
+local info = self:GetInfo(watchIndex)
 if info then
-local currentBlock = mod.UpdateTrackerBlock(handler, blockIndex, info)
+local currentBlock = self:UpdateBlock(blockIndex, info)
-previousBlock = currentBlock
+self.currentAnchor = currentBlock
 print('    |cFFFFFF00'..watchIndex..'|r', '|cFF00FF00'..currentBlock:GetName()..'|r', currentBlock.height)
+print(currentBlock:IsVisible())
+print(currentBlock:GetPoint(1))
 trackerHeight = trackerHeight + currentBlock.height
 numBlocks = max(numBlocks, watchIndex)
 actualBlocks = actualBlocks + 1
 else
 print('    |cFFFF0000Failed to draw info for index #'..watchIndex)
 end
 elseif watchIndex <= numBlocks then
-local used = handler.usedBlocks
+local used = self.usedBlocks
-local free = handler.freeBlocks
+local free = self.freeBlocks
 print('clean up dead quest block')
 if used[blockIndex] then
 used[blockIndex]:Hide()
 used[blockIndex]:ClearAllPoints()
 free[#free+1]= used[blockIndex]
 else
 print('  |cFFFF9900END|r @', blockIndex)
 break -- done with quest stuff
 end
 end
-handler.numWatched = numWatched
+self.numWatched = numWatched
-handler.numBlocks = numBlocks
+self.numBlocks = numBlocks
-handler.actualBlocks = actualBlocks
+self.actualBlocks = actualBlocks
-handler:Report()
+self:Report()
+tracker.previousHeight = tracker.height
 if numBlocks >= 1 then
 previousBlock = nil
-tracker.height = trackerHeight
+tracker.height = trackerHeight + tracker.titlebg:GetHeight()
+tracker:SetHeight(tracker.height)
+tracker:Show()
+print(tracker.height)
 else
 tracker.height = 0
+tracker:Hide()
 end
 return tracker.numWatched, tracker.numAll
 end
 --- Updates the selected block frame to display the given info batch
 -- If `previousBlock` is set, it will attempt to anchor to that
 -- @param blockNum the ordered block to be updated, not a watchIndex value
 -- @param info the reference returned by the GetXInfo functions
 -- REMEMBER: t.info and questData[questID] are the same table
-mod.UpdateTrackerBlock = function (handler, blockIndex, info)
+DefaultTracker.UpdateBlock = function (self, blockIndex, info)
 local print = B.print('BlockParse')
 print('  Read list item |cFF00FFFF'..blockIndex..'|r')
 if not blockIndex or not info then
 return
 end
-local tracker = handler.Tracker
+local frame = self.frame
-local t = handler:GetBlock(blockIndex)
+local t = self:GetBlock(blockIndex)
-t.handler = handler
+t.handler = self
 t.info = info
 t.mainStyle = info.mainStyle or 'Normal'
 t.subStyle = info.subStyle
 info.blockIndex = blockIndex
-if info.questID then handler.QuestBlock[info.questID] = t end
+if info.questID then self.QuestBlock[info.questID] = t end
-if info.questLogIndex then handler.LogBlock[info.questLogIndex] = t end
+if info.questLogIndex then self.LogBlock[info.questLogIndex] = t end
-if info.watchIndex then handler.WatchBlock[info.watchIndex] = t end
+if info.watchIndex then self.WatchBlock[info.watchIndex] = t end
-handler.BlockInfo[blockIndex] = info
+self.BlockInfo[blockIndex] = info
 t.attachmentHeight = 0
+if info.isComplete then
+if mod.AutoQuest.Info[info.questID] then
-if info.isComplete == 1 then
-if info.popupInfo then
 t.status:SetText('(Click to Complete)')
+t.status:Show()
 else
 t.status:SetText('Ready to turn in')
+t.status:Show()
 end
 elseif info.completed then
 t.status:SetText(nil)
+t.status:Hide()
 elseif info.numObjectives >= 1 then
 t.attachmentHeight = 0
 t.status:Show()
-print('    lines to build:', info.numObjectives)
+print('    lines to parse:', info.numObjectives)
 local text = ''
 mod.UpdateObjectives(t, info, text)
+print('    |cFF00FF00attachment', t.attachmentHeight)
 elseif info.description then
 t.status:SetText(info.description)
+t.status:Show()
 else
 t.status:SetText(nil)
+t.status:Show()
 end
 t.title:SetText(info.title)
-print('     ', t.status:CanWordWrap(), t.status:GetStringHeight())
 if info.specialItem and not info.itemButton then
 print('    - |cFF00FFFFgenerating item button for info set')
 info.itemButton = mod.SetItemButton(t, info)
 else
 --info.itemButton = nil
 end
-if previousBlock then
+if self.currentAnchor then
-t:SetPoint('TOPLEFT', previousBlock, 'BOTTOMLEFT', 0, 0)
+t:SetPoint('TOPLEFT', self.currentAnchor, 'BOTTOMLEFT', 0, 0)
-t:SetPoint('RIGHT', tracker,'RIGHT', 0, 0)
+t:SetPoint('RIGHT', frame,'RIGHT', 0, 0)
-print('    anchor to|cFF0088FF', previousBlock:GetName())
+print('    anchor to|cFF0088FF', self.currentAnchor:GetName())
 end
 --- metrics are calculated in SetStyle
-t:SetStyle('TrackerBlock', handler.name, t.mainStyle, t.subStyle)
+t:SetStyle('TrackerBlock', self.name, t.mainStyle, t.subStyle)
+print('     |cFFFFFF00height|r', t.height)
 t:Show()
 print('  |cFF00FFFF)|r -> ', t, t:GetHeight())
 local tagPoint, tagAnchor, tagRelative = 'TOPRIGHT', t, 'TOPRIGHT'
 t.debugText:SetText(tostring(blockIndex) .. '\n' .. tostring(info.itemButton and info.itemButton:GetName()) .. "\n" .. (tostring(t.mainStyle) .. '/' .. tostring(t.subStyle)))
 end]]
 return t
 end
 mod.UpdateObjectives = function(block, info, text)
 local print = B.print('BlockLine')
 print('   |cFF00FF00objective updates for', block:GetName())
 local attachmentHeight = block.attachmentHeight
+print(attachmentHeight)
 if info.description and not(info.earnedBy or info.isComplete) then
 print('  -- has description text:', select('#', info.description), info.description)
 text = info.description
 end
 local completionScore, completionMax = 0, 0
 for i, line in ipairs(info.objectives) do
+print(attachmentHeight)
 print('     |cFF88FF00objective', i)
 block.handler.ParseObjective(line, info)
 if line.title then
 info.title = line.title
 line.title = nil
 end
 if line.widget then
 if attachmentHeight == 0 then
-attachmentHeight = block.status.spacing
+attachmentHeight = (block.status.spacing or block.status:GetSpacing()) * 2
+--print(attachmentHeight)
 end
 line.widget:Show()
 line.widget:SetParent(block)
 line.widget:SetPoint('TOPLEFT', block.status, 'BOTTOMLEFT', 0, -attachmentHeight )
 print('   has a widget, height is', line.widget.height)
 print('   has text')
 text = text .. ((text == '') and "" or "\n") .. '|cFF'..line.displayColor.. line.displayText .. '|r'
 end
 end
 block.completionScore = completionScore / completionMax
 block.attachmentHeight = attachmentHeight
 if #text >= 1 then
 block.status:SetText(text)
 -- defines the following variables
 -- * height   - height of whatever display widget is involved in conveying the task
 -- * lines    - number of non-wrapped text lines to account for line space; may be discarded depending on things
 -- * money    - boolean that determines listening for money events or not
 -- * progress - number ranging 0 to 2 indicating none/partial/full completion respectively
-mod.Tracker.ParseObjective = function(line, info)
+DefaultTracker.ParseObjective = function(line, info)
 if line.finished then
 line.progress = 2
 elseif line.quantity > 0 then
 line.progress  = 1
 mod.Quest.numButtons = 0
 local usedButtons = mod.Quest.itemButtons
 local freeButtons = mod.Quest.freeButtons
+--[=[
 mod.UpdateWrapper = function(reason)
 print('|cFF00FFFFUpdateWrapper:|r', reason)
 unitLevel = UnitLevel('player')
 wrapperWidth = mod.Conf.Wrapper.WrapperWidth
 scrollWidth = mod.Conf.Wrapper.WrapperWidth
 local wrapperBlocks = 0
 -- Update scroll child vertical size
 scrollHeight = 0
 for i, handler in ipairs(orderedHandlers) do
 mod.UpdateTracker(handler)
-local tracker = handler.Tracker
+local frame = handler.frame
 if handler.actualBlocks >= 1 then
-tracker:SetParent(Scroll)
+frame:SetParent(Scroll)
-tracker:SetPoint('TOPLEFT', Scroll, 'TOPLEFT', 0, - scrollHeight)
+frame:SetPoint('TOPLEFT', Scroll, 'TOPLEFT', 0, - scrollHeight)
-tracker:SetSize(wrapperWidth, tracker.height)
+frame:SetSize(wrapperWidth, frame.height)
-print('|cFF00FFFF'..tracker:GetName()..'|r h:|cFF00FF00', tracker.height, '|r y:|cFF00FF00', -scrollHeight)
+print('|cFF00FFFF'..frame:GetName()..'|r h:|cFF00FF00', frame.height, '|r y:|cFF00FF00', -scrollHeight)
-scrollHeight = scrollHeight + tracker.height
+scrollHeight = scrollHeight + frame.height
-tracker:Show()
+frame:Show()
 else
-tracker:Hide()
+frame:Hide()
 end
 wrapperBlocks = wrapperBlocks + handler.actualBlocks
 end
 print('final scrollHeight:', scrollHeight)
 )
 --]]
 mod.UpdateActionButtons()
 end
+--]=]
 --- Queue any active item buttons for update for that frame
 mod.UpdateActionButtons = function(updateReason)
 Scroller.snap_upper = 0
 Scroller.snap_lower = 0

Mercurial > wow > buffalo2

comparison ObjectiveFrame.lua @ 19:605e8f0e46db