From 89915393090d79373273c19db77d225bbf29786e Mon Sep 17 00:00:00 2001 From: Parnic Date: Mon, 6 Oct 2008 18:34:35 +0000 Subject: [PATCH] - added bar/background graphical blend mode options so we can have us some snazzier artses --- IceBarElement.lua | 2 ++ IceCore.lua | 32 +++++++++++++++++++++++++++++++ IceHUD.lua | 48 +++++++++++++++++++++++++++++++++++++---------- 3 files changed, 72 insertions(+), 10 deletions(-) diff --git a/IceBarElement.lua b/IceBarElement.lua index e01c67b..d0128ce 100644 --- a/IceBarElement.lua +++ b/IceBarElement.lua @@ -511,6 +511,7 @@ function IceBarElement.prototype:CreateBackground() end self.frame.bg:SetTexture(IceElement.TexturePath .. self.settings.barTexture.."BG") + self.frame.bg:SetBlendMode(self.settings.barBgBlendMode) self.frame.bg:ClearAllPoints() self.frame.bg:SetAllPoints(self.frame) @@ -556,6 +557,7 @@ function IceBarElement.prototype:CreateBar() end self.barFrame.bar:SetTexture(IceElement.TexturePath .. self.settings.barTexture) + self.barFrame.bar:SetBlendMode(self.settings.barBlendMode) self.barFrame.bar:SetAllPoints(self.frame) if (self.moduleSettings.side == IceCore.Side.Left) then diff --git a/IceCore.lua b/IceCore.lua index 8ddbf10..cbe4cf4 100644 --- a/IceCore.lua +++ b/IceCore.lua @@ -305,6 +305,24 @@ function IceCore.prototype:SetBarTexture(value) end +function IceCore.prototype:GetBarBlendMode() + return self.settings.barBlendMode +end +function IceCore.prototype:SetBarBlendMode(value) + self.settings.barBlendMode = value + self:Redraw() +end + + +function IceCore.prototype:GetBarBgBlendMode() + return self.settings.barBgBlendMode +end +function IceCore.prototype:SetBarBgBlendMode(value) + self.settings.barBgBlendMode = value + self:Redraw() +end + + function IceCore.prototype:GetBarWidth() return self.settings.barWidth end @@ -355,6 +373,8 @@ function IceCore.prototype:ChangePreset(value) self:SetBarWidth(self.presets[value].barWidth) self:SetBarSpace(self.presets[value].barSpace) self:SetBarProportion(self.presets[value].barProportion) + self:SetBarBlendMode(self.presets[value].barBlendMode) + self:SetBarBgBlendMode(self.presets[value].barBgBlendMode) end @@ -422,6 +442,8 @@ function IceCore.prototype:LoadPresets() barHeight = 220, barProportion = 0.15, barSpace = 3, + barBlendMode = "BLEND", + barBgBlendMode = "BLEND", } self.presets["HiBar"] = { @@ -430,6 +452,8 @@ function IceCore.prototype:LoadPresets() barHeight = 150, barProportion = 0.34, barSpace = 4, + barBlendMode = "BLEND", + barBgBlendMode = "BLEND", } self.presets["RoundBar"] = { @@ -438,6 +462,8 @@ function IceCore.prototype:LoadPresets() barHeight = 220, barProportion = 0.14, barSpace = 1, + barBlendMode = "BLEND", + barBgBlendMode = "BLEND", } self.presets["ColorBar"] = { @@ -446,6 +472,8 @@ function IceCore.prototype:LoadPresets() barHeight = 220, barProportion = 0.15, barSpace = 3, + barBlendMode = "Blend", + barBgBlendMode = "BLEND", } self.presets["RivetBar"] = { @@ -454,6 +482,8 @@ function IceCore.prototype:LoadPresets() barHeight = 220, barProportion = 0.15, barSpace = 3, + barBlendMode = "BLEND", + barBgBlendMode = "BLEND", } self.presets["RivetBar2"] = { @@ -462,6 +492,8 @@ function IceCore.prototype:LoadPresets() barHeight = 220, barProportion = 0.15, barSpace = 3, + barBlendMode = "BLEND", + barBgBlendMode = "BLEND", } end diff --git a/IceHUD.lua b/IceHUD.lua index c4d99b2..933cca3 100644 --- a/IceHUD.lua +++ b/IceHUD.lua @@ -269,7 +269,7 @@ IceHUD.options = end, validate = SML:List('font'), }, - + barSettings = { type = 'group', name = 'Bar Settings', @@ -289,15 +289,15 @@ IceHUD.options = validate = { "Bar", "HiBar", "RoundBar", "ColorBar", "RivetBar", "RivetBar2" }, order = 9 }, - - + + headerBarAdvancedBlank = { type = 'header', name = " ", order = 10 }, headerBarAdvanced = { type = 'header', name = "Advanced Bar Settings", order = 10 }, - + barTexture = { type = 'text', name = 'Bar Texture', @@ -311,7 +311,7 @@ IceHUD.options = validate = { "Bar", "HiBar", "RoundBar", "ColorBar", "RivetBar", "RivetBar2" }, order = 11 }, - + barWidth = { type = 'range', name = 'Bar Width', @@ -327,7 +327,7 @@ IceHUD.options = step = 1, order = 12 }, - + barHeight = { type = 'range', name = 'Bar Height', @@ -343,7 +343,7 @@ IceHUD.options = step = 1, order = 13 }, - + barProportion = { type = 'range', name = 'Bar Proportion', @@ -360,7 +360,7 @@ IceHUD.options = isPercent = true, order = 14 }, - + barSpace = { type = 'range', name = 'Bar Space', @@ -376,10 +376,38 @@ IceHUD.options = step = 1, order = 15 }, + + bgBlendMode = { + type = 'text', + name = 'Bar Background Blend Mode', + desc = 'IceHUD Bar Background Blend mode', + get = function() + return IceHUD.IceCore:GetBarBgBlendMode() + end, + set = function(value) + IceHUD.IceCore:SetBarBgBlendMode(value) + end, + validate = { BLEND = "Blend", ADD = "Additive" }, --"Disable", "Alphakey", "Mod" }, + order = 16 + }, + + barBlendMode = { + type = 'text', + name = 'Bar Blend Mode', + desc = 'IceHUD Bar Blend mode', + get = function() + return IceHUD.IceCore:GetBarBlendMode() + end, + set = function(value) + IceHUD.IceCore:SetBarBlendMode(value) + end, + validate = { BLEND = "Blend", ADD = "Additive" }, --"Disable", "Alphakey", "Mod" }, + order = 17 + }, } }, - - + + modules = { type='group', desc = 'Module configuration options',