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

added themes support for party modes

Browse Source
This commit is contained in:
Alexander Eckart committed 2013-01-03 14:12:02 +01:00
1 parent 1c49c4aaaf
commit 8c5f4bf7c9
88 files changed
+1187 -304
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VocaluxeLib/Menu/CBackground.cs
+5 -5
View File
@@ -131,13 +131,13 @@ namespace Vocaluxe.Menu
public void Resume()
{
if (_Theme.Type == EBackgroundTypes.Video && _Theme.VideoName != String.Empty && _Base.Config.GetVideoBackgrounds() == EOffOn.TR_CONFIG_ON)
_Base.Theme.SkinVideoResume(_Theme.VideoName);
_Base.Theme.SkinVideoResume(_Theme.VideoName, _PartyModeID);
}
public void Pause()
{
if (_Theme.VideoName != String.Empty)
_Base.Theme.SkinVideoPause(_Theme.VideoName);
_Base.Theme.SkinVideoPause(_Theme.VideoName, _PartyModeID);
}
public bool Draw()
@@ -175,7 +175,7 @@ namespace Vocaluxe.Menu
public void LoadTextures()
{
if (_Theme.ColorName != String.Empty)
Color = _Base.Theme.GetColor(_Theme.ColorName);
Color = _Base.Theme.GetColor(_Theme.ColorName, _PartyModeID);
}
public void ReloadTextures()
@@ -195,7 +195,7 @@ namespace Vocaluxe.Menu
private bool DrawTexture()
{
STexture Texture = _Base.Theme.GetSkinTexture(_Theme.TextureName);
STexture Texture = _Base.Theme.GetSkinTexture(_Theme.TextureName, _PartyModeID);
if (Texture.height > 0)
{
RectangleF bounds = new RectangleF(0f, 0f, _Base.Settings.GetRenderW(), _Base.Settings.GetRenderH());
@@ -210,7 +210,7 @@ namespace Vocaluxe.Menu
private bool DrawVideo()
{
STexture VideoTexture = _Base.Theme.GetSkinVideoTexture(_Theme.VideoName);
STexture VideoTexture = _Base.Theme.GetSkinVideoTexture(_Theme.VideoName, _PartyModeID);
if (VideoTexture.height > 0)
{
RectangleF bounds = new RectangleF(0f, 0f, _Base.Settings.GetRenderW(), _Base.Settings.GetRenderH());
VocaluxeLib/Menu/CButton.cs
+5 -5
View File
@@ -312,7 +312,7 @@ namespace Vocaluxe.Menu
if (Texture.index != -1)
texture = Texture;
else
texture = _Base.Theme.GetSkinTexture(_Theme.TextureName);
texture = _Base.Theme.GetSkinTexture(_Theme.TextureName, _PartyModeID);
_Base.Drawing.DrawTexture(texture, Rect, Color);
@@ -329,7 +329,7 @@ namespace Vocaluxe.Menu
if (Texture.index != -1)
texture = Texture;
else
texture = _Base.Theme.GetSkinTexture(_Theme.STextureName);
texture = _Base.Theme.GetSkinTexture(_Theme.STextureName, _PartyModeID);
_Base.Drawing.DrawTexture(texture, Rect, SColor);
@@ -346,7 +346,7 @@ namespace Vocaluxe.Menu
if (STexture.index != -1)
texture = STexture;
else
texture = _Base.Theme.GetSkinTexture(_Theme.STextureName);
texture = _Base.Theme.GetSkinTexture(_Theme.STextureName, _PartyModeID);
_Base.Drawing.DrawTexture(texture, Rect, SColor);
@@ -375,10 +375,10 @@ namespace Vocaluxe.Menu
Text.LoadTextures();
if (_Theme.ColorName != String.Empty)
Color = _Base.Theme.GetColor(_Theme.ColorName);
Color = _Base.Theme.GetColor(_Theme.ColorName, _PartyModeID);
if (_Theme.SColorName != String.Empty)
SColor = _Base.Theme.GetColor(_Theme.SColorName);
SColor = _Base.Theme.GetColor(_Theme.SColorName, _PartyModeID);
}
public void ReloadTextures()
VocaluxeLib/Menu/CEqualizer.cs
+2 -2
View File
@@ -277,10 +277,10 @@ namespace Vocaluxe.Menu
public void LoadTextures()
{
if (_Theme.ColorName != String.Empty)
Color = _Base.Theme.GetColor(_Theme.ColorName);
Color = _Base.Theme.GetColor(_Theme.ColorName, _PartyModeID);
if (_Theme.MaxColorName != String.Empty)
MaxColor = _Base.Theme.GetColor(_Theme.MaxColorName);
MaxColor = _Base.Theme.GetColor(_Theme.MaxColorName, _PartyModeID);
}
public void ReloadTextures()
VocaluxeLib/Menu/CLyric.cs
+2 -2
View File
@@ -551,10 +551,10 @@ namespace Vocaluxe.Menu
public void LoadTextures()
{
if (_Theme.ColorName != String.Empty)
Color = _Base.Theme.GetColor(_Theme.ColorName);
Color = _Base.Theme.GetColor(_Theme.ColorName, _PartyModeID);
if (_Theme.SColorName != String.Empty)
ColorProcessed = _Base.Theme.GetColor(_Theme.SColorName);
ColorProcessed = _Base.Theme.GetColor(_Theme.SColorName, _PartyModeID);
}
public void ReloadTextures()
VocaluxeLib/Menu/CMenu.cs
+1 -1
View File
@@ -202,7 +202,7 @@ namespace Vocaluxe.Menu
if (loaded)
VersionCheck = CheckVersion(_ScreenVersion, navigator);
int SkinIndex = _Base.Theme.GetSkinIndex();
int SkinIndex = _Base.Theme.GetSkinIndex(_PartyModeID);
if (loaded && VersionCheck && SkinIndex != -1)
{
VocaluxeLib/Menu/CNameSelection.cs
+4 -4
View File
@@ -477,14 +477,14 @@ namespace Vocaluxe.Menu
public void LoadTextures()
{
_TextureEmptyTile = _Base.Theme.GetSkinTexture(_Theme.TextureEmptyTileName);
_TextureTileSelected = _Base.Theme.GetSkinTexture(_Theme.TextureTileSelectedName);
_TextureEmptyTile = _Base.Theme.GetSkinTexture(_Theme.TextureEmptyTileName, _PartyModeID);
_TextureTileSelected = _Base.Theme.GetSkinTexture(_Theme.TextureTileSelectedName, _PartyModeID);
if (_Theme.ColorEmptyTileName != String.Empty)
ColorEmptyTile = _Base.Theme.GetColor(_Theme.ColorEmptyTileName);
ColorEmptyTile = _Base.Theme.GetColor(_Theme.ColorEmptyTileName, _PartyModeID);
if (_Theme.NameColorName != String.Empty)
_Theme.NameColor = _Base.Theme.GetColor(_Theme.NameColorName);
_Theme.NameColor = _Base.Theme.GetColor(_Theme.NameColorName, _PartyModeID);
}
public void ReloadTextures()
VocaluxeLib/Menu/CParticle.cs
+3 -3
View File
@@ -292,7 +292,7 @@ namespace Vocaluxe.Menu
public void Draw()
{
if (_TextureName != String.Empty)
_Base.Drawing.DrawTexture(_Base.Theme.GetSkinTexture(_TextureName), _Rect, new SColorF(_Color.R, _Color.G, _Color.B, _Color.A * Alpha2 * _Alpha));
_Base.Drawing.DrawTexture(_Base.Theme.GetSkinTexture(_TextureName, _PartyModeID), _Rect, new SColorF(_Color.R, _Color.G, _Color.B, _Color.A * Alpha2 * _Alpha));
else
_Base.Drawing.DrawTexture(_Texture, _Rect, new SColorF(_Color.R, _Color.G, _Color.B, _Color.A * Alpha2 * _Alpha));
}
@@ -620,9 +620,9 @@ namespace Vocaluxe.Menu
public void LoadTextures()
{
if (_Theme.ColorName != String.Empty)
Color = _Base.Theme.GetColor(_Theme.ColorName);
Color = _Base.Theme.GetColor(_Theme.ColorName, _PartyModeID);
if(_Theme.TextureName != String.Empty)
Texture = _Base.Theme.GetSkinTexture(_Theme.TextureName);
Texture = _Base.Theme.GetSkinTexture(_Theme.TextureName, _PartyModeID);
}
public void ReloadTextures()
VocaluxeLib/Menu/CPlaylist.cs
+5 -5
View File
@@ -435,12 +435,12 @@ namespace Vocaluxe.Menu
{
if (i == CurrentPlaylistElement && _Selected)
{
PlaylistElements[i].Background.Texture = _Base.Theme.GetSkinTexture(_Theme.STextureBackgroundName);
PlaylistElements[i].Background.Texture = _Base.Theme.GetSkinTexture(_Theme.STextureBackgroundName, _PartyModeID);
PlaylistElements[i].Background.Color = BackgroundSColor;
}
else
{
PlaylistElements[i].Background.Texture = _Base.Theme.GetSkinTexture(_Theme.TextureBackgroundName);
PlaylistElements[i].Background.Texture = _Base.Theme.GetSkinTexture(_Theme.TextureBackgroundName, _PartyModeID);
PlaylistElements[i].Background.Color = BackgroundColor;
}
}
@@ -474,10 +474,10 @@ namespace Vocaluxe.Menu
public void LoadTextures()
{
if (_Theme.ColorBackgroundName != String.Empty)
BackgroundColor = _Base.Theme.GetColor(_Theme.ColorBackgroundName);
BackgroundColor = _Base.Theme.GetColor(_Theme.ColorBackgroundName, _PartyModeID);
if (_Theme.SColorBackgroundName != String.Empty)
BackgroundSColor = _Base.Theme.GetColor(_Theme.SColorBackgroundName);
BackgroundSColor = _Base.Theme.GetColor(_Theme.SColorBackgroundName, _PartyModeID);
_Theme.Text1.LoadTextures();
_Theme.ButtonPlaylistClose.LoadTextures();
@@ -982,7 +982,7 @@ namespace Vocaluxe.Menu
ChangeOrderElement.SelectSlide.RectArrowRight.Z = _Base.Settings.GetZNear();
ChangeOrderElement.Text1.Z = _Base.Settings.GetZNear();
ChangeOrderElement.Background.Texture = _Base.Theme.GetSkinTexture(_Theme.TextureBackgroundName);
ChangeOrderElement.Background.Texture = _Base.Theme.GetSkinTexture(_Theme.TextureBackgroundName, _PartyModeID);
ChangeOrderElement.Background.Color = BackgroundColor;
OldMousePosX = MouseEvent.X;
VocaluxeLib/Menu/CScreenSetting.cs
+2 -2
View File
@@ -129,12 +129,12 @@ namespace Vocaluxe.Menu
private STexture GetTextureValue(string _string)
{
return _Base.Theme.GetSkinTexture(_string);
return _Base.Theme.GetSkinTexture(_string, _PartyModeID);
}
private SColorF GetColorValue(string _string)
{
return _Base.Theme.GetColor(_string);
return _Base.Theme.GetColor(_string, _PartyModeID);
}
#endregion Private
VocaluxeLib/Menu/CSelectSlide.cs
+14 -14
View File
@@ -720,15 +720,15 @@ namespace Vocaluxe.Menu
if (!Visible && _Base.Settings.GetGameState() != EGameState.EditTheme)
return;
STexture Texture = _Base.Theme.GetSkinTexture(_Theme.TextureName);
STexture TextureArrowLeft = _Base.Theme.GetSkinTexture(_Theme.TextureArrowLeftName);
STexture TextureArrowRight = _Base.Theme.GetSkinTexture(_Theme.TextureArrowRightName);
STexture Texture = _Base.Theme.GetSkinTexture(_Theme.TextureName, _PartyModeID);
STexture TextureArrowLeft = _Base.Theme.GetSkinTexture(_Theme.TextureArrowLeftName, _PartyModeID);
STexture TextureArrowRight = _Base.Theme.GetSkinTexture(_Theme.TextureArrowRightName, _PartyModeID);
STexture STexture = _Base.Theme.GetSkinTexture(_Theme.STextureName);
STexture STextureArrowLeft = _Base.Theme.GetSkinTexture(_Theme.STextureArrowLeftName);
STexture STextureArrowRight = _Base.Theme.GetSkinTexture(_Theme.STextureArrowRightName);
STexture STexture = _Base.Theme.GetSkinTexture(_Theme.STextureName, _PartyModeID);
STexture STextureArrowLeft = _Base.Theme.GetSkinTexture(_Theme.STextureArrowLeftName, _PartyModeID);
STexture STextureArrowRight = _Base.Theme.GetSkinTexture(_Theme.STextureArrowRightName, _PartyModeID);
STexture HTexture = _Base.Theme.GetSkinTexture(_Theme.HTextureName);
STexture HTexture = _Base.Theme.GetSkinTexture(_Theme.HTextureName, _PartyModeID);
if (Selected)
{
@@ -822,25 +822,25 @@ namespace Vocaluxe.Menu
public void LoadTextures()
{
if (_Theme.ColorName != String.Empty)
Color = _Base.Theme.GetColor(_Theme.ColorName);
Color = _Base.Theme.GetColor(_Theme.ColorName, _PartyModeID);
if (_Theme.SColorName != String.Empty)
SColor = _Base.Theme.GetColor(_Theme.SColorName);
SColor = _Base.Theme.GetColor(_Theme.SColorName, _PartyModeID);
if (_Theme.HColorName != String.Empty)
HColor = _Base.Theme.GetColor(_Theme.HColorName);
HColor = _Base.Theme.GetColor(_Theme.HColorName, _PartyModeID);
if (_Theme.ArrowColorName != String.Empty)
ColorArrow = _Base.Theme.GetColor(_Theme.ArrowColorName);
ColorArrow = _Base.Theme.GetColor(_Theme.ArrowColorName, _PartyModeID);
if (_Theme.SArrowColorName != String.Empty)
SColorArrow = _Base.Theme.GetColor(_Theme.SArrowColorName);
SColorArrow = _Base.Theme.GetColor(_Theme.SArrowColorName, _PartyModeID);
if (_Theme.TextColorName != String.Empty)
TextColor = _Base.Theme.GetColor(_Theme.TextColorName);
TextColor = _Base.Theme.GetColor(_Theme.TextColorName, _PartyModeID);
if (_Theme.SColorName != String.Empty)
STextColor = _Base.Theme.GetColor(_Theme.STextColorName);
STextColor = _Base.Theme.GetColor(_Theme.STextColorName, _PartyModeID);
}
public void ReloadTextures()
VocaluxeLib/Menu/CStatic.cs
+3 -3
View File
@@ -35,7 +35,7 @@ namespace Vocaluxe.Menu
if (_Texture.index != -1)
return _Texture;
else
return _Base.Theme.GetSkinTexture(_Theme.TextureName);
return _Base.Theme.GetSkinTexture(_Theme.TextureName, _PartyModeID);
}
set { _Texture = value; }
@@ -247,7 +247,7 @@ namespace Vocaluxe.Menu
if (_Texture.index != -1)
texture = _Texture;
else
texture = _Base.Theme.GetSkinTexture(_Theme.TextureName);
texture = _Base.Theme.GetSkinTexture(_Theme.TextureName, _PartyModeID);
SRectF bounds = new SRectF(
Rect.X - Rect.W * (scale - 1f),
@@ -293,7 +293,7 @@ namespace Vocaluxe.Menu
public void LoadTextures()
{
if (_Theme.ColorName != String.Empty)
Color = _Base.Theme.GetColor(_Theme.ColorName);
Color = _Base.Theme.GetColor(_Theme.ColorName, _PartyModeID);
}
public void ReloadTextures()
VocaluxeLib/Menu/CText.cs
+2 -2
View File
@@ -839,10 +839,10 @@ namespace Vocaluxe.Menu
public void LoadTextures()
{
if (_Theme.ColorName != String.Empty)
Color = _Base.Theme.GetColor(_Theme.ColorName);
Color = _Base.Theme.GetColor(_Theme.ColorName, _PartyModeID);
if (_Theme.SColorName != String.Empty)
SColor = _Base.Theme.GetColor(_Theme.SColorName);
SColor = _Base.Theme.GetColor(_Theme.SColorName, _PartyModeID);
}
public void ReloadTextures()
VocaluxeLib/Menu/IMenu.cs
+7 -7
View File
@@ -105,15 +105,15 @@ namespace Vocaluxe.Menu
public interface ITheme
{
string GetThemeScreensPath();
int GetSkinIndex();
STexture GetSkinTexture(string TextureName);
STexture GetSkinVideoTexture(string VideoName);
string GetThemeScreensPath(int PartyModeID);
int GetSkinIndex(int PartyModeID);
STexture GetSkinTexture(string TextureName, int PartyModeID);
STexture GetSkinVideoTexture(string VideoName, int PartyModeID);
void SkinVideoResume(string VideoName);
void SkinVideoPause(string VideoName);
void SkinVideoResume(string VideoName, int PartyModeID);
void SkinVideoPause(string VideoName, int PartyModeID);
SColorF GetColor(string ColorName);
SColorF GetColor(string ColorName, int PartyModeID);
bool GetColor(string ColorName, int SkinIndex, ref SColorF Color);
SColorF GetPlayerColor(int PlayerNr);
VocaluxeLib/Menu/SingNotes/CSingNotes.cs
+8 -8
View File
@@ -523,9 +523,9 @@ namespace Vocaluxe.Menu.SingNotes
Rect.Z
);
STexture NoteBegin = _Base.Theme.GetSkinTexture(_Theme.SkinLeftName);
STexture NoteMiddle = _Base.Theme.GetSkinTexture(_Theme.SkinMiddleName);
STexture NoteEnd = _Base.Theme.GetSkinTexture(_Theme.SkinRightName);
STexture NoteBegin = _Base.Theme.GetSkinTexture(_Theme.SkinLeftName, _PartyModeID);
STexture NoteMiddle = _Base.Theme.GetSkinTexture(_Theme.SkinMiddleName, _PartyModeID);
STexture NoteEnd = _Base.Theme.GetSkinTexture(_Theme.SkinRightName, _PartyModeID);
float dx = NoteBegin.width * r.H / NoteBegin.height;
if (2 * dx > r.W)
@@ -565,9 +565,9 @@ namespace Vocaluxe.Menu.SingNotes
Rect.Z
);
STexture NoteBackgroundBegin = _Base.Theme.GetSkinTexture(_Theme.SkinBackgroundLeftName);
STexture NoteBackgroundMiddle = _Base.Theme.GetSkinTexture(_Theme.SkinBackgroundMiddleName);
STexture NoteBackgroundEnd = _Base.Theme.GetSkinTexture(_Theme.SkinBackgroundRightName);
STexture NoteBackgroundBegin = _Base.Theme.GetSkinTexture(_Theme.SkinBackgroundLeftName, _PartyModeID);
STexture NoteBackgroundMiddle = _Base.Theme.GetSkinTexture(_Theme.SkinBackgroundMiddleName, _PartyModeID);
STexture NoteBackgroundEnd = _Base.Theme.GetSkinTexture(_Theme.SkinBackgroundRightName, _PartyModeID);
float dx = NoteBackgroundBegin.width * r.H / NoteBackgroundBegin.height;
if (2 * dx > r.W)
@@ -670,7 +670,7 @@ namespace Vocaluxe.Menu.SingNotes
Rect.Z
);
STexture NoteBegin = _Base.Theme.GetSkinTexture(_Theme.SkinLeftName);
STexture NoteBegin = _Base.Theme.GetSkinTexture(_Theme.SkinLeftName, _PartyModeID);
float dx = NoteBegin.width * r.H / NoteBegin.height;
if (2 * dx > r.W)
dx = r.W / 2;
@@ -726,7 +726,7 @@ namespace Vocaluxe.Menu.SingNotes
_PlayerNotes[n].Color.B,
_PlayerNotes[n].Color.A * _PlayerNotes[n].Alpha);
STexture ToneHelper = _Base.Theme.GetSkinTexture(_Theme.SkinToneHelperName);
STexture ToneHelper = _Base.Theme.GetSkinTexture(_Theme.SkinToneHelperName, _PartyModeID);
_Base.Drawing.DrawTexture(ToneHelper, rect, color);
VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
+2 -2
View File
@@ -582,7 +582,7 @@ namespace Vocaluxe.Menu.SongMenu
Init();
if (_Theme.ColorName != String.Empty)
_Color = _Base.Theme.GetColor(_Theme.ColorName);
_Color = _Base.Theme.GetColor(_Theme.ColorName, _PartyModeID);
}
public void ReloadTextures()
@@ -654,7 +654,7 @@ namespace Vocaluxe.Menu.SongMenu
_Base.Sound.Fade(_stream, 100f, 3f);
_streams.Add(_stream);
_actsongstream = _stream;
if (_Base.Songs.GetVisibleSong(_actsong).VideoFileName != String.Empty && _Base.Config.GetVideoPreview() == EOffOn.TR_CONFIG_ON)
{
_video = _Base.Video.Load(Path.Combine(_Base.Songs.GetVisibleSong(_actsong).Folder, _Base.Songs.GetVisibleSong(_actsong).VideoFileName));
VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
+6 -6
View File
@@ -69,8 +69,8 @@ namespace Vocaluxe.Menu.SongMenu
_TileW = (int)((_Theme.songMenuTileBoard.TileRect.W - _SpaceW * (_NumW - 1)) / _NumW);
_TileH = (int)((_Theme.songMenuTileBoard.TileRect.H - _SpaceH * (_NumH - 1)) / _NumH);
_CoverTexture = _Base.Theme.GetSkinTexture(_Theme.CoverBackgroundName);
_CoverBigTexture = _Base.Theme.GetSkinTexture(_Theme.CoverBigBackgroundName);
_CoverTexture = _Base.Theme.GetSkinTexture(_Theme.CoverBackgroundName, _PartyModeID);
_CoverBigTexture = _Base.Theme.GetSkinTexture(_Theme.CoverBigBackgroundName, _PartyModeID);
_Tiles = new List<CStatic>();
for (int i = 0; i < _NumH; i++)
@@ -781,8 +781,8 @@ namespace Vocaluxe.Menu.SongMenu
_TileW = (int)((_Theme.songMenuTileBoard.TileRectSmall.W - _SpaceW * (_NumW - 1)) / _NumW);
_TileH = (int)((_Theme.songMenuTileBoard.TileRectSmall.H - _SpaceH * (_NumH - 1)) / _NumH);
_CoverTexture = _Base.Theme.GetSkinTexture(_Theme.CoverBackgroundName);
_CoverBigTexture = _Base.Theme.GetSkinTexture(_Theme.CoverBigBackgroundName);
_CoverTexture = _Base.Theme.GetSkinTexture(_Theme.CoverBackgroundName, _PartyModeID);
_CoverBigTexture = _Base.Theme.GetSkinTexture(_Theme.CoverBigBackgroundName, _PartyModeID);
_Tiles = new List<CStatic>();
for (int i = 0; i < _NumH; i++)
@@ -807,8 +807,8 @@ namespace Vocaluxe.Menu.SongMenu
_TileW = (int)((_Theme.songMenuTileBoard.TileRect.W - _SpaceW * (_NumW - 1)) / _NumW);
_TileH = (int)((_Theme.songMenuTileBoard.TileRect.H - _SpaceH * (_NumH - 1)) / _NumH);
_CoverTexture = _Base.Theme.GetSkinTexture(_Theme.CoverBackgroundName);
_CoverBigTexture = _Base.Theme.GetSkinTexture(_Theme.CoverBigBackgroundName);
_CoverTexture = _Base.Theme.GetSkinTexture(_Theme.CoverBackgroundName, _PartyModeID);
_CoverBigTexture = _Base.Theme.GetSkinTexture(_Theme.CoverBigBackgroundName, _PartyModeID);
_Tiles = new List<CStatic>();
for (int i = 0; i < _NumH; i++)