Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renaming for namesheme

Browse Source
This commit is contained in:
Flamefire committed 2013-04-15 19:10:38 +02:00
1 parent 1336a6fa36
commit 67da90427b
131 files changed
+11905 -11812
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VocaluxeLib/Menu/CStatic.cs
+17 -17
View File
@@ -28,7 +28,7 @@ namespace VocaluxeLib.Menu
{
get
{
if (_Texture.index != -1)
if (_Texture.Index != -1)
return _Texture;
else
return CBase.Theme.GetSkinTexture(_Theme.TextureName, _PartyModeID);
@@ -51,9 +51,9 @@ namespace VocaluxeLib.Menu
public EAspect Aspect = EAspect.Stretch;
public CStatic(int PartyModeID)
public CStatic(int partyModeID)
{
_PartyModeID = PartyModeID;
_PartyModeID = partyModeID;
_Theme = new SThemeStatic();
_ThemeLoaded = false;
@@ -87,9 +87,9 @@ namespace VocaluxeLib.Menu
Visible = s.Visible;
}
public CStatic(int PartyModeID, STexture texture, SColorF color, SRectF rect)
public CStatic(int partyModeID, STexture texture, SColorF color, SRectF rect)
{
_PartyModeID = PartyModeID;
_PartyModeID = partyModeID;
_Theme = new SThemeStatic();
_ThemeLoaded = false;
@@ -105,11 +105,11 @@ namespace VocaluxeLib.Menu
Visible = true;
}
public CStatic(int PartyModeID, string TextureSkinName, SColorF color, SRectF rect)
public CStatic(int partyModeID, string textureSkinName, SColorF color, SRectF rect)
{
_PartyModeID = PartyModeID;
_PartyModeID = partyModeID;
_Theme = new SThemeStatic();
_Theme.TextureName = TextureSkinName;
_Theme.TextureName = textureSkinName;
_ThemeLoaded = false;
_Texture = new STexture(-1);
@@ -124,9 +124,9 @@ namespace VocaluxeLib.Menu
Visible = true;
}
public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xmlReader, int SkinIndex)
public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader, int skinIndex)
{
string item = XmlPath + "/" + ElementName;
string item = xmlPath + "/" + elementName;
_ThemeLoaded = true;
_ThemeLoaded &= xmlReader.GetValue(item + "/Skin", ref _Theme.TextureName, String.Empty);
@@ -138,7 +138,7 @@ namespace VocaluxeLib.Menu
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref Rect.H);
if (xmlReader.GetValue(item + "/Color", ref _Theme.ColorName, String.Empty))
_ThemeLoaded &= CBase.Theme.GetColor(_Theme.ColorName, SkinIndex, out Color);
_ThemeLoaded &= CBase.Theme.GetColor(_Theme.ColorName, skinIndex, out Color);
else
{
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/R", ref Color.R);
@@ -158,7 +158,7 @@ namespace VocaluxeLib.Menu
if (_ThemeLoaded)
{
_Theme.Name = ElementName;
_Theme.Name = elementName;
LoadTextures();
}
return _ThemeLoaded;
@@ -229,10 +229,10 @@ namespace VocaluxeLib.Menu
Draw(1f, Rect.Z, Aspect, true);
}
public void Draw(float scale, float z, EAspect aspect, bool ForceDraw)
public void Draw(float scale, float z, EAspect aspect, bool forceDraw)
{
STexture texture;
if (_Texture.index != -1)
if (_Texture.Index != -1)
texture = _Texture;
else
texture = CBase.Theme.GetSkinTexture(_Theme.TextureName, _PartyModeID);
@@ -249,8 +249,8 @@ namespace VocaluxeLib.Menu
if (aspect != EAspect.Stretch)
{
RectangleF bounds2 = new RectangleF(bounds.X, bounds.Y, bounds.W, bounds.H);
RectangleF rect2 = new RectangleF(0f, 0f, texture.width, texture.height);
CHelper.SetRect(bounds2, ref rect2, texture.width / texture.height, aspect);
RectangleF rect2 = new RectangleF(0f, 0f, texture.Width, texture.Height);
CHelper.SetRect(bounds2, ref rect2, texture.Width / texture.Height, aspect);
rect.X = rect2.X;
rect.Y = rect2.Y;
@@ -259,7 +259,7 @@ namespace VocaluxeLib.Menu
}
SColorF color = new SColorF(Color.R, Color.G, Color.B, Color.A * Alpha);
if (Visible || ForceDraw || (CBase.Settings.GetGameState() == EGameState.EditTheme))
if (Visible || forceDraw || (CBase.Settings.GetGameState() == EGameState.EditTheme))
{
CBase.Drawing.DrawTexture(texture, rect, color, bounds);
if (Reflection)