wow/worldplan: ClassPlan.lua comparison

comparison ClassPlan.lua @ 18:08b03bcdfeac

ClassPlan: - Significant load time improvements in the order hall. * Data events are spammed gratuitously at load-in, so any sort of operation that results should be done from a delayed enclosure. In this case: using a self-destructing C_Timer identified by the function handle, and setting a flag that frame scripts can respond to.

author	Nenue
date	Mon, 24 Oct 2016 18:23:06 -0400
parents	a2b623043970
children	6016ec3c8adf

comparison

equal deleted inserted replaced

-:594692f36b5b
+:08b03bcdfeac
 blocks = {},
 sortedItems = {},
 timers = {},
 shipments = {},
 playerFirst = false,
-prototypes = {}
+prototypes = {},
+Queued = {}
 }
 ClassPlanMissionMixin = {
 templateName = 'ClassPlanMissionEntry',
 events = {'GARRISON_MISSION_LIST_UPDATE', 'GARRISON_MISSION_STARTED', 'GARRISON_MISSION_FINISHED', 'GARRISON_LANDINGPAGE_SHIPMENTS'},}
 end
 self.initialized = true
 end
 end
+local last_invoc = {}
 function core:OnEvent (event, ...)
 print(event)
 if event == 'PLAYER_REGEN_DISABLED' then
 if self:IsVisible() then
 self.combatHide = true
 elseif event == 'PLAYER_LOGIN' then
 if not self.initialized then
 self:Setup()
 end
 elseif self.initialized and self.events[event] then
-local numCalls = 0
+self.isStale = true
-for ptype, eventFunc in pairs(self.events[event]) do
-numCalls = numCalls + 1
-print('|cFF88FF00' .. tostring(ptype) .. '|r:GetPlayerData() --', numCalls)
-eventFunc(self, event)
-end
 if self:IsVisible() then
-self:Refresh()
+else
+for handler, func in pairs(self.events[event]) do
+if not self.Queued[handler] then
+print('scheduling update for handler', handler)
+self.Queued[handler] = C_Timer.NewTimer(0.25, function()
+func(handler)
+self.Queued[handler] = nil
+end)
+end
+end
 end
 end
 end
 function core:UpdateNotifications()
 --ownerText = ownerText .. ' (' .. realm .. ')'
 --end
 self.Owner:SetText(ownerText)
 self.Name:SetTextColor(data.classColor.r, data.classColor.g, data.classColor.b)
-if self.isComplete then
-self.TimeLeft:SetText('Complete!')
-self.Background:SetColorTexture(.25,.25,.25,1)
-else
-self.Background:SetColorTexture(0,0,0,0.5)
-end
 end
 function core:RefreshItems(configKey, prototype)
 local sortedItems = self.sortedItems[configKey]
 function core:OnUpdate()
 if self.fadeTimer and self.fadeTimer < GetTime() then
 self:Hide()
 end
+if self.isStale then
+print('updating items on show')
+self:Refresh()
+end
 end
 function core:OnShow()
 if self.isStale then
 print('updating items on show')
 self.TimeLeft:SetTextColor(1,1,0)
 end
 end
 if not self.isComplete then
-local progress = (self.missionEndTime - time()) / self.durationSeconds
+local progress = (time() - (self.missionEndTime - self.durationSeconds)) / self.durationSeconds
 local w = self.ProgressBG:GetWidth()
 if progress >= 1 then
 self.ProgressBar:SetWidth(w)
 else
-self.ProgressBar:SetWidth(w - (progress * w))
+self.ProgressBar:SetWidth(progress * w)
+local r, g = 1, 0
+if progress >= 0.5 then
+g = 1
+r = 1-((progress-0.5)*2)
+else
+g = min(progress * 2, 1)
+r = 1
+end
+self.ProgressBar:SetColorTexture(r,g,0,1)
+self.ProgressBG:SetColorTexture(r,g,0,0.125)
 end
 self.ProgressBG:Show()
 self.ProgressBar:Show()
 else
 if self.isComplete then
 self.Done:Show()
 else
 self.Done:Hide()
+end
+if self.isComplete then
+self.TimeLeft:SetText('Complete!')
+self.Background:SetColorTexture(.25,.25,.25,1)
+else
+self.Background:SetColorTexture(0,0,0,0.5)
 end
 end
 self.isComplete = true
 else
 self.Swipe:SetCooldownUNIX(self.creationTime or 0 , self.duration or 0);
 end
-local hasPickups = (self.isComplete or (self.shipmentsTotal and (self.shipmentsReady > 0)))
+if self.isComplete then
-self.Background:SetAlpha(hasPickups and 1 or 0.1)
+self.TimeLeft:SetText('Complete!')
+self.Background:SetColorTexture(0.5,0.5,0.5)
+elseif (self.shipmentsReady and (self.shipmentsReady > 0)) then
+self.Background:SetColorTexture(0.5,0.5,0.5,.5)
+else
+self.Background:SetColorTexture(0,0,0,0.5)
+end
 end
 local time = time
-function ShipmentsHandler:OnUpdate()
+function ShipmentsHandler:OnUpdate(sinceLast)
+self.throttle = (self.throttle or 1) + sinceLast
+if self.throttle >= 1 then
+self.throttle = self.throttle - 1
+else
+return
+end
 if (self.shipmentsReady and self.shipmentsTotal) and (self.shipmentsReady < self.shipmentsTotal) then
 local timeLeft = self.creationTime + self.duration - time()
 if self.shipmentsReady >= 1 then
 self.TimeLeft:SetText(GetTimeLeftString(timeLeft))
 else
 self.TimeLeft:SetText('Complete!')
 self.TimeLeft:SetTextColor(0,1,0)
 end
+if not self.isComplete then
+local progress =  ((time() - self.creationTime) / self.duration)
+local w = self.ProgressBG:GetWidth()
+if progress >= 1 then
+self.ProgressBar:SetWidth(w)
+else
+self.ProgressBar:SetWidth(progress * w)
+end
+local r, g = 1, 0
+if progress >= 0.5 then
+g = 1
+r = 1-((progress-0.5)*2)
+else
+g = min(progress * 2, 1)
+r = 1
+end
+self.ProgressBar:SetColorTexture(r, g, 0, 1)
+self.ProgressBG:SetColorTexture(r, g, 0, .125)
+self.ProgressBG:Show()
+self.ProgressBar:Show()
+else
+self.ProgressBG:Hide()
+self.ProgressBar:Hide()
+end
 end
 function ShipmentsHandler:OnEnter()
 if ( self.shipmentsReady and self.shipmentsTotal ) then

Mercurial > wow > worldplan

comparison ClassPlan.lua @ 18:08b03bcdfeac