From e8d666c359aa6005a825629bf5f2d1014d9e92f1 Mon Sep 17 00:00:00 2001 From: "Johnny C. Lam" Date: Tue, 19 Mar 2013 23:30:53 +0000 Subject: [PATCH] Use addon variables to stash references to each module. The Ovale modules are all interdependent and unlikely to become independent addons at any point, so use a simpler way to store references to each module by just storing it in the addon namespace. git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@796 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- OvaleActionBar.lua | 1 + OvaleAura.lua | 9 +++++---- OvaleBestAction.lua | 16 ++++++++-------- OvaleComboPoints.lua | 7 ++++--- OvaleCompile.lua | 17 +++++++++-------- OvaleCondition.lua | 22 +++++++++++----------- OvaleData.lua | 6 +++--- OvaleEnemies.lua | 1 + OvaleEquipement.lua | 1 + OvaleFrame.lua | 12 ++++++------ OvaleFuture.lua | 11 ++++++----- OvaleGUID.lua | 1 + OvaleIcone.lua | 6 +++--- OvaleOptions.lua | 11 ++++++----- OvalePaperDoll.lua | 1 + OvalePool.lua | 2 +- OvaleRecount.lua | 1 + OvaleScripts.lua | 1 + OvaleSkada.lua | 1 + OvaleSpellDamage.lua | 3 ++- OvaleStance.lua | 1 + OvaleState.lua | 36 ++++++++++++++++++------------------ OvaleSwing.lua | 5 +++-- 23 files changed, 94 insertions(+), 78 deletions(-) diff --git a/OvaleActionBar.lua b/OvaleActionBar.lua index 3c27830..71bd930 100644 --- a/OvaleActionBar.lua +++ b/OvaleActionBar.lua @@ -10,6 +10,7 @@ -- Keep data about the player action bars (key bindings mostly) local _, Ovale = ... local OvaleActionBar = Ovale:NewModule("OvaleActionBar", "AceEvent-3.0") +Ovale.OvaleActionBar = OvaleActionBar -- local tonumber = tonumber diff --git a/OvaleAura.lua b/OvaleAura.lua index 61ce1c5..70aee02 100644 --- a/OvaleAura.lua +++ b/OvaleAura.lua @@ -12,12 +12,13 @@ local _, Ovale = ... local OvaleAura = Ovale:NewModule("OvaleAura", "AceEvent-3.0") +Ovale.OvaleAura = OvaleAura -- -local OvaleData = Ovale:GetModule("OvaleData") -local OvaleGUID = Ovale:GetModule("OvaleGUID") -local OvalePaperDoll = Ovale:GetModule("OvalePaperDoll") -local OvalePool = Ovale.poolPrototype +local OvaleData = Ovale.OvaleData +local OvaleGUID = Ovale.OvaleGUID +local OvalePaperDoll = Ovale.OvalePaperDoll +local OvalePool = Ovale.OvalePool local baseDamageMultiplier = 1 local playerGUID = nil diff --git a/OvaleBestAction.lua b/OvaleBestAction.lua index 909e43f..95e06d7 100644 --- a/OvaleBestAction.lua +++ b/OvaleBestAction.lua @@ -9,16 +9,16 @@ local _, Ovale = ... local OvaleBestAction = {} -Ovale.bestActionModule = OvaleBestAction +Ovale.OvaleBestAction = OvaleBestAction -- -local OvaleActionBar = Ovale:GetModule("OvaleActionBar") -local OvaleCondition = Ovale.conditionModule -local OvaleData = Ovale:GetModule("OvaleData") -local OvaleEquipement = Ovale:GetModule("OvaleEquipement") -local OvalePaperDoll = Ovale:GetModule("OvalePaperDoll") -local OvaleStance = Ovale:GetModule("OvaleStance") -local OvaleState = Ovale.stateModule +local OvaleActionBar = Ovale.OvaleActionBar +local OvaleCondition = Ovale.OvaleCondition +local OvaleData = Ovale.OvaleData +local OvaleEquipement = Ovale.OvaleEquipement +local OvalePaperDoll = Ovale.OvalePaperDoll +local OvaleStance = Ovale.OvaleStance +local OvaleState = Ovale.OvaleState local floor, ipairs, loadstring, pairs = math.floor, ipairs, loadstring, pairs local strfind, tonumber, tostring = string.find, tonumber, tostring diff --git a/OvaleComboPoints.lua b/OvaleComboPoints.lua index 1434f7f..64882b7 100644 --- a/OvaleComboPoints.lua +++ b/OvaleComboPoints.lua @@ -11,11 +11,12 @@ local _, Ovale = ... local OvaleComboPoints = Ovale:NewModule("OvaleComboPoints", "AceEvent-3.0") +Ovale.OvaleComboPoints = OvaleComboPoints -- -local OvaleData = Ovale:GetModule("OvaleData") -local OvaleGUID = Ovale:GetModule("OvaleGUID") -local OvalePaperDoll = Ovale:GetModule("OvalePaperDoll") +local OvaleData = Ovale.OvaleData +local OvaleGUID = Ovale.OvaleGUID +local OvalePaperDoll = Ovale.OvalePaperDoll local GetComboPoints = GetComboPoints local UnitGUID = UnitGUID diff --git a/OvaleCompile.lua b/OvaleCompile.lua index 630531e..1cdaead 100644 --- a/OvaleCompile.lua +++ b/OvaleCompile.lua @@ -9,17 +9,18 @@ local _, Ovale = ... local OvaleCompile = Ovale:NewModule("OvaleCompile", "AceEvent-3.0") +Ovale.OvaleCompile = OvaleCompile -- local L = Ovale.L -local OvaleCondition = Ovale.conditionModule -local OvaleData = Ovale:GetModule("OvaleData") -local OvaleEquipement = Ovale:GetModule("OvaleEquipement") -local OvaleOptions = Ovale:GetModule("OvaleOptions") -local OvalePaperDoll = Ovale:GetModule("OvalePaperDoll") -local OvalePool = Ovale.poolPrototype -local OvaleScripts = Ovale:GetModule("OvaleScripts") -local OvaleStance = Ovale:GetModule("OvaleStance") +local OvaleCondition = Ovale.OvaleCondition +local OvaleData = Ovale.OvaleData +local OvaleEquipement = Ovale.OvaleEquipement +local OvaleOptions = Ovale.OvaleOptions +local OvalePaperDoll = Ovale.OvalePaperDoll +local OvalePool = Ovale.OvalePool +local OvaleScripts = Ovale.OvaleScripts +local OvaleStance = Ovale.OvaleStance local node = {} local nodePool = OvalePool:NewPool("OvaleCompile_nodePool") diff --git a/OvaleCondition.lua b/OvaleCondition.lua index dcc9195..71e7559 100644 --- a/OvaleCondition.lua +++ b/OvaleCondition.lua @@ -9,21 +9,21 @@ local _, Ovale = ... local OvaleCondition = {} -Ovale.conditionModule = OvaleCondition +Ovale.OvaleCondition = OvaleCondition -- local LBCT = LibStub("LibBabble-CreatureType-3.0"):GetLookupTable() local LRC = LibStub("LibRangeCheck-2.0", true) -local OvaleAura = Ovale:GetModule("OvaleAura") -local OvaleData = Ovale:GetModule("OvaleData") -local OvaleEnemies = Ovale:GetModule("OvaleEnemies") -local OvaleEquipement = Ovale:GetModule("OvaleEquipement") -local OvaleFuture = Ovale:GetModule("OvaleFuture") -local OvalePaperDoll = Ovale:GetModule("OvalePaperDoll") -local OvaleSpellDamage = Ovale:GetModule("OvaleSpellDamage") -local OvaleStance = Ovale:GetModule("OvaleStance") -local OvaleState = Ovale.stateModule -local OvaleSwing = Ovale:GetModule("OvaleSwing") +local OvaleAura = Ovale.OvaleAura +local OvaleData = Ovale.OvaleData +local OvaleEnemies = Ovale.OvaleEnemies +local OvaleEquipement = Ovale.OvaleEquipement +local OvaleFuture = Ovale.OvaleFuture +local OvalePaperDoll = Ovale.OvalePaperDoll +local OvaleSpellDamage = Ovale.OvaleSpellDamage +local OvaleStance = Ovale.OvaleStance +local OvaleState = Ovale.OvaleState +local OvaleSwing = Ovale.OvaleSwing local runes = {} local runesCD = {} diff --git a/OvaleData.lua b/OvaleData.lua index 33352e6..23edfb9 100644 --- a/OvaleData.lua +++ b/OvaleData.lua @@ -9,11 +9,11 @@ local _, Ovale = ... local OvaleData = Ovale:NewModule("OvaleData", "AceEvent-3.0") +Ovale.OvaleData = OvaleData -- -local OvaleData = Ovale:GetModule("OvaleData") -local OvalePaperDoll = Ovale:GetModule("OvalePaperDoll") -local OvaleStance = Ovale:GetModule("OvaleStance") +local OvalePaperDoll = Ovale.OvalePaperDoll +local OvaleStance = Ovale.OvaleStance local ipairs, pairs, tinsert, tonumber, tostring, tsort = ipairs, pairs, table.insert, tonumber, tostring, table.sort local GetNumGlyphSockets = GetNumGlyphSockets diff --git a/OvaleEnemies.lua b/OvaleEnemies.lua index 4e60065..883af1f 100644 --- a/OvaleEnemies.lua +++ b/OvaleEnemies.lua @@ -11,6 +11,7 @@ local _, Ovale = ... local OvaleEnemies = Ovale:NewModule("OvaleEnemies", "AceEvent-3.0", "AceTimer-3.0") +Ovale.OvaleEnemies = OvaleEnemies -- local bit_band = bit.band diff --git a/OvaleEquipement.lua b/OvaleEquipement.lua index ddcd514..b679816 100644 --- a/OvaleEquipement.lua +++ b/OvaleEquipement.lua @@ -9,6 +9,7 @@ local _, Ovale = ... local OvaleEquipement = Ovale:NewModule("OvaleEquipement", "AceEvent-3.0") +Ovale.OvaleEquipement = OvaleEquipement -- local pairs = pairs diff --git a/OvaleFrame.lua b/OvaleFrame.lua index b22ed2c..a4cfba8 100644 --- a/OvaleFrame.lua +++ b/OvaleFrame.lua @@ -14,12 +14,12 @@ do -- local AceGUI = LibStub("AceGUI-3.0") local Masque = LibStub("Masque", true) - local OvaleBestAction = Ovale.bestActionModule - local OvaleCompile = Ovale:GetModule("OvaleCompile") - local OvaleCondition = Ovale.conditionModule - local OvaleData = Ovale:GetModule("OvaleData") - local OvaleOptions = Ovale:GetModule("OvaleOptions") - local OvaleState = Ovale.stateModule + local OvaleBestAction = Ovale.OvaleBestAction + local OvaleCompile = Ovale.OvaleCompile + local OvaleCondition = Ovale.OvaleCondition + local OvaleData = Ovale.OvaleData + local OvaleOptions = Ovale.OvaleOptions + local OvaleState = Ovale.OvaleState local Type = "OvaleFrame" local Version = 7 diff --git a/OvaleFuture.lua b/OvaleFuture.lua index 69c141b..e18fb51 100644 --- a/OvaleFuture.lua +++ b/OvaleFuture.lua @@ -11,13 +11,14 @@ local _, Ovale = ... local OvaleFuture = Ovale:NewModule("OvaleFuture", "AceEvent-3.0") +Ovale.OvaleFuture = OvaleFuture -- -local OvaleAura = Ovale:GetModule("OvaleAura") -local OvaleComboPoints = Ovale:GetModule("OvaleComboPoints") -local OvaleData = Ovale:GetModule("OvaleData") -local OvaleGUID = Ovale:GetModule("OvaleGUID") -local OvalePaperDoll = Ovale:GetModule("OvalePaperDoll") +local OvaleAura = Ovale.OvaleAura +local OvaleComboPoints = Ovale.OvaleComboPoints +local OvaleData = Ovale.OvaleData +local OvaleGUID = Ovale.OvaleGUID +local OvalePaperDoll = Ovale.OvalePaperDoll local ipairs = ipairs local pairs = pairs diff --git a/OvaleGUID.lua b/OvaleGUID.lua index d6939e5..24bb63c 100644 --- a/OvaleGUID.lua +++ b/OvaleGUID.lua @@ -12,6 +12,7 @@ local _, Ovale = ... local OvaleGUID = Ovale:NewModule("OvaleGUID", "AceEvent-3.0", "AceConsole-3.0") +Ovale.OvaleGUID = OvaleGUID -- local strfind, strsub = string.find, string.sub diff --git a/OvaleIcone.lua b/OvaleIcone.lua index 2fba58d..7fec759 100644 --- a/OvaleIcone.lua +++ b/OvaleIcone.lua @@ -13,9 +13,9 @@ local _, Ovale = ... -- local L = Ovale.L -local OvaleData = Ovale:GetModule("OvaleData") -local OvaleOptions = Ovale:GetModule("OvaleOptions") -local OvaleState = Ovale.stateModule +local OvaleData = Ovale.OvaleData +local OvaleOptions = Ovale.OvaleOptions +local OvaleState = Ovale.OvaleState local strfind, strformat, strsub = string.find, string.format, string.sub -- diff --git a/OvaleOptions.lua b/OvaleOptions.lua index af00c90..2aa72cb 100644 --- a/OvaleOptions.lua +++ b/OvaleOptions.lua @@ -11,13 +11,14 @@ local _, Ovale = ... local OvaleOptions = Ovale:NewModule("OvaleOptions", "AceConsole-3.0", "AceEvent-3.0") +Ovale.OvaleOptions = OvaleOptions -- -local OvaleData = Ovale:GetModule("OvaleData") -local OvalePaperDoll = Ovale:GetModule("OvalePaperDoll") -local OvaleScripts = Ovale:GetModule("OvaleScripts") -local OvaleStance = Ovale:GetModule("OvaleStance") -local OvaleState = Ovale.stateModule +local OvaleData = Ovale.OvaleData +local OvalePaperDoll = Ovale.OvalePaperDoll +local OvaleScripts = Ovale.OvaleScripts +local OvaleStance = Ovale.OvaleStance +local OvaleState = Ovale.OvaleState local strgmatch, strgsub, tostring = string.gmatch, string.gsub, tostring -- diff --git a/OvalePaperDoll.lua b/OvalePaperDoll.lua index 1eb1777..e570db4 100644 --- a/OvalePaperDoll.lua +++ b/OvalePaperDoll.lua @@ -11,6 +11,7 @@ local _, Ovale = ... local OvalePaperDoll = Ovale:NewModule("OvalePaperDoll", "AceEvent-3.0") +Ovale.OvalePaperDoll = OvalePaperDoll -- local select = select diff --git a/OvalePool.lua b/OvalePool.lua index 2273396..68edf1e 100644 --- a/OvalePool.lua +++ b/OvalePool.lua @@ -10,7 +10,7 @@ -- Simple resource pool. local _, Ovale = ... local OvalePool = {} -Ovale.poolPrototype = OvalePool +Ovale.OvalePool = OvalePool -- OvalePool.name = "OvalePool" diff --git a/OvaleRecount.lua b/OvaleRecount.lua index 4d723fb..384e959 100644 --- a/OvaleRecount.lua +++ b/OvaleRecount.lua @@ -9,6 +9,7 @@ local _, Ovale = ... local OvaleRecount = Ovale:NewModule("OvaleRecount") +Ovale.OvaleRecount = OvaleRecount -- local Recount = LibStub("AceAddon-3.0"):GetAddon("Recount", true) diff --git a/OvaleScripts.lua b/OvaleScripts.lua index 863bb53..b67fc98 100644 --- a/OvaleScripts.lua +++ b/OvaleScripts.lua @@ -11,6 +11,7 @@ local _, Ovale = ... local OvaleScripts = Ovale:NewModule("OvaleScripts") +Ovale.OvaleScripts = OvaleScripts -- local OvalePaperDoll = Ovale:GetModule("OvalePaperDoll") diff --git a/OvaleSkada.lua b/OvaleSkada.lua index bbdfbd1..6cf7e51 100644 --- a/OvaleSkada.lua +++ b/OvaleSkada.lua @@ -9,6 +9,7 @@ local _, Ovale = ... local OvaleSkada = Ovale:NewModule("OvaleSkada") +Ovale.OvaleSkada = OvaleSkada -- local Skada = LibStub("AceAddon-3.0"):GetAddon("Skada", true) diff --git a/OvaleSpellDamage.lua b/OvaleSpellDamage.lua index 911eb22..44df4ce 100644 --- a/OvaleSpellDamage.lua +++ b/OvaleSpellDamage.lua @@ -11,9 +11,10 @@ local _, Ovale = ... local OvaleSpellDamage = Ovale:NewModule("OvaleSpellDamage", "AceEvent-3.0") +Ovale.OvaleSpellDamage = OvaleSpellDamage -- -local OvaleGUID = Ovale:GetModule("OvaleGUID") +local OvaleGUID = Ovale.OvaleGUID local select = select local strfind = string.find diff --git a/OvaleStance.lua b/OvaleStance.lua index c75d6ee..1920899 100644 --- a/OvaleStance.lua +++ b/OvaleStance.lua @@ -11,6 +11,7 @@ local _, Ovale = ... local OvaleStance = Ovale:NewModule("OvaleStance", "AceEvent-3.0") +Ovale.OvaleStance = OvaleStance -- local ipairs = ipairs diff --git a/OvaleState.lua b/OvaleState.lua index e950ce7..1bb0940 100644 --- a/OvaleState.lua +++ b/OvaleState.lua @@ -11,7 +11,24 @@ local _, Ovale = ... OvaleState = {} -Ovale.stateModule = OvaleState +Ovale.OvaleState = OvaleState + +-- +local OvaleAura = Ovale.OvaleAura +local OvaleComboPoints = Ovale.OvaleComboPoints +local OvaleData = Ovale.OvaleData +local OvaleEquipement = Ovale.OvaleEquipement +local OvaleFuture = Ovale.OvaleFuture +local OvaleGUID = Ovale.OvaleGUID +local OvalePaperDoll = Ovale.OvalePaperDoll +local OvaleStance = Ovale.OvaleStance + +local floor, pairs, tostring = math.floor, pairs, tostring +local GetRuneCooldown, GetRuneType = GetRuneCooldown, GetRuneType +local GetSpellInfo, UnitGUID, UnitHealth = GetSpellInfo, UnitGUID, UnitHealth +local UnitHealthMax, UnitPower, UnitPowerMax = UnitHealthMax, UnitPower, UnitPowerMax +local MAX_COMBO_POINTS = MAX_COMBO_POINTS +-- -- --the state in the current frame @@ -35,23 +52,6 @@ OvaleState.powerRate = {} OvaleState.lastSpellId = nil -- --- -local OvaleAura = Ovale:GetModule("OvaleAura") -local OvaleComboPoints = Ovale:GetModule("OvaleComboPoints") -local OvaleData = Ovale:GetModule("OvaleData") -local OvaleEquipement = Ovale:GetModule("OvaleEquipement") -local OvaleFuture = Ovale:GetModule("OvaleFuture") -local OvaleGUID = Ovale:GetModule("OvaleGUID") -local OvalePaperDoll = Ovale:GetModule("OvalePaperDoll") -local OvaleStance = Ovale:GetModule("OvaleStance") - -local floor, pairs, tostring = math.floor, pairs, tostring -local GetRuneCooldown, GetRuneType = GetRuneCooldown, GetRuneType -local GetSpellInfo, UnitGUID, UnitHealth = GetSpellInfo, UnitGUID, UnitHealth -local UnitHealthMax, UnitPower, UnitPowerMax = UnitHealthMax, UnitPower, UnitPowerMax -local MAX_COMBO_POINTS = MAX_COMBO_POINTS --- - -- function OvaleState:StartNewFrame() self.maintenant = Ovale.now diff --git a/OvaleSwing.lua b/OvaleSwing.lua index 8547d80..472a29c 100644 --- a/OvaleSwing.lua +++ b/OvaleSwing.lua @@ -20,6 +20,7 @@ local _, Ovale = ... local OvaleSwing = Ovale:NewModule("OvaleSwing", "AceEvent-3.0") +Ovale.OvaleSwing = OvaleSwing -- OvaleSwing.ohNext = nil @@ -34,8 +35,8 @@ OvaleSwing.swingmode = nil -- -- -local OvaleGUID = Ovale:GetModule("OvaleGUID") -local OvalePaperDoll = Ovale:GetModule("OvalePaperDoll") +local OvaleGUID = Ovale.OvaleGUID +local OvalePaperDoll = Ovale.OvalePaperDoll local unpack = unpack local math_abs = math.abs -- 1.7.9.5