- added bar/background graphical blend mode options so we can have us some snazzier artses

This commit is contained in:
Parnic
2008-10-06 18:34:35 +00:00
parent 88e08161fa
commit 8991539309
3 changed files with 72 additions and 10 deletions

View File

@ -511,6 +511,7 @@ function IceBarElement.prototype:CreateBackground()
end end
self.frame.bg:SetTexture(IceElement.TexturePath .. self.settings.barTexture.."BG") self.frame.bg:SetTexture(IceElement.TexturePath .. self.settings.barTexture.."BG")
self.frame.bg:SetBlendMode(self.settings.barBgBlendMode)
self.frame.bg:ClearAllPoints() self.frame.bg:ClearAllPoints()
self.frame.bg:SetAllPoints(self.frame) self.frame.bg:SetAllPoints(self.frame)
@ -556,6 +557,7 @@ function IceBarElement.prototype:CreateBar()
end end
self.barFrame.bar:SetTexture(IceElement.TexturePath .. self.settings.barTexture) self.barFrame.bar:SetTexture(IceElement.TexturePath .. self.settings.barTexture)
self.barFrame.bar:SetBlendMode(self.settings.barBlendMode)
self.barFrame.bar:SetAllPoints(self.frame) self.barFrame.bar:SetAllPoints(self.frame)
if (self.moduleSettings.side == IceCore.Side.Left) then if (self.moduleSettings.side == IceCore.Side.Left) then

View File

@ -305,6 +305,24 @@ function IceCore.prototype:SetBarTexture(value)
end 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() function IceCore.prototype:GetBarWidth()
return self.settings.barWidth return self.settings.barWidth
end end
@ -355,6 +373,8 @@ function IceCore.prototype:ChangePreset(value)
self:SetBarWidth(self.presets[value].barWidth) self:SetBarWidth(self.presets[value].barWidth)
self:SetBarSpace(self.presets[value].barSpace) self:SetBarSpace(self.presets[value].barSpace)
self:SetBarProportion(self.presets[value].barProportion) self:SetBarProportion(self.presets[value].barProportion)
self:SetBarBlendMode(self.presets[value].barBlendMode)
self:SetBarBgBlendMode(self.presets[value].barBgBlendMode)
end end
@ -422,6 +442,8 @@ function IceCore.prototype:LoadPresets()
barHeight = 220, barHeight = 220,
barProportion = 0.15, barProportion = 0.15,
barSpace = 3, barSpace = 3,
barBlendMode = "BLEND",
barBgBlendMode = "BLEND",
} }
self.presets["HiBar"] = { self.presets["HiBar"] = {
@ -430,6 +452,8 @@ function IceCore.prototype:LoadPresets()
barHeight = 150, barHeight = 150,
barProportion = 0.34, barProportion = 0.34,
barSpace = 4, barSpace = 4,
barBlendMode = "BLEND",
barBgBlendMode = "BLEND",
} }
self.presets["RoundBar"] = { self.presets["RoundBar"] = {
@ -438,6 +462,8 @@ function IceCore.prototype:LoadPresets()
barHeight = 220, barHeight = 220,
barProportion = 0.14, barProportion = 0.14,
barSpace = 1, barSpace = 1,
barBlendMode = "BLEND",
barBgBlendMode = "BLEND",
} }
self.presets["ColorBar"] = { self.presets["ColorBar"] = {
@ -446,6 +472,8 @@ function IceCore.prototype:LoadPresets()
barHeight = 220, barHeight = 220,
barProportion = 0.15, barProportion = 0.15,
barSpace = 3, barSpace = 3,
barBlendMode = "Blend",
barBgBlendMode = "BLEND",
} }
self.presets["RivetBar"] = { self.presets["RivetBar"] = {
@ -454,6 +482,8 @@ function IceCore.prototype:LoadPresets()
barHeight = 220, barHeight = 220,
barProportion = 0.15, barProportion = 0.15,
barSpace = 3, barSpace = 3,
barBlendMode = "BLEND",
barBgBlendMode = "BLEND",
} }
self.presets["RivetBar2"] = { self.presets["RivetBar2"] = {
@ -462,6 +492,8 @@ function IceCore.prototype:LoadPresets()
barHeight = 220, barHeight = 220,
barProportion = 0.15, barProportion = 0.15,
barSpace = 3, barSpace = 3,
barBlendMode = "BLEND",
barBgBlendMode = "BLEND",
} }
end end

View File

@ -269,7 +269,7 @@ IceHUD.options =
end, end,
validate = SML:List('font'), validate = SML:List('font'),
}, },
barSettings = { barSettings = {
type = 'group', type = 'group',
name = 'Bar Settings', name = 'Bar Settings',
@ -289,15 +289,15 @@ IceHUD.options =
validate = { "Bar", "HiBar", "RoundBar", "ColorBar", "RivetBar", "RivetBar2" }, validate = { "Bar", "HiBar", "RoundBar", "ColorBar", "RivetBar", "RivetBar2" },
order = 9 order = 9
}, },
headerBarAdvancedBlank = { type = 'header', name = " ", order = 10 }, headerBarAdvancedBlank = { type = 'header', name = " ", order = 10 },
headerBarAdvanced = { headerBarAdvanced = {
type = 'header', type = 'header',
name = "Advanced Bar Settings", name = "Advanced Bar Settings",
order = 10 order = 10
}, },
barTexture = { barTexture = {
type = 'text', type = 'text',
name = 'Bar Texture', name = 'Bar Texture',
@ -311,7 +311,7 @@ IceHUD.options =
validate = { "Bar", "HiBar", "RoundBar", "ColorBar", "RivetBar", "RivetBar2" }, validate = { "Bar", "HiBar", "RoundBar", "ColorBar", "RivetBar", "RivetBar2" },
order = 11 order = 11
}, },
barWidth = { barWidth = {
type = 'range', type = 'range',
name = 'Bar Width', name = 'Bar Width',
@ -327,7 +327,7 @@ IceHUD.options =
step = 1, step = 1,
order = 12 order = 12
}, },
barHeight = { barHeight = {
type = 'range', type = 'range',
name = 'Bar Height', name = 'Bar Height',
@ -343,7 +343,7 @@ IceHUD.options =
step = 1, step = 1,
order = 13 order = 13
}, },
barProportion = { barProportion = {
type = 'range', type = 'range',
name = 'Bar Proportion', name = 'Bar Proportion',
@ -360,7 +360,7 @@ IceHUD.options =
isPercent = true, isPercent = true,
order = 14 order = 14
}, },
barSpace = { barSpace = {
type = 'range', type = 'range',
name = 'Bar Space', name = 'Bar Space',
@ -376,10 +376,38 @@ IceHUD.options =
step = 1, step = 1,
order = 15 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 = { modules = {
type='group', type='group',
desc = 'Module configuration options', desc = 'Module configuration options',