comparison ObjectiveTracker/ObjectiveTracker.xml @ 40:03ed70f846de

- move block accessors into a new file - define a tMove function for reconciling the free/used tables as needed - when retrieving an old block frame, confirm ID still matches; resolves multiple watch items on one block - stop any animations when a block is freed; resolves stuck flare graphics
author Nenue
date Sun, 24 Apr 2016 14:15:25 -0400
parents 1f8f9cc3d956
children 7a65ed86e4dd
comparison
equal deleted inserted replaced
39:92534dc793f2 40:03ed70f846de
2 ..\FrameXML\UI.xsd"> 2 ..\FrameXML\UI.xsd">
3 3
4 4
5 5
6 6
7 <FontString name="VeneerRewardText" virtual="true" inherits="VeneerNumberFontSmall" parentArray="rewardLabel" />
7 <Texture file="Interface\ICONS\INV_Misc_QuestionMark" name="VeneerRewardTile" parentArray="rewardTile" alpha="0.5" hidden="true" virtual="true"> 8 <Texture file="Interface\ICONS\INV_Misc_QuestionMark" name="VeneerRewardTile" parentArray="rewardTile" alpha="0.5" hidden="true" virtual="true">
8 <Color r="1" g="1" b="1" a="1" /> 9 <Color r="1" g="1" b="1" a="1" />
9 <Anchors> 10 <Anchors>
10 <Anchor point="BOTTOM" x="0" y="5" /> 11 <Anchor point="BOTTOM" x="0" y="5" />
11 </Anchors> 12 </Anchors>
12 <TexCoords top="0.15" bottom="0.85" left="0.15" right="0.85" /> 13 <TexCoords top="0.15" bottom="0.85" left="0.15" right="0.85" />
13 </Texture> 14 </Texture>
14 15
16 <Frame name="VeneerRewardsPopOut" parent="UIParent" frameStrata="LOW">
17 <Size x="200" y="350" />
18 <Anchors>
19 <Anchor point="TOPRIGHT" relativePoint="TOPLEFT" x="-4" />
20 </Anchors>
21 <Layers>
22 <Layer level="BACKGROUND">
23
24 </Layer>
25 <Layer level="ARTWORK">
26 <Texture inherits="VeneerRewardTile" />
27 <Texture inherits="VeneerRewardTile" />
28 <Texture inherits="VeneerRewardTile" />
29 </Layer>
30 <Layer level="OVERLAY">
31 <FontString inherits="VeneerRewardText" />
32 <FontString inherits="VeneerRewardText" />
33 <FontString inherits="VeneerRewardText" />
34 </Layer>
35 </Layers>
36 <Animations>
37 <AnimationGroup parentKey="rewardFadeIn">
38 <Translation offsetX="-200" offsetY="0" smoothing="OUT" duration="0.15" order="1" />
39 <Alpha change="1" duration=".15" order="1" />
40 </AnimationGroup>
41 </Animations>
42 </Frame>
15 43
16 <Frame name="VeneerObjectiveWrapper" parent="UIParent" movable="true" enableMouse="true" frameStrata="LOW"> 44 <Frame name="VeneerObjectiveWrapper" parent="UIParent" movable="true" enableMouse="true" frameStrata="LOW">
17 <TitleRegion> 45 <TitleRegion>
18 <Size x="300" y="30" /> 46 <Size x="300" y="30" />
19 <Anchors> 47 <Anchors>
255 <Alpha childKey="StarBurst" startDelay="0.25" duration="0.5" order="1" fromAlpha="1" toAlpha="0"/> 283 <Alpha childKey="StarBurst" startDelay="0.25" duration="0.5" order="1" fromAlpha="1" toAlpha="0"/>
256 <Scale childKey="StarBurst" duration="0.25" order="1" fromScaleX="0.5" fromScaleY="0.5" toScaleX="1" toScaleY="1"/> 284 <Scale childKey="StarBurst" duration="0.25" order="1" fromScaleX="0.5" fromScaleY="0.5" toScaleX="1" toScaleY="1"/>
257 <Alpha childKey="LineSheen" startDelay="0.15" duration="0.5" order="1" fromAlpha="0" toAlpha="0.75"/> 285 <Alpha childKey="LineSheen" startDelay="0.15" duration="0.5" order="1" fromAlpha="0" toAlpha="0.75"/>
258 <Alpha childKey="LineSheen" startDelay="0.75" duration="0.5" order="1" fromAlpha="0.75" toAlpha="0"/> 286 <Alpha childKey="LineSheen" startDelay="0.75" duration="0.5" order="1" fromAlpha="0.75" toAlpha="0"/>
259 <Translation childKey="LineSheen" startDelay="0.15" duration="1.5" order="1" offsetX="280" offsetY="0"/> 287 <Translation childKey="LineSheen" startDelay="0.15" duration="1.5" order="1" offsetX="280" offsetY="0"/>
288 <Scripts>
289 <OnPlay>
290 self:GetParent().fadeOut:Stop()
291 </OnPlay>
292 </Scripts>
293 </AnimationGroup>
294 <AnimationGroup parentKey="fadeOut" ignoreFramerateThrottle="true">
295 <Alpha duration="0.25" fromAlpha="1" toAlpha="0" order="1" />
296 <Scripts>
297 <OnPlay>
298 self:GetParent().headerFade:Stop()
299 </OnPlay>
300 <OnFinished>
301 self:GetParent():Hide()
302 </OnFinished>
303 </Scripts>
260 </AnimationGroup> 304 </AnimationGroup>
261 </Animations> 305 </Animations>
262 <Layers> 306 <Layers>
263 <Layer level="BACKGROUND"> 307 <Layer level="BACKGROUND">
264 <Texture name="$parentTitleBackground" parentKey="titlebg"> 308 <Texture name="$parentTitleBackground" parentKey="titlebg">
319 363
320 364
321 <Frame name="VeneerTrackerBlock" virtual="true"> 365 <Frame name="VeneerTrackerBlock" virtual="true">
322 <Scripts> 366 <Scripts>
323 <OnShow> 367 <OnShow>
368 Veneer.print('Frame')(self:GetName(), '|cFF00FF00SHOW|r', debugstack(1,3,1))
324 if(self.DebugTab:IsShown()) then 369 if(self.DebugTab:IsShown()) then
325 self.DebugTab:Show() 370 self.DebugTab:Show()
326 end 371 end
372 self.blockFadeOut:Stop()
327 </OnShow> 373 </OnShow>
328 <OnHide> 374 <OnHide>
375 Veneer.print('Frame')(self:GetName(), '|cFF00FF00HIDE|r', debugstack(1,3,1))
329 if(self.DebugTab:IsShown()) then 376 if(self.DebugTab:IsShown()) then
330 self.DebugTab:Hide() 377 self.DebugTab:Hide()
331 end 378 end
379 -- make sure neither of these execute their onFinished upon re-show
380 self.blockFadeOut:Stop()
381 self.questFadeIn:Stop()
332 </OnHide> 382 </OnHide>
333 </Scripts> 383 </Scripts>
334 <Animations> 384 <Animations>
335 <AnimationGroup name="$parentSlideIn" parentKey="SlideIn" ignoreFramerateThrottle="true"> 385 <AnimationGroup name="$parent_BlockSlide" parentKey="blockShift" ignoreFramerateThrottle="true">
336 <Translation parentKey="translation" offsetX="0" offsetY="0" smoothing="OUT" order="1" duration=".25" /> 386 <Translation parentKey="translation" offsetX="0" offsetY="0" smoothing="OUT" order="1" duration=".25" />
337 </AnimationGroup> 387 </AnimationGroup>
338 <AnimationGroup parentKey="questFadeIn" setToFinalAlpha="true" ignoreFramerateThrottle="true"> 388 <AnimationGroup name="$parent_BlockFadeIn" setToFinalAlpha="true" parentKey="questFadeIn" ignoreFramerateThrottle="true">
339 <Alpha duration="0.25" order="1" fromAlpha="0" toAlpha="1"/> 389 <Alpha duration="0.25" order="1" fromAlpha="0" toAlpha="1"/>
340 <Scale duration="0.25" order="1" fromScaleX="0.1" fromScaleY="0.1" toScaleX="1" toScaleY="1"> 390 <Scale duration="0.25" order="1" fromScaleX="0.1" fromScaleY="0.1" toScaleX="1" toScaleY="1">
341 <Origin point="CENTER"> 391 <Origin point="CENTER">
342 <Offset x="-50" y="0"/> 392 <Offset x="-50" y="0"/>
343 </Origin> 393 </Origin>
350 <Alpha childKey="StarBurst" startDelay="0.25" duration="0.5" order="1" fromAlpha="1" toAlpha="0"/> 400 <Alpha childKey="StarBurst" startDelay="0.25" duration="0.5" order="1" fromAlpha="1" toAlpha="0"/>
351 <Scale childKey="StarBurst" duration="0.25" order="1" fromScaleX="0.5" fromScaleY="0.5" toScaleX="1" toScaleY="1"/> 401 <Scale childKey="StarBurst" duration="0.25" order="1" fromScaleX="0.5" fromScaleY="0.5" toScaleX="1" toScaleY="1"/>
352 <Alpha childKey="LineSheen" startDelay="0.15" duration="0.5" order="1" fromAlpha="0" toAlpha="0.75"/> 402 <Alpha childKey="LineSheen" startDelay="0.15" duration="0.5" order="1" fromAlpha="0" toAlpha="0.75"/>
353 <Alpha childKey="LineSheen" startDelay="0.75" duration="0.5" order="1" fromAlpha="0.75" toAlpha="0"/> 403 <Alpha childKey="LineSheen" startDelay="0.75" duration="0.5" order="1" fromAlpha="0.75" toAlpha="0"/>
354 <Translation childKey="LineSheen" startDelay="0.15" duration="1.5" order="1" offsetX="280" offsetY="0"/> 404 <Translation childKey="LineSheen" startDelay="0.15" duration="1.5" order="1" offsetX="280" offsetY="0"/>
355 <Scripts> 405 </AnimationGroup>
356 <OnPlay> 406 <AnimationGroup name="$parent_BlockFade" parentKey="blockFadeOut" ignoreFramerateThrottle="true" looping="NONE">
357 self.animating = true 407 <Alpha duration="0.25" order="1" fromAlpha="1" toAlpha="0" />
358 </OnPlay> 408 <Translation duration="0.25" order="1" offsetX="260" offsetY="0" smoothing="OUT" />
359 <OnFinished>
360 self.animating = nil
361 </OnFinished>
362 </Scripts>
363 </AnimationGroup> 409 </AnimationGroup>
364 </Animations> 410 </Animations>
365 <Layers> 411 <Layers>
366 <Layer level="BACKGROUND"> 412 <Layer level="BACKGROUND">
367 <Texture name="$parentTitleBackground" parentKey="titlebg"> 413 <Texture name="$parentTitleBackground" parentKey="titlebg">
467 <Anchor point="TOP" relativeKey="$parent.statusbg" /> 513 <Anchor point="TOP" relativeKey="$parent.statusbg" />
468 <Anchor point="LEFT" relativeKey="$parent" /> 514 <Anchor point="LEFT" relativeKey="$parent" />
469 <Anchor point="RIGHT" relativeKey="$parent" /> 515 <Anchor point="RIGHT" relativeKey="$parent" />
470 </Anchors> 516 </Anchors>
471 </FontString> 517 </FontString>
472 <FontString parentArray="rewardLabel" inherits="VeneerNumberFontSmall" /> 518 <FontString inherits="VeneerRewardText" />
473 <FontString parentArray="rewardLabel" inherits="VeneerNumberFontSmall" /> 519 <FontString inherits="VeneerRewardText" />
474 <FontString parentArray="rewardLabel" inherits="VeneerNumberFontSmall" /> 520 <FontString inherits="VeneerRewardText" />
475 521
476 522
477 <Texture alphaMode="BLEND" parentArray="config" hidden="true"> 523 <Texture alphaMode="BLEND" parentArray="config" hidden="true">
478 <Anchors> 524 <Anchors>
479 <Anchor point="TOPLEFT" relativeKey="$parent.status" /> 525 <Anchor point="TOPLEFT" relativeKey="$parent.status" />
672 <Script file="Achievements.lua" /> 718 <Script file="Achievements.lua" />
673 <Script file="AutoQuestPopups.lua" /> 719 <Script file="AutoQuestPopups.lua" />
674 <Script file="BonusObjectives.lua" /> 720 <Script file="BonusObjectives.lua" />
675 <Script file="ScenarioObjectives.lua" /> 721 <Script file="ScenarioObjectives.lua" />
676 <Script file="ExerienceBar.lua" /> 722 <Script file="ExerienceBar.lua" />
677 <Script file="Frame.lua" /> 723 <Script file="TrackerFrame.lua" />
724 <Script file="TrackerBlock.lua" />
725 <Script file="RewardFrame.lua" />
678 <Script file="DefaultTracker.lua" /> 726 <Script file="DefaultTracker.lua" />
679 <Script file="Events.lua" /> 727 <Script file="Events.lua" />
680 <Script file="Widgets.lua" /> 728 <Script file="Widgets.lua" />
681 <!-- <Script file="ObjectiveStyle.lua" /> --> 729 <!-- <Script file="ObjectiveStyle.lua" /> -->
682 <!-- <Script file="ObjectiveInfo.lua" /> --> 730 <!-- <Script file="ObjectiveInfo.lua" /> -->