wow/worldplan: QuestPOI.lua comparison

comparison QuestPOI.lua @ 49:dbd81d49af02

- Solve more frame data flagging issues - Unify method for resolving filter and visibility states - Flight Map modifications respect filter settings - Solve initial draw issues with tag icon, filter state handling - Solve issues with text layer synchronization during map changes

author	Nenue
date	Thu, 29 Dec 2016 13:31:20 -0500
parents	c0b88bd1e40b
children	3066f3ef1258

comparison

equal deleted inserted replaced

-:c0b88bd1e40b
+:dbd81d49af02
 local qprint = DEVIAN_WORKSPACE and function(...) _G.print('POI', ...) end or function() end
 local wprint = DEVIAN_WORKSPACE and function(...) _G.print('WP', ...) end or function() end
 local wqprint = DEVIAN_WORKSPACE and function(...) _G.print('WorldQuests', ...) end or function() end
 local iprint = DEVIAN_WORKSPACE and function(...) _G.print('ItemScan', ...) end or function() end
 local rprint = DEVIAN_WORKSPACE and function(...) _G.print('WQRefresh', ...) end or function() end
+local dprint = DEVIAN_WORKSPACE and function(...) _G.print('WQData', ...) end or function() end
 local QuestPOI = WorldPlanPOIMixin
 local PIN_REFRESH_DELAY = .5
 local PIN_REQUEST_DELAY = .2
 local STYLE_TYPE_PENDING = 768
 -- Pin color/display variables
 db.TooltipExtras = db.TooltipExtras or {} -- idiot-proofing
+db.PinAlpha = 1
 local familiars = {
 [42159] = 'Nightwatcher Merayl',
 [40277] = 'Tiffany Nelson',
 [40298] = 'Sir Galveston',
 local hasInfo
 local achievementID = info.achievementID
 local _, name, _, completed, _, _, _, _, _, icon = GetAchievementInfo(achievementID)
 if not completed then
-WorldMapTooltip:AddLine(" ")
-WorldMapTooltip:AddLine("Achievements:")
-WorldMapTooltip:AddLine(' |T'..icon..':20:20|t '..name)
 local numItems = GetAchievementNumCriteria(achievementID)
 local numNeeded = 0
 local tooltipLines = {}
 for i =1, numItems do
 local criteriaName, criteriaType, completed, _, _, _, _, subAchievementID = GetAchievementCriteriaInfo(achievementID, i)
-print(GetAchievementCriteriaInfo(achievementID, i))
+--print(GetAchievementCriteriaInfo(achievementID, i))
 if not completed then
-print('::', criteriaName, completed, subAchievementID)
+--print('::', criteriaName, completed, subAchievementID)
 if criteriaType == 8 then
 local _, _, _, completed, _, _, _, _, _, subIcon = GetAchievementInfo(subAchievementID)
-print(' -', criteriaName, completed, subIcon)
+--print(' -', criteriaName, completed, subIcon)
 if not completed then
 local numCompleted = 0
 local numSubItems = GetAchievementNumCriteria(subAchievementID)
 local subCriteriaLine
 for j = 1, numSubItems do
 local subName, _, completed = GetAchievementCriteriaInfo(subAchievementID, j)
-print('   -',subName, completed)
+--print('   -',subName, completed)
 if completed then
 numCompleted = numCompleted + 1
 else
 numNeeded = numNeeded + 1
 if subName:match(info.name) then
 numNeeded = numNeeded + 1
 tinsert(tooltipLines, criteriaName)
 end
 end
 end
-if numNeeded >= 1 then
+if hasInfo then
+WorldMapTooltip:AddLine(" ")
+WorldMapTooltip:AddLine("Achievements:")
+WorldMapTooltip:AddLine(' |T'..icon..':20:20|t '..name)
 for i, line in ipairs(tooltipLines) do
 WorldMapTooltip:AddLine(line)
 end
-else
+end
-WorldMapTooltip:AddLine('Criteria completed!', 0, 1, 0)
-end
 end
 return hasInfo
 end
 local GetQuestTooltipExtras = function(info)
 local GetFactionInfoByID, GetQuestObjectiveInfo = GetFactionInfoByID, GetQuestObjectiveInfo
 function QuestPOI:OnEnter()
 if not WorldMapFrame:IsVisible() then
 WorldMap_HijackTooltip(self.owningFrame)
-else
+end
 if self.filtered then
 return
-end
 end
 WorldMapTooltip:SetOwner(self, "ANCHOR_RIGHT");
-print('doing tooltip stuff')
+--print('doing tooltip stuff')
 -- Can't add stuff after, so most of the blizzard tooltip hook is simply copied over
 local questID = self.questID
 local color = WORLD_QUEST_QUALITY_COLORS[self.rarity] or NORMAL_FONT_COLOR;
 end
 -- attempt to pull pin data
 local GetQuestTagInfo, GetProfessionInfo = GetQuestTagInfo, GetProfessionInfo
 function QuestPOI:GetData ()
-qprint('|cFF00FF88'..self:GetName()..':GetWorldQuestInfo()|r')
+dprint('|cFF00FF88'..self:GetID()..':GetData()|r')
 local questID = self.questID
 if not questID then
-rprint('|cFFFF4400bad pin|r', self:GetName())
+dprint('|cFFFF4400bad pin|r', self:GetName())
 return nil
 end
 local questTitle, factionID, capped = TQ_GetQuestInfoByQuestID(questID)
 -- if the title is nil, then wait and try later
 if not questTitle then
 self.isPending = true
-rprint('|cFFBB8844nodata|r|cFF00FFFF', self.questId)
+dprint('|cFFBB8844isPending=true|r|cFF00FFFF', self.questId)
 else
 self.title, self.factionID, self.capped = questTitle, factionID, capped
-rprint('|cFFBB8844  data|r|cFF00FFFF', (self.isPending and 'late|r' or 'jit|r'), self.title, '|r', self.factionID)
+dprint('|cFFBB8844  data|r|cFF00FFFF', (self.isPending and '|cFFFF4400delayed|r' or '|cFF00FF00success|r'), self.title, '|r', self.factionID)
+if self.dataLoaded then
+dprint('  |cFFFF4400overwriting data|r')
+end
 -- set tag details
 local worldQuestType
 self.tagID, self.tagName, worldQuestType, self.rarity, self.isElite, self.tradeskillLineIndex = GetQuestTagInfo(questID);
 local tagAtlas
 if worldQuestType == LE_QUEST_TAG_TYPE_PET_BATTLE then
 --qprint('  |cFF00FFFF'..questID..'|r hasUpdate:', hasUpdate, 'isPending:', isPending, 'isShown', self:IsShown())
 --qprint('  ', 'rewardType:', self.rewardType, 'tag:', self.tagID)
 qprint('  ', tostring(self.title), " |T"..tostring(self.itemTexture)..":12:12|t", tostring(self.itemName))
 if self.itemTexture and self.itemName and self.title then
+self.dataLoaded = true
 self.isPending = nil
 self.throttle = 1
 self.updateRate = PIN_REFRESH_DELAY
 self.isStale = true
 end
 rewardIcon = ICON_MONEY
 rewardName = GetMoneyString(money)
 rewardType = REWARD_CASH
 end
-print('  '..self.questID..':|cFFFFFF00SetRewardInfo():', rewardType)
+qprint('  '..self.questID..':|cFFFFFF00SetRewardInfo():', numRewards, rewardType)
 self.itemNumber = tonumber(rewardCount or self.itemNumber)
-self.rewardType = rewardType or REWARD_GEAR
+self.rewardType = rewardType
 self.quality = quality
 self.itemTexture = rewardIcon or self.itemTexture
 self.itemName = rewardName or self.itemName
 end
 end
 -- run from OnShow if .isNew is set
-function QuestPOI:OnNew()
+function QuestPOI:StartFade()
 if not self.isAnimating then
 --qprint('|cFFFFFF00'.. self.title .. ' added to quest log.')
 self:SetAlpha(0)
-if db.Config.FadeWhileGrouped then
+self.FadeIn.FadeIn:SetToAlpha(db.PinAlpha)
-self.FadeIn.FadeIn:SetToAlpha(0.15)
+self.PendingFade.FadeIn:SetToAlpha(db.PinAlpha)
-self.PendingFade.FadeIn:SetToAlpha(0.15)
+self.PendingFade.FadeOut:SetFromAlpha(db.PinAlpha)
-self.PendingFade.FadeOut:SetFromAlpha(0.15)
-else
-self.FadeIn.FadeIn:SetToAlpha(1)
-self.PendingFade.FadeIn:SetToAlpha(1)
-self.PendingFade.FadeOut:SetFromAlpha(1)
-end
 self.isAnimating = true
 self.isNew = nil
 self.isStale = true
 self.FadeIn:Play()
 end
 end
+function QuestPOI:EndFade()
+self.isAnimating = nil
+self:SetAlpha(db.PinAlpha)
+end
 function QuestPOI:OnShow ()
 if self.isNew then
 qprint('|cFFFFFF00'..tostring(self:GetName())..':OnShow()|r update:', self.isStale, 'new:', self.isNew, 'animation:', self.isAnimating)
 --qprint('|cFFFFFF00popping new pin handler')
-self:OnNew()
+self:StartFade()
 elseif not self.isAnimating then
 self:SetAlpha(1) -- fix stuck alpha
 end
-if self.isNew or self.isStale then
+if self.isStale then
+qprint('|cFF0088FFflagged for refresh')
 self:Refresh()
 end
 --WorldPlan:print(self:GetAlpha())
+if not self.Overlay:IsShown() then
+self:StartFade()
+end
+self.Overlay:SetShown(true)
 end
 function QuestPOI:OnHide()
---qprint('|cFFFFFF00["'..tostring(self.title)..'"]|r:OnHide()')
+qprint('|cFFFFFF00'..self:GetID()..'r:OnHide()')
-if not self:IsShown() then
+self.isAnimating = nil
-self.isAnimating = nil
+self:SetAlpha(db.PinAlpha)
-self:SetAlpha(1)
-end
 self.Overlay:SetShown(false)
 end
-function QuestPOI:SetAnchor(frame, mapID, mapWidth, mapHeight)
+local overlayBaseIndex = 1300
-qprint('  |cFF00FF00'..self:GetName()..':SetAnchor()|r', self.questID, mapID)
+function QuestPOI:SetAnchor(dX, dY, mapWidth, mapHeight)
-self:ClearAllPoints()
-local dX, dY = TQ_GetQuestLocation(self.questID)
-if not dX or dX == 0 then
-local _, x, y = QuestPOIGetIconInfo(self.questID)
-if x and floor(x) ~= 0 then
-dX, dY = x, y
-else
-dX, dY = self.x, self.y
-end
-end
 local oX, oY = self.x, self.y
+if not (dX and dY) then
+local dX, dY = TQ_GetQuestLocation(self.questID)
+if not dX or dX == 0 then
+local _, x, y = QuestPOIGetIconInfo(self.questID)
+if x and floor(x) ~= 0 then
+dX, dY = x, y
+else
+dX, dY = self.x, self.y
+end
+end
+end
+if not (mapHeight and mapWidth) then
+mapWidth, mapHeight = self:GetParent():GetSize()
+end
+local pX = (dX * mapWidth)
+local pY = (-dY * mapHeight)
 self.x = dX
 self.y = dY
+self:ClearAllPoints()
+self:SetPoint('CENTER', self:GetParent(), 'TOPLEFT', pX, pY)
-local pX = (dX * mapWidth)
+self:SetShown(self.used)
-local pY = (-dY * mapHeight)
+self.Overlay:SetParent(self:GetParent())
-if oX ~= dX then
+self.Overlay:ClearAllPoints()
-wqprint('  |cFF00FF00'..self.questID..':|r', oX, dX, format("%0.2f %0.2f", pX, pY))
+self.Overlay:SetPoint('TOPLEFT', self, 'TOPLEFT', 0, 4)
-end
+self.Overlay:SetPoint('BOTTOMRIGHT', self, 'BOTTOMRIGHT', 0, -4)
+self.Overlay:SetFrameLevel(overlayBaseIndex + self:GetID())
-self:SetParent(WorldMapPOIFrame)
-self:SetPoint('CENTER', frame, 'TOPLEFT', pX, pY)
 end
 function QuestPOI:OnLoad()
 qprint('|cFF00FF88'..self:GetName()..':OnLoad()|r',db.Config)
 self:RegisterEvent('SUPER_TRACKED_QUEST_CHANGED')
 end
 -- query for reward data if it wasn't found in the original scan
 local questID = self.questID
 if self.isPending then
-self:GetData()
+print('|cFFFF4400'..self:GetID()..':|r polling reward info')
-if not (self.PendingFade:IsPlaying() or self.isAnimating) then
+if not (self.isAnimating) then
 self.PendingFade:Play()
 end
+self:GetData()
 return
 else
 if self.PendingFade:IsPlaying() then
 self.PendingFade:Stop()
 end
 self.timeLabel:SetShown(self.worldQuest and (self.maxAlertLevel >= 1))
 end
-function QuestPOI:Refresh ()
+function QuestPOI:Refresh (fromUser)
-print('|cFF00FF88'..self:GetName()..'|r:Refresh()')
+--rprint('|c'..(fromUser and 'FF0088FF' or 'FF00FF88' )..self:GetID()..'|r:Refresh() type =', self.rewardType, 'title =', self.title)
 local styleType = (self.isPending and STYLE_TYPE_PENDING) or self.rewardType
 local style,subStyle =  self:GetTypeInfo(self.rewardType)
-if self.filtered then
+if self.filtered and (self.questID ~= GetSuperTrackedQuestID()) then
 subStyle = style.minimized
 end
 self.style = style
 self.subStyle = subStyle
 --print(style, subStyle)
 icon:SetTexture(PENDING_ICON)
 icon:SetDesaturated(true)
 icon:SetVertexColor(style.r, style.g, style.b)
 end
-local borderStyle = style
 iconBorder:SetMask("Interface\\Minimap\\UI-Minimap-Background")
 iconBorder:SetTexture(PENDING_BORDER)
+iconBorder:SetVertexColor(style.r, style.g, style.b, 1)
-iconBorder:SetVertexColor(borderStyle.r, borderStyle.g, borderStyle.b, 1)
 iconBorder:SetDesaturated(true)
 iconBorder:SetAlpha(subStyle.alpha or 1)
 trackingBorder:SetMask("Interface\\Minimap\\UI-Minimap-Background")
 trackingBorder:SetTexture(PENDING_BORDER)
 trackingBorder:SetVertexColor(0,0,0,1)
-self.tagIcon:SetShown(self.tagSize and true or false)
+self.tagIcon:SetShown((not self.filtered) and true or false)
 self.tagIcon:SetAtlas(self.tagAtlas)
-self.tagIcon:SetAlpha(subStyle.alpha or 1)
-self.Overlay:SetShown(true)
-self.Overlay:ClearAllPoints(self)
-self.Overlay:SetParent(self:GetParent())
-self.Overlay:SetFrameLevel(self:GetFrameLevel()+200)
-self.Overlay:SetPoint('TOPLEFT', self, 'TOPLEFT', 0, 4)
-self.Overlay:SetPoint('BOTTOMRIGHT', self, 'BOTTOMRIGHT', 0, -4)
 self.EliteBorder:SetShown(self.isElite and not self.filtered)
 self:UpdateSize()
 self.isStale = nil
 if self.rewardType  and cvar_check[self.rewardType] then
 if not GetCVarBool(cvar_check[self.rewardType])  then
 filtered = true
 end
 end
-return filtered
+self.filtered = filtered
 end
 function QuestPOI:IsShowable ()
 local print = qprint
 local qType = self.worldQuestType
 if not self.worldQuest then
-print('ignoring showable check')
+--print('ignoring showable check')
 return self.used, self.filtered
 end
 self.used = TQ_IsActive(self.questID)
 if qType == LE_QUEST_TAG_TYPE_PROFESSION then
-qprint('hide flags:', (not self.isKnownProfession), (db.Config.ShowAllProfessionQuests == false))
 if (not self.isKnownProfession) and  (db.Config.ShowAllProfessionQuests == false) then
-qprint(self.used)
 self.used = nil
-qprint(self.used)
+end
 end
-end
+rprint('  '..self.questID..':|cFFFFFF00IsShowable()|r ', self.used, self.title)
-print('  '..self.questID..':|cFFFFFF00IsShowable()|r ', self.used, self.title)
-return self.used
 end
 --- Fixes icons upon size update
 function QuestPOI:UpdateSize ()
-qprint('|cFF00FF88'..self:GetName()..'|r:UpdateSize()', self.style, self.subStyle)
+--qprint('|cFF00BB88'..self:GetID()..'|r:UpdateSize()', self.style, self.subStyle)
 local style = self.style
 local subStyle = self.subStyle
 local icon = self.icon
 local iconBorder = self.RewardBorder

Mercurial > wow > worldplan

comparison QuestPOI.lua @ 49:dbd81d49af02