added partymodeID to all elements, fixed bug in buttons (text was drawn twice)
This commit is contained in:
1 parent
632206c317
commit
9257e6f134
32 files changed
+725
-136
No files matched your search
@@ -12,5 +12,7 @@
|
|||||||
</Info>
|
</Info>
|
||||||
<PartyScreens>
|
<PartyScreens>
|
||||||
<ScreenFile>PartyScreenChallengeMain</ScreenFile>
|
<ScreenFile>PartyScreenChallengeMain</ScreenFile>
|
||||||
|
<ScreenFile>PartyScreenChallengeConfig</ScreenFile>
|
||||||
|
<ScreenFile>PartyScreenChallengeNames</ScreenFile>
|
||||||
</PartyScreens>
|
</PartyScreens>
|
||||||
</root>
|
</root>
|
||||||
@@ -22,7 +22,7 @@ namespace Vocaluxe.PartyModes
|
|||||||
public override CMenuParty GetNextPartyScreen()
|
public override CMenuParty GetNextPartyScreen()
|
||||||
{
|
{
|
||||||
CMenuParty Screen = null;
|
CMenuParty Screen = null;
|
||||||
_Screens.TryGetValue("PartyScreenChallengeMain", out Screen);
|
_Screens.TryGetValue("PartyScreenChallengeConfig", out Screen);
|
||||||
return Screen;
|
return Screen;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,95 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
using System.Windows.Forms;
|
||||||
|
|
||||||
|
using Vocaluxe.Menu;
|
||||||
|
|
||||||
|
namespace Vocaluxe.PartyModes
|
||||||
|
{
|
||||||
|
public class PartyScreenChallengeConfig : CMenuParty
|
||||||
|
{
|
||||||
|
// Version number for theme files. Increment it, if you've changed something on the theme files!
|
||||||
|
const int ScreenVersion = 1;
|
||||||
|
|
||||||
|
const string ButtonNext = "ButtonNext";
|
||||||
|
const string ButtonBack = "ButtonBack";
|
||||||
|
|
||||||
|
public PartyScreenChallengeConfig()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void Init()
|
||||||
|
{
|
||||||
|
base.Init();
|
||||||
|
|
||||||
|
_ThemeName = "PartyScreenChallengeConfig";
|
||||||
|
_ThemeButtons = new string[] { ButtonNext, ButtonBack };
|
||||||
|
_ScreenVersion = ScreenVersion;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void LoadTheme(string XmlPath)
|
||||||
|
{
|
||||||
|
base.LoadTheme(XmlPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool HandleInput(KeyEvent KeyEvent)
|
||||||
|
{
|
||||||
|
base.HandleInput(KeyEvent);
|
||||||
|
|
||||||
|
if (KeyEvent.KeyPressed)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
switch (KeyEvent.Key)
|
||||||
|
{
|
||||||
|
case Keys.Back:
|
||||||
|
case Keys.Escape:
|
||||||
|
FadeTo(EScreens.ScreenParty);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool HandleMouse(MouseEvent MouseEvent)
|
||||||
|
{
|
||||||
|
base.HandleMouse(MouseEvent);
|
||||||
|
|
||||||
|
if (MouseEvent.LB && IsMouseOver(MouseEvent))
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
if (MouseEvent.RB)
|
||||||
|
{
|
||||||
|
FadeTo(EScreens.ScreenParty);
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void OnShow()
|
||||||
|
{
|
||||||
|
base.OnShow();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool UpdateGame()
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool Draw()
|
||||||
|
{
|
||||||
|
base.Draw();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void OnClose()
|
||||||
|
{
|
||||||
|
base.OnClose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -29,22 +29,6 @@ namespace Vocaluxe.PartyModes
|
|||||||
base.LoadTheme(XmlPath);
|
base.LoadTheme(XmlPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void ReloadTheme()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void ReloadTextures()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void SaveTheme()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void UnloadTextures()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool HandleInput(KeyEvent KeyEvent)
|
public override bool HandleInput(KeyEvent KeyEvent)
|
||||||
{
|
{
|
||||||
base.HandleInput(KeyEvent);
|
base.HandleInput(KeyEvent);
|
||||||
|
|||||||
@@ -0,0 +1,91 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
using System.Windows.Forms;
|
||||||
|
|
||||||
|
using Vocaluxe.Menu;
|
||||||
|
|
||||||
|
namespace Vocaluxe.PartyModes
|
||||||
|
{
|
||||||
|
public class PartyScreenChallengeNames : CMenuParty
|
||||||
|
{
|
||||||
|
// Version number for theme files. Increment it, if you've changed something on the theme files!
|
||||||
|
const int ScreenVersion = 1;
|
||||||
|
|
||||||
|
public PartyScreenChallengeNames()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void Init()
|
||||||
|
{
|
||||||
|
base.Init();
|
||||||
|
|
||||||
|
_ThemeName = "PartyScreenChallengeNames";
|
||||||
|
_ScreenVersion = ScreenVersion;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void LoadTheme(string XmlPath)
|
||||||
|
{
|
||||||
|
base.LoadTheme(XmlPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool HandleInput(KeyEvent KeyEvent)
|
||||||
|
{
|
||||||
|
base.HandleInput(KeyEvent);
|
||||||
|
|
||||||
|
if (KeyEvent.KeyPressed)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
switch (KeyEvent.Key)
|
||||||
|
{
|
||||||
|
case Keys.Back:
|
||||||
|
case Keys.Escape:
|
||||||
|
FadeTo(EScreens.ScreenParty);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool HandleMouse(MouseEvent MouseEvent)
|
||||||
|
{
|
||||||
|
base.HandleMouse(MouseEvent);
|
||||||
|
|
||||||
|
if (MouseEvent.LB && IsMouseOver(MouseEvent))
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
if (MouseEvent.RB)
|
||||||
|
{
|
||||||
|
FadeTo(EScreens.ScreenParty);
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void OnShow()
|
||||||
|
{
|
||||||
|
base.OnShow();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool UpdateGame()
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool Draw()
|
||||||
|
{
|
||||||
|
base.Draw();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void OnClose()
|
||||||
|
{
|
||||||
|
base.OnClose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,6 +7,13 @@
|
|||||||
<!--General-->
|
<!--General-->
|
||||||
<TR_PARTYMODE_NAME>Challenge Modus</TR_PARTYMODE_NAME>
|
<TR_PARTYMODE_NAME>Challenge Modus</TR_PARTYMODE_NAME>
|
||||||
<TR_PARTYMODE_DESCRIPTION>Spiele mit bis zu X Spielern einem Wettkampfmodus</TR_PARTYMODE_DESCRIPTION>
|
<TR_PARTYMODE_DESCRIPTION>Spiele mit bis zu X Spielern einem Wettkampfmodus</TR_PARTYMODE_DESCRIPTION>
|
||||||
|
<TR_BUTTON_NEXT>Weiter</TR_BUTTON_NEXT>
|
||||||
|
<TR_BUTTON_BACK>Zurück</TR_BUTTON_BACK>
|
||||||
|
<TR_BUTTON_START>Start</TR_BUTTON_START>
|
||||||
|
<!--ScreenConfig-->
|
||||||
|
<TR_SCREENCONFIG_TITLE>Challenge Modus: Einstellungen</TR_SCREENCONFIG_TITLE>
|
||||||
|
<!--ScreenNames-->
|
||||||
|
<TR_SCREENNAMES_TITLE>Challenge Modus: Spielerwahl</TR_SCREENNAMES_TITLE>
|
||||||
<!--ScreenMain-->
|
<!--ScreenMain-->
|
||||||
<TR_SCREENMAIN_TITLE>Challenge Modus: Übersicht</TR_SCREENMAIN_TITLE>
|
<TR_SCREENMAIN_TITLE>Challenge Modus: Übersicht</TR_SCREENMAIN_TITLE>
|
||||||
</Texts>
|
</Texts>
|
||||||
|
|||||||
@@ -6,7 +6,14 @@
|
|||||||
<Texts>
|
<Texts>
|
||||||
<!--General-->
|
<!--General-->
|
||||||
<TR_PARTYMODE_NAME>Challenge Mode</TR_PARTYMODE_NAME>
|
<TR_PARTYMODE_NAME>Challenge Mode</TR_PARTYMODE_NAME>
|
||||||
<TR_PARTYMODE_DESCRIPTION>Challenge with zp to X Players</TR_PARTYMODE_DESCRIPTION>
|
<TR_PARTYMODE_DESCRIPTION>Challenge with up to X Players</TR_PARTYMODE_DESCRIPTION>
|
||||||
|
<TR_BUTTON_NEXT>Next</TR_BUTTON_NEXT>
|
||||||
|
<TR_BUTTON_BACK>Back</TR_BUTTON_BACK>
|
||||||
|
<TR_BUTTON_START>Start</TR_BUTTON_START>
|
||||||
|
<!--ScreenConfig-->
|
||||||
|
<TR_SCREENCONFIG_TITLE>Challenge Mode: Configuration</TR_SCREENCONFIG_TITLE>
|
||||||
|
<!--ScreenNames-->
|
||||||
|
<TR_SCREENNAMES_TITLE>Challenge Mode: Choose Player</TR_SCREENNAMES_TITLE>
|
||||||
<!--ScreenMain-->
|
<!--ScreenMain-->
|
||||||
<TR_SCREENMAIN_TITLE>Challenge Mode: Overview</TR_SCREENMAIN_TITLE>
|
<TR_SCREENMAIN_TITLE>Challenge Mode: Overview</TR_SCREENMAIN_TITLE>
|
||||||
</Texts>
|
</Texts>
|
||||||
|
|||||||
@@ -6,8 +6,15 @@
|
|||||||
<Texts>
|
<Texts>
|
||||||
<!--General-->
|
<!--General-->
|
||||||
<TR_PARTYMODE_NAME>TODO: Challenge Mode</TR_PARTYMODE_NAME>
|
<TR_PARTYMODE_NAME>TODO: Challenge Mode</TR_PARTYMODE_NAME>
|
||||||
<TR_PARTYMODE_DESCRIPTION>TODO: Challenge with zp to X Players</TR_PARTYMODE_DESCRIPTION>
|
<TR_PARTYMODE_DESCRIPTION>TODO: Challenge with up to X Players</TR_PARTYMODE_DESCRIPTION>
|
||||||
|
<TR_BUTTON_NEXT>TODO: Next</TR_BUTTON_NEXT>
|
||||||
|
<TR_BUTTON_BACK>Retour</TR_BUTTON_BACK>
|
||||||
|
<TR_BUTTON_START>Démarrer</TR_BUTTON_START>
|
||||||
|
<!--ScreenConfig-->
|
||||||
|
<TR_SCREENCONFIG_TITLE>TODO: Challenge Mode: Configuration</TR_SCREENCONFIG_TITLE>
|
||||||
|
<!--ScreenNames-->
|
||||||
|
<TR_SCREENNAMES_TITLE>TODO: Challenge Mode: Choose Player</TR_SCREENNAMES_TITLE>
|
||||||
<!--ScreenMain-->
|
<!--ScreenMain-->
|
||||||
<TR_SCREENMAIN_TITLE>Challenge Mode: Overview</TR_SCREENMAIN_TITLE>
|
<TR_SCREENMAIN_TITLE>TODO: Challenge Mode: Overview</TR_SCREENMAIN_TITLE>
|
||||||
</Texts>
|
</Texts>
|
||||||
</root>
|
</root>
|
||||||
@@ -6,8 +6,15 @@
|
|||||||
<Texts>
|
<Texts>
|
||||||
<!--General-->
|
<!--General-->
|
||||||
<TR_PARTYMODE_NAME>TODO: Challenge Mode</TR_PARTYMODE_NAME>
|
<TR_PARTYMODE_NAME>TODO: Challenge Mode</TR_PARTYMODE_NAME>
|
||||||
<TR_PARTYMODE_DESCRIPTION>TODO: Challenge with zp to X Players</TR_PARTYMODE_DESCRIPTION>
|
<TR_PARTYMODE_DESCRIPTION>TODO: Challenge with up to X Players</TR_PARTYMODE_DESCRIPTION>
|
||||||
|
<TR_BUTTON_NEXT>TODO: Next</TR_BUTTON_NEXT>
|
||||||
|
<TR_BUTTON_BACK>Volver</TR_BUTTON_BACK>
|
||||||
|
<TR_BUTTON_START>Comenzar</TR_BUTTON_START>
|
||||||
|
<!--ScreenConfig-->
|
||||||
|
<TR_SCREENCONFIG_TITLE>TODO: Challenge Mode: Configuration</TR_SCREENCONFIG_TITLE>
|
||||||
|
<!--ScreenNames-->
|
||||||
|
<TR_SCREENNAMES_TITLE>TODO: Challenge Mode: Choose Player</TR_SCREENNAMES_TITLE>
|
||||||
<!--ScreenMain-->
|
<!--ScreenMain-->
|
||||||
<TR_SCREENMAIN_TITLE>Challenge Mode: Overview</TR_SCREENMAIN_TITLE>
|
<TR_SCREENMAIN_TITLE>TODO: Challenge Mode: Overview</TR_SCREENMAIN_TITLE>
|
||||||
</Texts>
|
</Texts>
|
||||||
</root>
|
</root>
|
||||||
@@ -0,0 +1,176 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<root>
|
||||||
|
<PartyScreenChallengeConfig>
|
||||||
|
<ScreenVersion>1</ScreenVersion>
|
||||||
|
<Background1>
|
||||||
|
<!--<Type>: Background type: None, Color, Texture, Video-->
|
||||||
|
<Type>Video</Type>
|
||||||
|
<!--<Video>: Background video name-->
|
||||||
|
<Video>BG_Video</Video>
|
||||||
|
<!--<Skin>: Background Texture name-->
|
||||||
|
<Skin>BG_Default</Skin>
|
||||||
|
<!--<Color>: Background color for type "Color" from ColorScheme (high priority)-->
|
||||||
|
<!--or <R>, <G>, <B>, <A> (lower priority)-->
|
||||||
|
<Color>BackgroundColor</Color>
|
||||||
|
</Background1>
|
||||||
|
<Static1>
|
||||||
|
<!--<Skin>: Texture name-->
|
||||||
|
<Skin>Menu</Skin>
|
||||||
|
<!--<X>, <Y>, <Z>, <W>, <H>: Static position, width and height-->
|
||||||
|
<X>40</X>
|
||||||
|
<Y>40</Y>
|
||||||
|
<Z>0,00</Z>
|
||||||
|
<W>1200</W>
|
||||||
|
<H>50</H>
|
||||||
|
<!--<Color>: Static color from ColorScheme (high priority)-->
|
||||||
|
<!--or <R>, <G>, <B>, <A> (lower priority)-->
|
||||||
|
<Color>StaticColor</Color>
|
||||||
|
<!--<Reflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space-->
|
||||||
|
<!-- <Height>: Reflection Height-->
|
||||||
|
</Static1>
|
||||||
|
<Text1>
|
||||||
|
<!--<X>, <Y>: Text position-->
|
||||||
|
<X>640</X>
|
||||||
|
<Y>48</Y>
|
||||||
|
<!--<Z>: Text position-->
|
||||||
|
<Z>0,00</Z>
|
||||||
|
<!--<H>: Text height-->
|
||||||
|
<H>32</H>
|
||||||
|
<!--<MaxW>: Maximum text width (if exists)-->
|
||||||
|
<!--<Color>: Text color from ColorScheme (high priority)-->
|
||||||
|
<!--or <R>, <G>, <B>, <A> (lower priority)-->
|
||||||
|
<Color>StaticColor</Color>
|
||||||
|
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
|
||||||
|
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
|
||||||
|
<SColor>TextSColor</SColor>
|
||||||
|
<!--<Align>: Text align horizontal: Left, Center, Right-->
|
||||||
|
<Align>Center</Align>
|
||||||
|
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
|
||||||
|
<HAlign>Center</HAlign>
|
||||||
|
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
|
||||||
|
<Style>Bold</Style>
|
||||||
|
<!--<Font>: Text font name-->
|
||||||
|
<Font>Outline</Font>
|
||||||
|
<!--<Text>: Nothing or translation tag-->
|
||||||
|
<Text>TR_SCREENCONFIG_TITLE</Text>
|
||||||
|
<!--<Reflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space-->
|
||||||
|
<!-- <Height>: Reflection Height-->
|
||||||
|
</Text1>
|
||||||
|
<ButtonNext>
|
||||||
|
<!--<Skin>: Texture name-->
|
||||||
|
<Skin>Button</Skin>
|
||||||
|
<!--<SkinSelected>: Texture name for selected button-->
|
||||||
|
<SkinSelected>Button</SkinSelected>
|
||||||
|
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
|
||||||
|
<X>985</X>
|
||||||
|
<Y>600</Y>
|
||||||
|
<Z>0,00</Z>
|
||||||
|
<W>150</W>
|
||||||
|
<H>50</H>
|
||||||
|
<!--<Color>: Button color from ColorScheme (high priority)-->
|
||||||
|
<!--or <R>, <G>, <B>, <A> (lower priority)-->
|
||||||
|
<Color>ButtonColor</Color>
|
||||||
|
<!--<SColor>: Selected button color from ColorScheme (high priority)-->
|
||||||
|
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
|
||||||
|
<SColor>ButtonSColor</SColor>
|
||||||
|
<Text>
|
||||||
|
<!--<X>, <Y>: Text position-->
|
||||||
|
<X>75</X>
|
||||||
|
<Y>10</Y>
|
||||||
|
<!--<H>: Text height-->
|
||||||
|
<H>32</H>
|
||||||
|
<!--<MaxW>: Maximum text width (if exists)-->
|
||||||
|
<MaxW>142</MaxW>
|
||||||
|
<!--<Color>: Text color from ColorScheme (high priority)-->
|
||||||
|
<!--or <R>, <G>, <B>, <A> (lower priority)-->
|
||||||
|
<Color>ButtonTextColor</Color>
|
||||||
|
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
|
||||||
|
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
|
||||||
|
<SColor>ButtonTextSColor</SColor>
|
||||||
|
<!--<Align>: Text align horizontal: Left, Center, Right-->
|
||||||
|
<Align>Center</Align>
|
||||||
|
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
|
||||||
|
<HAlign>Center</HAlign>
|
||||||
|
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
|
||||||
|
<Style>Bold</Style>
|
||||||
|
<!--<Font>: Text font name-->
|
||||||
|
<Font>Outline</Font>
|
||||||
|
<!--<Text>: Nothing or translation tag-->
|
||||||
|
<Text>TR_BUTTON_NEXT</Text>
|
||||||
|
</Text>
|
||||||
|
<!--<Reflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space-->
|
||||||
|
<!-- <Height>: Reflection Height-->
|
||||||
|
<Reflection>
|
||||||
|
<Space>10</Space>
|
||||||
|
<Height>26</Height>
|
||||||
|
</Reflection>
|
||||||
|
<!--<SReflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space of selected button-->
|
||||||
|
<!-- <Height>: Reflection Height of selected button-->
|
||||||
|
<SReflection>
|
||||||
|
<Space>10</Space>
|
||||||
|
<Height>26</Height>
|
||||||
|
</SReflection>
|
||||||
|
</ButtonNext>
|
||||||
|
<ButtonBack>
|
||||||
|
<!--<Skin>: Texture name-->
|
||||||
|
<Skin>Button</Skin>
|
||||||
|
<!--<SkinSelected>: Texture name for selected button-->
|
||||||
|
<SkinSelected>Button</SkinSelected>
|
||||||
|
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
|
||||||
|
<X>145</X>
|
||||||
|
<Y>600</Y>
|
||||||
|
<Z>0,00</Z>
|
||||||
|
<W>150</W>
|
||||||
|
<H>50</H>
|
||||||
|
<!--<Color>: Button color from ColorScheme (high priority)-->
|
||||||
|
<!--or <R>, <G>, <B>, <A> (lower priority)-->
|
||||||
|
<Color>ButtonColor</Color>
|
||||||
|
<!--<SColor>: Selected button color from ColorScheme (high priority)-->
|
||||||
|
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
|
||||||
|
<SColor>ButtonSColor</SColor>
|
||||||
|
<Text>
|
||||||
|
<!--<X>, <Y>: Text position-->
|
||||||
|
<X>75</X>
|
||||||
|
<Y>10</Y>
|
||||||
|
<!--<H>: Text height-->
|
||||||
|
<H>32</H>
|
||||||
|
<!--<MaxW>: Maximum text width (if exists)-->
|
||||||
|
<MaxW>142</MaxW>
|
||||||
|
<!--<Color>: Text color from ColorScheme (high priority)-->
|
||||||
|
<!--or <R>, <G>, <B>, <A> (lower priority)-->
|
||||||
|
<Color>ButtonTextColor</Color>
|
||||||
|
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
|
||||||
|
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
|
||||||
|
<SColor>ButtonTextSColor</SColor>
|
||||||
|
<!--<Align>: Text align horizontal: Left, Center, Right-->
|
||||||
|
<Align>Center</Align>
|
||||||
|
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
|
||||||
|
<HAlign>Center</HAlign>
|
||||||
|
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
|
||||||
|
<Style>Bold</Style>
|
||||||
|
<!--<Font>: Text font name-->
|
||||||
|
<Font>Outline</Font>
|
||||||
|
<!--<Text>: Nothing or translation tag-->
|
||||||
|
<Text>TR_BUTTON_BACK</Text>
|
||||||
|
</Text>
|
||||||
|
<!--<Reflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space-->
|
||||||
|
<!-- <Height>: Reflection Height-->
|
||||||
|
<Reflection>
|
||||||
|
<Space>10</Space>
|
||||||
|
<Height>26</Height>
|
||||||
|
</Reflection>
|
||||||
|
<!--<SReflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space of selected button-->
|
||||||
|
<!-- <Height>: Reflection Height of selected button-->
|
||||||
|
<SReflection>
|
||||||
|
<Space>10</Space>
|
||||||
|
<Height>26</Height>
|
||||||
|
</SReflection>
|
||||||
|
</ButtonBack>
|
||||||
|
</PartyScreenChallengeConfig>
|
||||||
|
</root>
|
||||||
@@ -0,0 +1,176 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<root>
|
||||||
|
<PartyScreenChallengeNames>
|
||||||
|
<ScreenVersion>1</ScreenVersion>
|
||||||
|
<Background1>
|
||||||
|
<!--<Type>: Background type: None, Color, Texture, Video-->
|
||||||
|
<Type>Video</Type>
|
||||||
|
<!--<Video>: Background video name-->
|
||||||
|
<Video>BG_Video</Video>
|
||||||
|
<!--<Skin>: Background Texture name-->
|
||||||
|
<Skin>BG_Default</Skin>
|
||||||
|
<!--<Color>: Background color for type "Color" from ColorScheme (high priority)-->
|
||||||
|
<!--or <R>, <G>, <B>, <A> (lower priority)-->
|
||||||
|
<Color>BackgroundColor</Color>
|
||||||
|
</Background1>
|
||||||
|
<Static1>
|
||||||
|
<!--<Skin>: Texture name-->
|
||||||
|
<Skin>Menu</Skin>
|
||||||
|
<!--<X>, <Y>, <Z>, <W>, <H>: Static position, width and height-->
|
||||||
|
<X>40</X>
|
||||||
|
<Y>40</Y>
|
||||||
|
<Z>0,00</Z>
|
||||||
|
<W>1200</W>
|
||||||
|
<H>50</H>
|
||||||
|
<!--<Color>: Static color from ColorScheme (high priority)-->
|
||||||
|
<!--or <R>, <G>, <B>, <A> (lower priority)-->
|
||||||
|
<Color>StaticColor</Color>
|
||||||
|
<!--<Reflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space-->
|
||||||
|
<!-- <Height>: Reflection Height-->
|
||||||
|
</Static1>
|
||||||
|
<Text1>
|
||||||
|
<!--<X>, <Y>: Text position-->
|
||||||
|
<X>640</X>
|
||||||
|
<Y>48</Y>
|
||||||
|
<!--<Z>: Text position-->
|
||||||
|
<Z>0,00</Z>
|
||||||
|
<!--<H>: Text height-->
|
||||||
|
<H>32</H>
|
||||||
|
<!--<MaxW>: Maximum text width (if exists)-->
|
||||||
|
<!--<Color>: Text color from ColorScheme (high priority)-->
|
||||||
|
<!--or <R>, <G>, <B>, <A> (lower priority)-->
|
||||||
|
<Color>StaticColor</Color>
|
||||||
|
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
|
||||||
|
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
|
||||||
|
<SColor>TextSColor</SColor>
|
||||||
|
<!--<Align>: Text align horizontal: Left, Center, Right-->
|
||||||
|
<Align>Center</Align>
|
||||||
|
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
|
||||||
|
<HAlign>Center</HAlign>
|
||||||
|
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
|
||||||
|
<Style>Bold</Style>
|
||||||
|
<!--<Font>: Text font name-->
|
||||||
|
<Font>Outline</Font>
|
||||||
|
<!--<Text>: Nothing or translation tag-->
|
||||||
|
<Text>TR_SCREENNAMES_TITLE</Text>
|
||||||
|
<!--<Reflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space-->
|
||||||
|
<!-- <Height>: Reflection Height-->
|
||||||
|
</Text1>
|
||||||
|
<ButtonNext>
|
||||||
|
<!--<Skin>: Texture name-->
|
||||||
|
<Skin>Button</Skin>
|
||||||
|
<!--<SkinSelected>: Texture name for selected button-->
|
||||||
|
<SkinSelected>Button</SkinSelected>
|
||||||
|
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
|
||||||
|
<X>985</X>
|
||||||
|
<Y>600</Y>
|
||||||
|
<Z>0,00</Z>
|
||||||
|
<W>150</W>
|
||||||
|
<H>50</H>
|
||||||
|
<!--<Color>: Button color from ColorScheme (high priority)-->
|
||||||
|
<!--or <R>, <G>, <B>, <A> (lower priority)-->
|
||||||
|
<Color>ButtonColor</Color>
|
||||||
|
<!--<SColor>: Selected button color from ColorScheme (high priority)-->
|
||||||
|
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
|
||||||
|
<SColor>ButtonSColor</SColor>
|
||||||
|
<Text>
|
||||||
|
<!--<X>, <Y>: Text position-->
|
||||||
|
<X>75</X>
|
||||||
|
<Y>10</Y>
|
||||||
|
<!--<H>: Text height-->
|
||||||
|
<H>32</H>
|
||||||
|
<!--<MaxW>: Maximum text width (if exists)-->
|
||||||
|
<MaxW>142</MaxW>
|
||||||
|
<!--<Color>: Text color from ColorScheme (high priority)-->
|
||||||
|
<!--or <R>, <G>, <B>, <A> (lower priority)-->
|
||||||
|
<Color>ButtonTextColor</Color>
|
||||||
|
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
|
||||||
|
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
|
||||||
|
<SColor>ButtonTextSColor</SColor>
|
||||||
|
<!--<Align>: Text align horizontal: Left, Center, Right-->
|
||||||
|
<Align>Center</Align>
|
||||||
|
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
|
||||||
|
<HAlign>Center</HAlign>
|
||||||
|
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
|
||||||
|
<Style>Bold</Style>
|
||||||
|
<!--<Font>: Text font name-->
|
||||||
|
<Font>Outline</Font>
|
||||||
|
<!--<Text>: Nothing or translation tag-->
|
||||||
|
<Text>TR_BUTTON_NEXT</Text>
|
||||||
|
</Text>
|
||||||
|
<!--<Reflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space-->
|
||||||
|
<!-- <Height>: Reflection Height-->
|
||||||
|
<Reflection>
|
||||||
|
<Space>10</Space>
|
||||||
|
<Height>26</Height>
|
||||||
|
</Reflection>
|
||||||
|
<!--<SReflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space of selected button-->
|
||||||
|
<!-- <Height>: Reflection Height of selected button-->
|
||||||
|
<SReflection>
|
||||||
|
<Space>10</Space>
|
||||||
|
<Height>26</Height>
|
||||||
|
</SReflection>
|
||||||
|
</ButtonNext>
|
||||||
|
<ButtonExit>
|
||||||
|
<!--<Skin>: Texture name-->
|
||||||
|
<Skin>Button</Skin>
|
||||||
|
<!--<SkinSelected>: Texture name for selected button-->
|
||||||
|
<SkinSelected>Button</SkinSelected>
|
||||||
|
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
|
||||||
|
<X>145</X>
|
||||||
|
<Y>600</Y>
|
||||||
|
<Z>0,00</Z>
|
||||||
|
<W>150</W>
|
||||||
|
<H>50</H>
|
||||||
|
<!--<Color>: Button color from ColorScheme (high priority)-->
|
||||||
|
<!--or <R>, <G>, <B>, <A> (lower priority)-->
|
||||||
|
<Color>ButtonColor</Color>
|
||||||
|
<!--<SColor>: Selected button color from ColorScheme (high priority)-->
|
||||||
|
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
|
||||||
|
<SColor>ButtonSColor</SColor>
|
||||||
|
<Text>
|
||||||
|
<!--<X>, <Y>: Text position-->
|
||||||
|
<X>75</X>
|
||||||
|
<Y>10</Y>
|
||||||
|
<!--<H>: Text height-->
|
||||||
|
<H>32</H>
|
||||||
|
<!--<MaxW>: Maximum text width (if exists)-->
|
||||||
|
<MaxW>142</MaxW>
|
||||||
|
<!--<Color>: Text color from ColorScheme (high priority)-->
|
||||||
|
<!--or <R>, <G>, <B>, <A> (lower priority)-->
|
||||||
|
<Color>ButtonTextColor</Color>
|
||||||
|
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
|
||||||
|
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
|
||||||
|
<SColor>ButtonTextSColor</SColor>
|
||||||
|
<!--<Align>: Text align horizontal: Left, Center, Right-->
|
||||||
|
<Align>Center</Align>
|
||||||
|
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
|
||||||
|
<HAlign>Center</HAlign>
|
||||||
|
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
|
||||||
|
<Style>Bold</Style>
|
||||||
|
<!--<Font>: Text font name-->
|
||||||
|
<Font>Outline</Font>
|
||||||
|
<!--<Text>: Nothing or translation tag-->
|
||||||
|
<Text>TR_BUTTON_BACK</Text>
|
||||||
|
</Text>
|
||||||
|
<!--<Reflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space-->
|
||||||
|
<!-- <Height>: Reflection Height-->
|
||||||
|
<Reflection>
|
||||||
|
<Space>10</Space>
|
||||||
|
<Height>26</Height>
|
||||||
|
</Reflection>
|
||||||
|
<!--<SReflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space of selected button-->
|
||||||
|
<!-- <Height>: Reflection Height of selected button-->
|
||||||
|
<SReflection>
|
||||||
|
<Space>10</Space>
|
||||||
|
<Height>26</Height>
|
||||||
|
</SReflection>
|
||||||
|
</ButtonExit>
|
||||||
|
</PartyScreenChallengeNames>
|
||||||
|
</root>
|
||||||
@@ -40,6 +40,7 @@ Global
|
|||||||
{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugLinux|x64.Build.0 = DebugLinux|x64
|
{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugLinux|x64.Build.0 = DebugLinux|x64
|
||||||
{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugLinux|x86.ActiveCfg = DebugLinux|x86
|
{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugLinux|x86.ActiveCfg = DebugLinux|x86
|
||||||
{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugWin|x64.ActiveCfg = DebugWin|x64
|
{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugWin|x64.ActiveCfg = DebugWin|x64
|
||||||
|
{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugWin|x64.Build.0 = DebugWin|x64
|
||||||
{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugWin|x86.ActiveCfg = DebugWin|x86
|
{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugWin|x86.ActiveCfg = DebugWin|x86
|
||||||
{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseLinux|x64.ActiveCfg = ReleaseLinux|x64
|
{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseLinux|x64.ActiveCfg = ReleaseLinux|x64
|
||||||
{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|x86
|
{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|x86
|
||||||
|
|||||||
@@ -246,6 +246,12 @@ namespace Vocaluxe.Base
|
|||||||
if (Output == null)
|
if (Output == null)
|
||||||
return pm;
|
return pm;
|
||||||
|
|
||||||
|
if (!CLanguage.LoadPartyLanguageFiles(pm.PartyModeID, Path.Combine(Path.Combine(CSettings.sFolderPartyModes, pm.Folder), CSettings.sFolderPartyModeLanguages)))
|
||||||
|
{
|
||||||
|
CLog.LogError("Error loading language files for PartyMode: " + file);
|
||||||
|
return pm;
|
||||||
|
}
|
||||||
|
|
||||||
object Instance = Output.CreateInstance("Vocaluxe.PartyModes." + pm.PartyModeFile);
|
object Instance = Output.CreateInstance("Vocaluxe.PartyModes." + pm.PartyModeFile);
|
||||||
if (Instance == null)
|
if (Instance == null)
|
||||||
{
|
{
|
||||||
@@ -278,12 +284,6 @@ namespace Vocaluxe.Base
|
|||||||
return pm;
|
return pm;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!CLanguage.LoadPartyLanguageFiles(pm.PartyModeID, Path.Combine(Path.Combine(CSettings.sFolderPartyModes, pm.Folder), CSettings.sFolderPartyModeLanguages)))
|
|
||||||
{
|
|
||||||
CLog.LogError("Error loading language files for PartyMode: " + file);
|
|
||||||
return pm;
|
|
||||||
}
|
|
||||||
|
|
||||||
pm.NoErrors = true;
|
pm.NoErrors = true;
|
||||||
return pm;
|
return pm;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ namespace Vocaluxe.Menu
|
|||||||
|
|
||||||
public class CBackground : IMenuElement
|
public class CBackground : IMenuElement
|
||||||
{
|
{
|
||||||
|
private int _PartyModeID;
|
||||||
private Basic _Base;
|
private Basic _Base;
|
||||||
private SThemeBackground _Theme;
|
private SThemeBackground _Theme;
|
||||||
private bool _ThemeLoaded;
|
private bool _ThemeLoaded;
|
||||||
@@ -42,8 +43,9 @@ namespace Vocaluxe.Menu
|
|||||||
}
|
}
|
||||||
|
|
||||||
#region Constructors
|
#region Constructors
|
||||||
public CBackground(Basic Base)
|
public CBackground(Basic Base, int PartyModeID)
|
||||||
{
|
{
|
||||||
|
_PartyModeID = PartyModeID;
|
||||||
_Base = Base;
|
_Base = Base;
|
||||||
_ThemeLoaded = false;
|
_ThemeLoaded = false;
|
||||||
_Theme = new SThemeBackground();
|
_Theme = new SThemeBackground();
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ namespace Vocaluxe.Menu
|
|||||||
private Basic _Base;
|
private Basic _Base;
|
||||||
private SThemeButton _Theme;
|
private SThemeButton _Theme;
|
||||||
private bool _ThemeLoaded;
|
private bool _ThemeLoaded;
|
||||||
|
private int _PartyModeID;
|
||||||
|
|
||||||
public SRectF Rect;
|
public SRectF Rect;
|
||||||
public SColorF Color;
|
public SColorF Color;
|
||||||
@@ -69,8 +70,9 @@ namespace Vocaluxe.Menu
|
|||||||
return _Theme.Name;
|
return _Theme.Name;
|
||||||
}
|
}
|
||||||
|
|
||||||
public CButton(Basic Base)
|
public CButton(Basic Base, int PartyModeID)
|
||||||
{
|
{
|
||||||
|
_PartyModeID = PartyModeID;
|
||||||
_Base = Base;
|
_Base = Base;
|
||||||
_Theme = new SThemeButton();
|
_Theme = new SThemeButton();
|
||||||
Rect = new SRectF();
|
Rect = new SRectF();
|
||||||
@@ -78,8 +80,8 @@ namespace Vocaluxe.Menu
|
|||||||
SColor = new SColorF();
|
SColor = new SColorF();
|
||||||
|
|
||||||
SelText = false;
|
SelText = false;
|
||||||
Text = new CText(_Base);
|
Text = new CText(_Base, _PartyModeID);
|
||||||
SText = new CText(_Base);
|
SText = new CText(_Base, _PartyModeID);
|
||||||
Selected = false;
|
Selected = false;
|
||||||
Visible = true;
|
Visible = true;
|
||||||
EditMode = false;
|
EditMode = false;
|
||||||
@@ -269,34 +271,40 @@ namespace Vocaluxe.Menu
|
|||||||
{
|
{
|
||||||
texture = _Base.Theme.GetSkinTexture(_Theme.TextureName);
|
texture = _Base.Theme.GetSkinTexture(_Theme.TextureName);
|
||||||
_Base.Drawing.DrawTexture(texture, Rect, Color);
|
_Base.Drawing.DrawTexture(texture, Rect, Color);
|
||||||
Text.DrawRelative(Rect.X, Rect.Y);
|
|
||||||
if (Reflection)
|
if (Reflection)
|
||||||
{
|
{
|
||||||
_Base.Drawing.DrawTextureReflection(texture, Rect, Color, Rect, ReflectionSpace, ReflectionHeight);
|
_Base.Drawing.DrawTextureReflection(texture, Rect, Color, Rect, ReflectionSpace, ReflectionHeight);
|
||||||
Text.DrawRelative(Rect.X, Rect.Y, ReflectionSpace, ReflectionHeight, Rect.H);
|
Text.DrawRelative(Rect.X, Rect.Y, ReflectionSpace, ReflectionHeight, Rect.H);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
Text.DrawRelative(Rect.X, Rect.Y);
|
||||||
}
|
}
|
||||||
else if(!SelText)
|
else if(!SelText)
|
||||||
{
|
{
|
||||||
texture = _Base.Theme.GetSkinTexture(_Theme.STextureName);
|
texture = _Base.Theme.GetSkinTexture(_Theme.STextureName);
|
||||||
_Base.Drawing.DrawTexture(texture, Rect, SColor);
|
_Base.Drawing.DrawTexture(texture, Rect, SColor);
|
||||||
Text.DrawRelative(Rect.X, Rect.Y);
|
|
||||||
if (Reflection)
|
if (Reflection)
|
||||||
{
|
{
|
||||||
_Base.Drawing.DrawTextureReflection(texture, Rect, SColor, Rect, ReflectionSpace, ReflectionHeight);
|
_Base.Drawing.DrawTextureReflection(texture, Rect, SColor, Rect, ReflectionSpace, ReflectionHeight);
|
||||||
Text.DrawRelative(Rect.X, Rect.Y, ReflectionSpace, ReflectionHeight, Rect.H);
|
Text.DrawRelative(Rect.X, Rect.Y, ReflectionSpace, ReflectionHeight, Rect.H);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
Text.DrawRelative(Rect.X, Rect.Y);
|
||||||
}
|
}
|
||||||
else if(SelText)
|
else if(SelText)
|
||||||
{
|
{
|
||||||
texture = _Base.Theme.GetSkinTexture(_Theme.STextureName);
|
texture = _Base.Theme.GetSkinTexture(_Theme.STextureName);
|
||||||
_Base.Drawing.DrawTexture(texture, Rect, SColor);
|
_Base.Drawing.DrawTexture(texture, Rect, SColor);
|
||||||
SText.DrawRelative(Rect.X, Rect.Y);
|
|
||||||
if (Reflection)
|
if (Reflection)
|
||||||
{
|
{
|
||||||
_Base.Drawing.DrawTextureReflection(texture, Rect, SColor, Rect, ReflectionSpace, ReflectionHeight);
|
_Base.Drawing.DrawTextureReflection(texture, Rect, SColor, Rect, ReflectionSpace, ReflectionHeight);
|
||||||
SText.DrawRelative(Rect.X, Rect.Y, ReflectionSpace, ReflectionHeight, Rect.H);
|
SText.DrawRelative(Rect.X, Rect.Y, ReflectionSpace, ReflectionHeight, Rect.H);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
SText.DrawRelative(Rect.X, Rect.Y);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ namespace Vocaluxe.Menu
|
|||||||
|
|
||||||
public class CEqualizer : IMenuElement
|
public class CEqualizer : IMenuElement
|
||||||
{
|
{
|
||||||
|
private int _PartyModeID;
|
||||||
private Basic _Base;
|
private Basic _Base;
|
||||||
private SThemeEqualizer _Theme;
|
private SThemeEqualizer _Theme;
|
||||||
private bool _ThemeLoaded;
|
private bool _ThemeLoaded;
|
||||||
@@ -52,8 +53,9 @@ namespace Vocaluxe.Menu
|
|||||||
|
|
||||||
private float[] _Bars;
|
private float[] _Bars;
|
||||||
|
|
||||||
public CEqualizer(Basic Base)
|
public CEqualizer(Basic Base, int PartyModeID)
|
||||||
{
|
{
|
||||||
|
_PartyModeID = PartyModeID;
|
||||||
_Base = Base;
|
_Base = Base;
|
||||||
_Theme = new SThemeEqualizer();
|
_Theme = new SThemeEqualizer();
|
||||||
_ThemeLoaded = false;
|
_ThemeLoaded = false;
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ namespace Vocaluxe.Menu
|
|||||||
|
|
||||||
public class CLyric : IMenuElement
|
public class CLyric : IMenuElement
|
||||||
{
|
{
|
||||||
|
private int _PartyModeID;
|
||||||
private Basic _Base;
|
private Basic _Base;
|
||||||
private SThemeLyrics _Theme;
|
private SThemeLyrics _Theme;
|
||||||
private bool _ThemeLoaded;
|
private bool _ThemeLoaded;
|
||||||
@@ -86,8 +87,9 @@ namespace Vocaluxe.Menu
|
|||||||
set { _Style = value; }
|
set { _Style = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public CLyric(Basic Base)
|
public CLyric(Basic Base, int PartyModeID)
|
||||||
{
|
{
|
||||||
|
_PartyModeID = PartyModeID;
|
||||||
_Base = Base;
|
_Base = Base;
|
||||||
_Theme = new SThemeLyrics();
|
_Theme = new SThemeLyrics();
|
||||||
_ThemeLoaded = false;
|
_ThemeLoaded = false;
|
||||||
@@ -101,7 +103,7 @@ namespace Vocaluxe.Menu
|
|||||||
_H = 1f;
|
_H = 1f;
|
||||||
_width = 1f;
|
_width = 1f;
|
||||||
_Notes = new List<SNote>();
|
_Notes = new List<SNote>();
|
||||||
_Text = new CText(_Base);
|
_Text = new CText(_Base, _PartyModeID);
|
||||||
|
|
||||||
_Style = ELyricStyle.Fill;
|
_Style = ELyricStyle.Fill;
|
||||||
}
|
}
|
||||||
|
|||||||
+30
-34
@@ -201,7 +201,7 @@ namespace Vocaluxe.Menu
|
|||||||
{
|
{
|
||||||
for (int i = 0; i < _ThemeBackgrounds.Length; i++)
|
for (int i = 0; i < _ThemeBackgrounds.Length; i++)
|
||||||
{
|
{
|
||||||
CBackground background = new CBackground(_Base);
|
CBackground background = new CBackground(_Base, _PartyModeID);
|
||||||
if (background.LoadTheme("//root/" + _ThemeName, _ThemeBackgrounds[i], navigator, SkinIndex))
|
if (background.LoadTheme("//root/" + _ThemeName, _ThemeBackgrounds[i], navigator, SkinIndex))
|
||||||
{
|
{
|
||||||
_htBackgrounds.Add(_ThemeBackgrounds[i], AddBackground(background));
|
_htBackgrounds.Add(_ThemeBackgrounds[i], AddBackground(background));
|
||||||
@@ -217,7 +217,7 @@ namespace Vocaluxe.Menu
|
|||||||
{
|
{
|
||||||
for (int i = 0; i < _ThemeStatics.Length; i++)
|
for (int i = 0; i < _ThemeStatics.Length; i++)
|
||||||
{
|
{
|
||||||
CStatic stat = new CStatic(_Base);
|
CStatic stat = new CStatic(_Base, _PartyModeID);
|
||||||
if (stat.LoadTheme("//root/" + _ThemeName, _ThemeStatics[i], navigator, SkinIndex))
|
if (stat.LoadTheme("//root/" + _ThemeName, _ThemeStatics[i], navigator, SkinIndex))
|
||||||
{
|
{
|
||||||
_htStatics.Add(_ThemeStatics[i], AddStatic(stat));
|
_htStatics.Add(_ThemeStatics[i], AddStatic(stat));
|
||||||
@@ -233,8 +233,7 @@ namespace Vocaluxe.Menu
|
|||||||
{
|
{
|
||||||
for (int i = 0; i < _ThemeTexts.Length; i++)
|
for (int i = 0; i < _ThemeTexts.Length; i++)
|
||||||
{
|
{
|
||||||
CText text = new CText(_Base);
|
CText text = new CText(_Base, _PartyModeID);
|
||||||
text.PartyModeID = _PartyModeID;
|
|
||||||
if (text.LoadTheme("//root/" + _ThemeName, _ThemeTexts[i], navigator, SkinIndex))
|
if (text.LoadTheme("//root/" + _ThemeName, _ThemeTexts[i], navigator, SkinIndex))
|
||||||
{
|
{
|
||||||
_htTexts.Add(_ThemeTexts[i], AddText(text));
|
_htTexts.Add(_ThemeTexts[i], AddText(text));
|
||||||
@@ -250,7 +249,7 @@ namespace Vocaluxe.Menu
|
|||||||
{
|
{
|
||||||
for (int i = 0; i < _ThemeButtons.Length; i++)
|
for (int i = 0; i < _ThemeButtons.Length; i++)
|
||||||
{
|
{
|
||||||
CButton button = new CButton(_Base);
|
CButton button = new CButton(_Base, _PartyModeID);
|
||||||
if (button.LoadTheme("//root/" + _ThemeName, _ThemeButtons[i], navigator, SkinIndex))
|
if (button.LoadTheme("//root/" + _ThemeName, _ThemeButtons[i], navigator, SkinIndex))
|
||||||
{
|
{
|
||||||
_htButtons.Add(_ThemeButtons[i], AddButton(button));
|
_htButtons.Add(_ThemeButtons[i], AddButton(button));
|
||||||
@@ -266,7 +265,7 @@ namespace Vocaluxe.Menu
|
|||||||
{
|
{
|
||||||
for (int i = 0; i < _ThemeSelectSlides.Length; i++)
|
for (int i = 0; i < _ThemeSelectSlides.Length; i++)
|
||||||
{
|
{
|
||||||
CSelectSlide slide = new CSelectSlide(_Base);
|
CSelectSlide slide = new CSelectSlide(_Base, _PartyModeID);
|
||||||
if (slide.LoadTheme("//root/" + _ThemeName, _ThemeSelectSlides[i], navigator, SkinIndex))
|
if (slide.LoadTheme("//root/" + _ThemeName, _ThemeSelectSlides[i], navigator, SkinIndex))
|
||||||
{
|
{
|
||||||
_htSelectSlides.Add(_ThemeSelectSlides[i], AddSelectSlide(slide));
|
_htSelectSlides.Add(_ThemeSelectSlides[i], AddSelectSlide(slide));
|
||||||
@@ -282,7 +281,7 @@ namespace Vocaluxe.Menu
|
|||||||
{
|
{
|
||||||
for (int i = 0; i < _ThemeSongMenus.Length; i++)
|
for (int i = 0; i < _ThemeSongMenus.Length; i++)
|
||||||
{
|
{
|
||||||
CSongMenu sm = new CSongMenu(_Base);
|
CSongMenu sm = new CSongMenu(_Base, _PartyModeID);
|
||||||
if (sm.LoadTheme("//root/" + _ThemeName, _ThemeSongMenus[i], navigator, SkinIndex))
|
if (sm.LoadTheme("//root/" + _ThemeName, _ThemeSongMenus[i], navigator, SkinIndex))
|
||||||
{
|
{
|
||||||
_htSongMenus.Add(_ThemeSongMenus[i], AddSongMenu(sm));
|
_htSongMenus.Add(_ThemeSongMenus[i], AddSongMenu(sm));
|
||||||
@@ -298,7 +297,7 @@ namespace Vocaluxe.Menu
|
|||||||
{
|
{
|
||||||
for (int i = 0; i < _ThemeLyrics.Length; i++)
|
for (int i = 0; i < _ThemeLyrics.Length; i++)
|
||||||
{
|
{
|
||||||
CLyric lyric = new CLyric(_Base);
|
CLyric lyric = new CLyric(_Base, _PartyModeID);
|
||||||
if (lyric.LoadTheme("//root/" + _ThemeName, _ThemeLyrics[i], navigator, SkinIndex))
|
if (lyric.LoadTheme("//root/" + _ThemeName, _ThemeLyrics[i], navigator, SkinIndex))
|
||||||
{
|
{
|
||||||
_htLyrics.Add(_ThemeLyrics[i], AddLyric(lyric));
|
_htLyrics.Add(_ThemeLyrics[i], AddLyric(lyric));
|
||||||
@@ -314,7 +313,7 @@ namespace Vocaluxe.Menu
|
|||||||
{
|
{
|
||||||
for (int i = 0; i < _ThemeSingNotes.Length; i++)
|
for (int i = 0; i < _ThemeSingNotes.Length; i++)
|
||||||
{
|
{
|
||||||
CSingNotes notes = new CSingNotesClassic(_Base);
|
CSingNotes notes = new CSingNotesClassic(_Base, _PartyModeID);
|
||||||
if (notes.LoadTheme("//root/" + _ThemeName, _ThemeSingNotes[i], navigator, SkinIndex))
|
if (notes.LoadTheme("//root/" + _ThemeName, _ThemeSingNotes[i], navigator, SkinIndex))
|
||||||
{
|
{
|
||||||
_htSingNotes.Add(_ThemeSingNotes[i], AddSingNote(notes));
|
_htSingNotes.Add(_ThemeSingNotes[i], AddSingNote(notes));
|
||||||
@@ -330,7 +329,7 @@ namespace Vocaluxe.Menu
|
|||||||
{
|
{
|
||||||
for (int i = 0; i < _ThemeNameSelections.Length; i++)
|
for (int i = 0; i < _ThemeNameSelections.Length; i++)
|
||||||
{
|
{
|
||||||
CNameSelection nsel = new CNameSelection(_Base);
|
CNameSelection nsel = new CNameSelection(_Base, _PartyModeID);
|
||||||
if (nsel.LoadTheme("//root/" + _ThemeName, _ThemeNameSelections[i], navigator, SkinIndex))
|
if (nsel.LoadTheme("//root/" + _ThemeName, _ThemeNameSelections[i], navigator, SkinIndex))
|
||||||
{
|
{
|
||||||
_htNameSelections.Add(_ThemeNameSelections[i], AddNameSelection(nsel));
|
_htNameSelections.Add(_ThemeNameSelections[i], AddNameSelection(nsel));
|
||||||
@@ -346,7 +345,7 @@ namespace Vocaluxe.Menu
|
|||||||
{
|
{
|
||||||
for (int i = 0; i < _ThemeEqualizers.Length; i++)
|
for (int i = 0; i < _ThemeEqualizers.Length; i++)
|
||||||
{
|
{
|
||||||
CEqualizer eq = new CEqualizer(_Base);
|
CEqualizer eq = new CEqualizer(_Base, _PartyModeID);
|
||||||
if (eq.LoadTheme("//root/" + _ThemeName, _ThemeEqualizers[i], navigator, SkinIndex))
|
if (eq.LoadTheme("//root/" + _ThemeName, _ThemeEqualizers[i], navigator, SkinIndex))
|
||||||
{
|
{
|
||||||
_htEqualizers.Add(_ThemeEqualizers[i], AddEqualizer(eq));
|
_htEqualizers.Add(_ThemeEqualizers[i], AddEqualizer(eq));
|
||||||
@@ -362,7 +361,7 @@ namespace Vocaluxe.Menu
|
|||||||
{
|
{
|
||||||
for (int i = 0; i < _ThemePlaylists.Length; i++)
|
for (int i = 0; i < _ThemePlaylists.Length; i++)
|
||||||
{
|
{
|
||||||
CPlaylist pls = new CPlaylist(_Base);
|
CPlaylist pls = new CPlaylist(_Base, _PartyModeID);
|
||||||
if (pls.LoadTheme("//root/" + _ThemeName, _ThemePlaylists[i], navigator, SkinIndex))
|
if (pls.LoadTheme("//root/" + _ThemeName, _ThemePlaylists[i], navigator, SkinIndex))
|
||||||
{
|
{
|
||||||
_htPlaylists.Add(_ThemePlaylists[i], AddPlaylist(pls));
|
_htPlaylists.Add(_ThemePlaylists[i], AddPlaylist(pls));
|
||||||
@@ -661,12 +660,12 @@ namespace Vocaluxe.Menu
|
|||||||
#region Create Elements
|
#region Create Elements
|
||||||
public CButton GetNewButton()
|
public CButton GetNewButton()
|
||||||
{
|
{
|
||||||
return new CButton(_Base);
|
return new CButton(_Base, _PartyModeID);
|
||||||
}
|
}
|
||||||
|
|
||||||
public CText GetNewText()
|
public CText GetNewText()
|
||||||
{
|
{
|
||||||
return new CText(_Base);
|
return new CText(_Base, _PartyModeID);
|
||||||
}
|
}
|
||||||
|
|
||||||
public CText GetNewText(float x, float y, float z, float h, float mw, EAlignment align, EStyle style, string font, SColorF col, string text)
|
public CText GetNewText(float x, float y, float z, float h, float mw, EAlignment align, EStyle style, string font, SColorF col, string text)
|
||||||
@@ -677,57 +676,57 @@ namespace Vocaluxe.Menu
|
|||||||
|
|
||||||
public CBackground GetNewBackground()
|
public CBackground GetNewBackground()
|
||||||
{
|
{
|
||||||
return new CBackground(_Base);
|
return new CBackground(_Base, _PartyModeID);
|
||||||
}
|
}
|
||||||
|
|
||||||
public CStatic GetNewStatic()
|
public CStatic GetNewStatic()
|
||||||
{
|
{
|
||||||
return new CStatic(_Base);
|
return new CStatic(_Base, _PartyModeID);
|
||||||
}
|
}
|
||||||
|
|
||||||
public CStatic GetNewStatic(STexture Texture, SColorF Color, SRectF Rect)
|
public CStatic GetNewStatic(STexture Texture, SColorF Color, SRectF Rect)
|
||||||
{
|
{
|
||||||
return new CStatic(_Base, Texture, Color, Rect);
|
return new CStatic(_Base, _PartyModeID, Texture, Color, Rect);
|
||||||
}
|
}
|
||||||
|
|
||||||
public CSelectSlide GetNewSelectSlide()
|
public CSelectSlide GetNewSelectSlide()
|
||||||
{
|
{
|
||||||
return new CSelectSlide(_Base);
|
return new CSelectSlide(_Base, _PartyModeID);
|
||||||
}
|
}
|
||||||
|
|
||||||
public CSongMenu GetNewSongMenu()
|
public CSongMenu GetNewSongMenu()
|
||||||
{
|
{
|
||||||
return new CSongMenu(_Base);
|
return new CSongMenu(_Base, _PartyModeID);
|
||||||
}
|
}
|
||||||
|
|
||||||
public CLyric GetNewLyric()
|
public CLyric GetNewLyric()
|
||||||
{
|
{
|
||||||
return new CLyric(_Base);
|
return new CLyric(_Base, _PartyModeID);
|
||||||
}
|
}
|
||||||
|
|
||||||
public CSingNotes GetNewSingNotes()
|
public CSingNotes GetNewSingNotes()
|
||||||
{
|
{
|
||||||
return new CSingNotesClassic(_Base);
|
return new CSingNotesClassic(_Base, _PartyModeID);
|
||||||
}
|
}
|
||||||
|
|
||||||
public CNameSelection GetNewNameSelection()
|
public CNameSelection GetNewNameSelection()
|
||||||
{
|
{
|
||||||
return new CNameSelection(_Base);
|
return new CNameSelection(_Base, _PartyModeID);
|
||||||
}
|
}
|
||||||
|
|
||||||
public CEqualizer GetNewEqualizer()
|
public CEqualizer GetNewEqualizer()
|
||||||
{
|
{
|
||||||
return new CEqualizer(_Base);
|
return new CEqualizer(_Base, _PartyModeID);
|
||||||
}
|
}
|
||||||
|
|
||||||
public CPlaylist GetNewPlaylist()
|
public CPlaylist GetNewPlaylist()
|
||||||
{
|
{
|
||||||
return new CPlaylist(_Base);
|
return new CPlaylist(_Base, _PartyModeID);
|
||||||
}
|
}
|
||||||
|
|
||||||
public CParticleEffect GetNewParticleEffect(int MaxNumber, SColorF Color, SRectF Area, STexture Texture, float Size, EParticeType Type)
|
public CParticleEffect GetNewParticleEffect(int MaxNumber, SColorF Color, SRectF Area, STexture Texture, float Size, EParticeType Type)
|
||||||
{
|
{
|
||||||
return new CParticleEffect(_Base, MaxNumber, Color, Area, Texture, Size, Type);
|
return new CParticleEffect(_Base, _PartyModeID, MaxNumber, Color, Area, Texture, Size, Type);
|
||||||
}
|
}
|
||||||
#endregion Create Elements
|
#endregion Create Elements
|
||||||
|
|
||||||
@@ -1302,7 +1301,6 @@ namespace Vocaluxe.Menu
|
|||||||
|
|
||||||
public int AddText(CText text)
|
public int AddText(CText text)
|
||||||
{
|
{
|
||||||
text.PartyModeID = _PartyModeID;
|
|
||||||
_Texts.Add(text);
|
_Texts.Add(text);
|
||||||
_AddInteraction(_Texts.Count - 1, EType.TText);
|
_AddInteraction(_Texts.Count - 1, EType.TText);
|
||||||
return _Texts.Count - 1;
|
return _Texts.Count - 1;
|
||||||
@@ -2293,34 +2291,32 @@ namespace Vocaluxe.Menu
|
|||||||
string value = String.Empty;
|
string value = String.Empty;
|
||||||
|
|
||||||
// Backgrounds
|
// Backgrounds
|
||||||
CBackground background = new CBackground(_Base);
|
CBackground background = new CBackground(_Base, _PartyModeID);
|
||||||
int i = 1;
|
int i = 1;
|
||||||
while (background.LoadTheme("//root/" + _ThemeName, "Background" + i.ToString(), navigator, SkinIndex))
|
while (background.LoadTheme("//root/" + _ThemeName, "Background" + i.ToString(), navigator, SkinIndex))
|
||||||
{
|
{
|
||||||
AddBackground(background);
|
AddBackground(background);
|
||||||
background = new CBackground(_Base);
|
background = new CBackground(_Base, _PartyModeID);
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Statics
|
// Statics
|
||||||
CStatic stat = new CStatic(_Base);
|
CStatic stat = new CStatic(_Base, _PartyModeID);
|
||||||
i = 1;
|
i = 1;
|
||||||
while (stat.LoadTheme("//root/" + _ThemeName, "Static" + i.ToString(), navigator, SkinIndex))
|
while (stat.LoadTheme("//root/" + _ThemeName, "Static" + i.ToString(), navigator, SkinIndex))
|
||||||
{
|
{
|
||||||
AddStatic(stat);
|
AddStatic(stat);
|
||||||
stat = new CStatic(_Base);
|
stat = new CStatic(_Base, _PartyModeID);
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Texts
|
// Texts
|
||||||
CText text = new CText(_Base);
|
CText text = new CText(_Base, _PartyModeID);
|
||||||
text.PartyModeID = _PartyModeID;
|
|
||||||
i = 1;
|
i = 1;
|
||||||
while (text.LoadTheme("//root/" + _ThemeName, "Text" + i.ToString(), navigator, SkinIndex))
|
while (text.LoadTheme("//root/" + _ThemeName, "Text" + i.ToString(), navigator, SkinIndex))
|
||||||
{
|
{
|
||||||
AddText(text);
|
AddText(text);
|
||||||
text = new CText(_Base);
|
text = new CText(_Base, _PartyModeID);
|
||||||
text.PartyModeID = _PartyModeID;
|
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ namespace Vocaluxe.Menu
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private int _PartyModeID;
|
||||||
private Basic _Base;
|
private Basic _Base;
|
||||||
private SThemeNameSelection _Theme;
|
private SThemeNameSelection _Theme;
|
||||||
private bool _ThemeLoaded;
|
private bool _ThemeLoaded;
|
||||||
@@ -84,8 +85,9 @@ namespace Vocaluxe.Menu
|
|||||||
private CStatic PlayerSelector;
|
private CStatic PlayerSelector;
|
||||||
|
|
||||||
|
|
||||||
public CNameSelection(Basic Base)
|
public CNameSelection(Basic Base, int PartyModeID)
|
||||||
{
|
{
|
||||||
|
_PartyModeID = PartyModeID;
|
||||||
_Base = Base;
|
_Base = Base;
|
||||||
_Theme = new SThemeNameSelection();
|
_Theme = new SThemeNameSelection();
|
||||||
|
|
||||||
@@ -97,7 +99,7 @@ namespace Vocaluxe.Menu
|
|||||||
{
|
{
|
||||||
PrepareTiles();
|
PrepareTiles();
|
||||||
|
|
||||||
PlayerSelector = new CStatic(_Base);
|
PlayerSelector = new CStatic(_Base, _PartyModeID);
|
||||||
PlayerSelector.Texture = _TextureTileSelected;
|
PlayerSelector.Texture = _TextureTileSelected;
|
||||||
PlayerSelector.Rect = new SRectF(0, 0, (_TileW + 6), (_TileH + 6), (Rect.Z - 0.5f));
|
PlayerSelector.Rect = new SRectF(0, 0, (_TileW + 6), (_TileH + 6), (Rect.Z - 0.5f));
|
||||||
PlayerSelector.Visible = false;
|
PlayerSelector.Visible = false;
|
||||||
@@ -466,7 +468,7 @@ namespace Vocaluxe.Menu
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return new CStatic(_Base);
|
return new CStatic(_Base, _PartyModeID);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void UnloadTextures()
|
public void UnloadTextures()
|
||||||
@@ -501,7 +503,7 @@ namespace Vocaluxe.Menu
|
|||||||
for (int j = 0; j < _NumW; j++)
|
for (int j = 0; j < _NumW; j++)
|
||||||
{
|
{
|
||||||
SRectF rect = new SRectF(Rect.X + j * (_TileW + _SpaceW), Rect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, Rect.Z);
|
SRectF rect = new SRectF(Rect.X + j * (_TileW + _SpaceW), Rect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, Rect.Z);
|
||||||
CStatic tileStatic = new CStatic(_Base, _TextureEmptyTile, ColorEmptyTile, rect);
|
CStatic tileStatic = new CStatic(_Base, _PartyModeID, _TextureEmptyTile, ColorEmptyTile, rect);
|
||||||
CText tileText = new CText(_Base, rect.X + rect.W / 2, rect.Y + rect.H + _Theme.NameSpace, rect.Z, _Theme.NameHeight, rect.W, EAlignment.Center, _Theme.NameStyle, _Theme.NameFont, _Theme.NameColor, "");
|
CText tileText = new CText(_Base, rect.X + rect.W / 2, rect.Y + rect.H + _Theme.NameSpace, rect.Z, _Theme.NameHeight, rect.W, EAlignment.Center, _Theme.NameStyle, _Theme.NameFont, _Theme.NameColor, "");
|
||||||
_Tiles.Add(new CTile(tileStatic, tileText, -1));
|
_Tiles.Add(new CTile(tileStatic, tileText, -1));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ namespace Vocaluxe.Menu
|
|||||||
class CParticle
|
class CParticle
|
||||||
{
|
{
|
||||||
#region private vars
|
#region private vars
|
||||||
|
private int _PartyModeID;
|
||||||
private Basic _Base;
|
private Basic _Base;
|
||||||
private string _TextureName;
|
private string _TextureName;
|
||||||
private STexture _Texture;
|
private STexture _Texture;
|
||||||
@@ -84,8 +85,9 @@ namespace Vocaluxe.Menu
|
|||||||
#endregion public vars
|
#endregion public vars
|
||||||
|
|
||||||
#region Constructors
|
#region Constructors
|
||||||
public CParticle(Basic Base, string textureName, SColorF color, float x, float y, float size, float maxage, float z, float vx, float vy, float vr, float vsize, EParticeType type)
|
public CParticle(Basic Base, int PartyModeID, string textureName, SColorF color, float x, float y, float size, float maxage, float z, float vx, float vy, float vr, float vsize, EParticeType type)
|
||||||
{
|
{
|
||||||
|
_PartyModeID = PartyModeID;
|
||||||
_Base = Base;
|
_Base = Base;
|
||||||
_TextureName = textureName;
|
_TextureName = textureName;
|
||||||
_Texture = new STexture(-1);
|
_Texture = new STexture(-1);
|
||||||
@@ -107,8 +109,9 @@ namespace Vocaluxe.Menu
|
|||||||
_Rotation = (float)(_Base.Game.GetRandomDouble() * 360.0);
|
_Rotation = (float)(_Base.Game.GetRandomDouble() * 360.0);
|
||||||
}
|
}
|
||||||
|
|
||||||
public CParticle(Basic Base, STexture texture, SColorF color, float x, float y, float size, float maxage, float z, float vx, float vy, float vr, float vsize, EParticeType type)
|
public CParticle(Basic Base, int PartyModeID, STexture texture, SColorF color, float x, float y, float size, float maxage, float z, float vx, float vy, float vr, float vsize, EParticeType type)
|
||||||
{
|
{
|
||||||
|
_PartyModeID = PartyModeID;
|
||||||
_Base = Base;
|
_Base = Base;
|
||||||
_TextureName = String.Empty;
|
_TextureName = String.Empty;
|
||||||
_Texture = texture;
|
_Texture = texture;
|
||||||
@@ -288,6 +291,7 @@ namespace Vocaluxe.Menu
|
|||||||
|
|
||||||
public class CParticleEffect
|
public class CParticleEffect
|
||||||
{
|
{
|
||||||
|
private int _PartyModeID;
|
||||||
private Basic _Base;
|
private Basic _Base;
|
||||||
private List<CParticle> _Stars;
|
private List<CParticle> _Stars;
|
||||||
private string _TextureName;
|
private string _TextureName;
|
||||||
@@ -316,8 +320,9 @@ namespace Vocaluxe.Menu
|
|||||||
set { _Area = value; }
|
set { _Area = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public CParticleEffect(Basic Base, int MaxNumber, SColorF Color, SRectF Area, string TextureName, float Size, EParticeType Type)
|
public CParticleEffect(Basic Base, int PartyModeID, int MaxNumber, SColorF Color, SRectF Area, string TextureName, float Size, EParticeType Type)
|
||||||
{
|
{
|
||||||
|
_PartyModeID = PartyModeID;
|
||||||
_Base = Base;
|
_Base = Base;
|
||||||
_Stars = new List<CParticle>();
|
_Stars = new List<CParticle>();
|
||||||
_Area = Area;
|
_Area = Area;
|
||||||
@@ -331,8 +336,9 @@ namespace Vocaluxe.Menu
|
|||||||
_NextSpawnTime = 0f;
|
_NextSpawnTime = 0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
public CParticleEffect(Basic Base, int MaxNumber, SColorF Color, SRectF Area, STexture texture, float Size, EParticeType Type)
|
public CParticleEffect(Basic Base, int PartyModeID, int MaxNumber, SColorF Color, SRectF Area, STexture texture, float Size, EParticeType Type)
|
||||||
{
|
{
|
||||||
|
_PartyModeID = PartyModeID;
|
||||||
_Base = Base;
|
_Base = Base;
|
||||||
_Stars = new List<CParticle>();
|
_Stars = new List<CParticle>();
|
||||||
_Area = Area;
|
_Area = Area;
|
||||||
@@ -439,14 +445,14 @@ namespace Vocaluxe.Menu
|
|||||||
CParticle star;
|
CParticle star;
|
||||||
if (_TextureName != String.Empty)
|
if (_TextureName != String.Empty)
|
||||||
{
|
{
|
||||||
star = new CParticle(_Base, _TextureName, _Color,
|
star = new CParticle(_Base, _PartyModeID, _TextureName, _Color,
|
||||||
_Base.Game.GetRandom(w) + _Area.X - size / 4f,
|
_Base.Game.GetRandom(w) + _Area.X - size / 4f,
|
||||||
_Base.Game.GetRandom(h) + _Area.Y - size / 4f,
|
_Base.Game.GetRandom(h) + _Area.Y - size / 4f,
|
||||||
size, lifetime, _Area.Z, vx, vy, vr, vsize, _Type);
|
size, lifetime, _Area.Z, vx, vy, vr, vsize, _Type);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
star = new CParticle(_Base, _Texture, _Color,
|
star = new CParticle(_Base, _PartyModeID, _Texture, _Color,
|
||||||
_Base.Game.GetRandom(w) + _Area.X - size / 4f,
|
_Base.Game.GetRandom(w) + _Area.X - size / 4f,
|
||||||
_Base.Game.GetRandom(h) + _Area.Y - size / 4f,
|
_Base.Game.GetRandom(h) + _Area.Y - size / 4f,
|
||||||
size, lifetime, _Area.Z, vx, vy, vr, vsize, _Type);
|
size, lifetime, _Area.Z, vx, vy, vr, vsize, _Type);
|
||||||
|
|||||||
@@ -132,7 +132,7 @@ namespace Vocaluxe.Menu
|
|||||||
Text1.Y += diffY;
|
Text1.Y += diffY;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
private int _PartyModeID;
|
||||||
private Basic _Base;
|
private Basic _Base;
|
||||||
private SThemePlaylist _Theme;
|
private SThemePlaylist _Theme;
|
||||||
private bool _ThemeLoaded;
|
private bool _ThemeLoaded;
|
||||||
@@ -191,20 +191,21 @@ namespace Vocaluxe.Menu
|
|||||||
|
|
||||||
//private static
|
//private static
|
||||||
|
|
||||||
public CPlaylist(Basic Base)
|
public CPlaylist(Basic Base, int PartyModeID)
|
||||||
{
|
{
|
||||||
|
_PartyModeID = PartyModeID;
|
||||||
_Base = Base;
|
_Base = Base;
|
||||||
_Theme = new SThemePlaylist();
|
_Theme = new SThemePlaylist();
|
||||||
_Theme.Text1 = new CText(_Base);
|
_Theme.Text1 = new CText(_Base, _PartyModeID);
|
||||||
_Theme.StaticCover = new CStatic(_Base);
|
_Theme.StaticCover = new CStatic(_Base, _PartyModeID);
|
||||||
_Theme.StaticPlaylistFooter = new CStatic(_Base);
|
_Theme.StaticPlaylistFooter = new CStatic(_Base, _PartyModeID);
|
||||||
_Theme.StaticPlaylistHeader = new CStatic(_Base);
|
_Theme.StaticPlaylistHeader = new CStatic(_Base, _PartyModeID);
|
||||||
_Theme.ButtonPlaylistName = new CButton(_Base);
|
_Theme.ButtonPlaylistName = new CButton(_Base, _PartyModeID);
|
||||||
_Theme.ButtonPlaylistClose = new CButton(_Base);
|
_Theme.ButtonPlaylistClose = new CButton(_Base, _PartyModeID);
|
||||||
_Theme.ButtonPlaylistDelete = new CButton(_Base);
|
_Theme.ButtonPlaylistDelete = new CButton(_Base, _PartyModeID);
|
||||||
_Theme.ButtonPlaylistSave = new CButton(_Base);
|
_Theme.ButtonPlaylistSave = new CButton(_Base, _PartyModeID);
|
||||||
_Theme.ButtonPlaylistSing = new CButton(_Base);
|
_Theme.ButtonPlaylistSing = new CButton(_Base, _PartyModeID);
|
||||||
_Theme.SelectSlideGameMode = new CSelectSlide(_Base);
|
_Theme.SelectSlideGameMode = new CSelectSlide(_Base, _PartyModeID);
|
||||||
|
|
||||||
CompleteRect = new SRectF();
|
CompleteRect = new SRectF();
|
||||||
Rect = new SRectF();
|
Rect = new SRectF();
|
||||||
@@ -1121,7 +1122,7 @@ namespace Vocaluxe.Menu
|
|||||||
{
|
{
|
||||||
PlaylistElement en = new PlaylistElement(_Base);
|
PlaylistElement en = new PlaylistElement(_Base);
|
||||||
|
|
||||||
en.Background = new CStatic(_Base, _Theme.TextureBackgroundName, BackgroundColor, new SRectF(Rect.X, Rect.Y + (i * _Theme.EntryHeight), Rect.W, _Theme.EntryHeight, Rect.Z));
|
en.Background = new CStatic(_Base, _PartyModeID, _Theme.TextureBackgroundName, BackgroundColor, new SRectF(Rect.X, Rect.Y + (i * _Theme.EntryHeight), Rect.W, _Theme.EntryHeight, Rect.Z));
|
||||||
|
|
||||||
en.Cover = new CStatic(_Theme.StaticCover);
|
en.Cover = new CStatic(_Theme.StaticCover);
|
||||||
en.Cover.Rect.Y += Rect.Y + (i * _Theme.EntryHeight);
|
en.Cover.Rect.Y += Rect.Y + (i * _Theme.EntryHeight);
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ namespace Vocaluxe.Menu
|
|||||||
|
|
||||||
public class CSelectSlide : IMenuElement, ICloneable
|
public class CSelectSlide : IMenuElement, ICloneable
|
||||||
{
|
{
|
||||||
|
private int _PartyModeID;
|
||||||
private Basic _Base;
|
private Basic _Base;
|
||||||
private SThemeSelectSlide _Theme;
|
private SThemeSelectSlide _Theme;
|
||||||
private bool _ThemeLoaded;
|
private bool _ThemeLoaded;
|
||||||
@@ -140,8 +141,9 @@ namespace Vocaluxe.Menu
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public CSelectSlide(Basic Base)
|
public CSelectSlide(Basic Base, int PartyModeID)
|
||||||
{
|
{
|
||||||
|
_PartyModeID = PartyModeID;
|
||||||
_Base = Base;
|
_Base = Base;
|
||||||
_Theme = new SThemeSelectSlide();
|
_Theme = new SThemeSelectSlide();
|
||||||
_ThemeLoaded = false;
|
_ThemeLoaded = false;
|
||||||
@@ -170,6 +172,7 @@ namespace Vocaluxe.Menu
|
|||||||
|
|
||||||
public CSelectSlide(CSelectSlide slide)
|
public CSelectSlide(CSelectSlide slide)
|
||||||
{
|
{
|
||||||
|
_PartyModeID = slide._PartyModeID;
|
||||||
_Base = slide._Base;
|
_Base = slide._Base;
|
||||||
_Theme = new SThemeSelectSlide();
|
_Theme = new SThemeSelectSlide();
|
||||||
|
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ namespace Vocaluxe.Menu
|
|||||||
|
|
||||||
public class CStatic : IMenuElement
|
public class CStatic : IMenuElement
|
||||||
{
|
{
|
||||||
|
private int _PartyModeID;
|
||||||
private Basic _Base;
|
private Basic _Base;
|
||||||
|
|
||||||
private SThemeStatic _Theme;
|
private SThemeStatic _Theme;
|
||||||
@@ -54,8 +55,9 @@ namespace Vocaluxe.Menu
|
|||||||
|
|
||||||
public EAspect Aspect = EAspect.Stretch;
|
public EAspect Aspect = EAspect.Stretch;
|
||||||
|
|
||||||
public CStatic(Basic Base)
|
public CStatic(Basic Base, int PartyModeID)
|
||||||
{
|
{
|
||||||
|
_PartyModeID = PartyModeID;
|
||||||
_Base = Base;
|
_Base = Base;
|
||||||
_Theme = new SThemeStatic();
|
_Theme = new SThemeStatic();
|
||||||
_ThemeLoaded = false;
|
_ThemeLoaded = false;
|
||||||
@@ -74,6 +76,7 @@ namespace Vocaluxe.Menu
|
|||||||
|
|
||||||
public CStatic(CStatic s)
|
public CStatic(CStatic s)
|
||||||
{
|
{
|
||||||
|
_PartyModeID = s._PartyModeID;
|
||||||
_Base = s._Base;
|
_Base = s._Base;
|
||||||
_Theme = new SThemeStatic();
|
_Theme = new SThemeStatic();
|
||||||
_ThemeLoaded = false;
|
_ThemeLoaded = false;
|
||||||
@@ -90,8 +93,9 @@ namespace Vocaluxe.Menu
|
|||||||
Visible = s.Visible;
|
Visible = s.Visible;
|
||||||
}
|
}
|
||||||
|
|
||||||
public CStatic(Basic Base, STexture texture, SColorF color, SRectF rect)
|
public CStatic(Basic Base, int PartyModeID, STexture texture, SColorF color, SRectF rect)
|
||||||
{
|
{
|
||||||
|
_PartyModeID = PartyModeID;
|
||||||
_Base = Base;
|
_Base = Base;
|
||||||
_Theme = new SThemeStatic();
|
_Theme = new SThemeStatic();
|
||||||
_ThemeLoaded = false;
|
_ThemeLoaded = false;
|
||||||
@@ -108,8 +112,9 @@ namespace Vocaluxe.Menu
|
|||||||
Visible = true;
|
Visible = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public CStatic(Basic Base, string TextureSkinName, SColorF color, SRectF rect)
|
public CStatic(Basic Base, int PartyModeID, string TextureSkinName, SColorF color, SRectF rect)
|
||||||
{
|
{
|
||||||
|
_PartyModeID = PartyModeID;
|
||||||
_Base = Base;
|
_Base = Base;
|
||||||
_Theme = new SThemeStatic();
|
_Theme = new SThemeStatic();
|
||||||
_Theme.TextureName = TextureSkinName;
|
_Theme.TextureName = TextureSkinName;
|
||||||
|
|||||||
@@ -231,13 +231,13 @@ namespace Vocaluxe.Menu
|
|||||||
|
|
||||||
public float Alpha = 1f;
|
public float Alpha = 1f;
|
||||||
|
|
||||||
public CText(Basic Base)
|
public CText(Basic Base, int PartyModeID)
|
||||||
{
|
{
|
||||||
_Base = Base;
|
_Base = Base;
|
||||||
_Theme = new SThemeText();
|
_Theme = new SThemeText();
|
||||||
_ThemeLoaded = false;
|
_ThemeLoaded = false;
|
||||||
_ButtonText = false;
|
_ButtonText = false;
|
||||||
_PartyModeID = -1;
|
_PartyModeID = PartyModeID;
|
||||||
|
|
||||||
X = 0f;
|
X = 0f;
|
||||||
Y = 0f;
|
Y = 0f;
|
||||||
@@ -695,7 +695,7 @@ namespace Vocaluxe.Menu
|
|||||||
|
|
||||||
public void Draw(float begin, float end)
|
public void Draw(float begin, float end)
|
||||||
{
|
{
|
||||||
RectangleF bounds = _Base.Drawing.GetTextBounds(this);
|
RectangleF bounds = _Base.Fonts.GetTextBounds(this, this.Height);
|
||||||
|
|
||||||
float x = X;
|
float x = X;
|
||||||
switch (Align)
|
switch (Align)
|
||||||
@@ -755,7 +755,10 @@ namespace Vocaluxe.Menu
|
|||||||
float x = X + rx;
|
float x = X + rx;
|
||||||
float y = Y + ry;
|
float y = Y + ry;
|
||||||
|
|
||||||
RectangleF bounds = _Base.Drawing.GetTextBounds(this);
|
_Base.Fonts.SetFont(Fon);
|
||||||
|
_Base.Fonts.SetStyle(Style);
|
||||||
|
|
||||||
|
RectangleF bounds = _Base.Fonts.GetTextBounds(this, this.Height);
|
||||||
|
|
||||||
if (bounds.Width > Bounds.W && Bounds.W > 0f && bounds.Width > 0f)
|
if (bounds.Width > Bounds.W && Bounds.W > 0f && bounds.Width > 0f)
|
||||||
{
|
{
|
||||||
@@ -801,7 +804,7 @@ namespace Vocaluxe.Menu
|
|||||||
|
|
||||||
_Base.Fonts.SetFont(Fon);
|
_Base.Fonts.SetFont(Fon);
|
||||||
_Base.Fonts.SetStyle(Style);
|
_Base.Fonts.SetStyle(Style);
|
||||||
|
|
||||||
if (!EditMode)
|
if (!EditMode)
|
||||||
_Base.Fonts.DrawText(_Text, h, x, y, Z, color);
|
_Base.Fonts.DrawText(_Text, h, x, y, Z, color);
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ namespace Vocaluxe.Menu.SingNotes
|
|||||||
|
|
||||||
public abstract class CSingNotes : ISingNotes, IMenuElement
|
public abstract class CSingNotes : ISingNotes, IMenuElement
|
||||||
{
|
{
|
||||||
|
protected int _PartyModeID;
|
||||||
private Basic _Base;
|
private Basic _Base;
|
||||||
private SThemeSingBar _Theme;
|
private SThemeSingBar _Theme;
|
||||||
private bool _ThemeLoaded;
|
private bool _ThemeLoaded;
|
||||||
@@ -63,8 +64,9 @@ namespace Vocaluxe.Menu.SingNotes
|
|||||||
set { _BarPos = value; }
|
set { _BarPos = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public CSingNotes(Basic Base)
|
public CSingNotes(Basic Base, int PartyModeID)
|
||||||
{
|
{
|
||||||
|
_PartyModeID = PartyModeID;
|
||||||
_Base = Base;
|
_Base = Base;
|
||||||
_Theme = new SThemeSingBar();
|
_Theme = new SThemeSingBar();
|
||||||
_ThemeLoaded = false;
|
_ThemeLoaded = false;
|
||||||
@@ -618,7 +620,7 @@ namespace Vocaluxe.Menu.SingNotes
|
|||||||
);
|
);
|
||||||
|
|
||||||
int numstars = (int)(r.W * 0.25f);
|
int numstars = (int)(r.W * 0.25f);
|
||||||
CParticleEffect stars = new CParticleEffect(_Base, numstars, new SColorF(1f, 1f, 0f, 1f), r, _Theme.SkinGoldenStarName, 20, EParticeType.Star);
|
CParticleEffect stars = new CParticleEffect(_Base, _PartyModeID, numstars, new SColorF(1f, 1f, 0f, 1f), r, _Theme.SkinGoldenStarName, 20, EParticeType.Star);
|
||||||
_PlayerNotes[n].GoldenStars.Add(stars);
|
_PlayerNotes[n].GoldenStars.Add(stars);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -646,7 +648,7 @@ namespace Vocaluxe.Menu.SingNotes
|
|||||||
Rect.Z
|
Rect.Z
|
||||||
);
|
);
|
||||||
|
|
||||||
CParticleEffect flares = new CParticleEffect(_Base, 15, new SColorF(1f, 1f, 1f, 1f), r, _Theme.SkinGoldenStarName, 20, EParticeType.Flare);
|
CParticleEffect flares = new CParticleEffect(_Base, _PartyModeID, 15, new SColorF(1f, 1f, 1f, 1f), r, _Theme.SkinGoldenStarName, 20, EParticeType.Flare);
|
||||||
_PlayerNotes[n].Flares.Add(flares);
|
_PlayerNotes[n].Flares.Add(flares);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -686,13 +688,13 @@ namespace Vocaluxe.Menu.SingNotes
|
|||||||
Rect.Z
|
Rect.Z
|
||||||
);
|
);
|
||||||
|
|
||||||
CParticleEffect stars = new CParticleEffect(_Base, _Base.Game.GetRandom(2) + 1, new SColorF(1f, 1f, 1f, 1f), r, _Theme.SkinPerfectNoteStarName, 35, EParticeType.PerfNoteStar);
|
CParticleEffect stars = new CParticleEffect(_Base, _PartyModeID, _Base.Game.GetRandom(2) + 1, new SColorF(1f, 1f, 1f, 1f), r, _Theme.SkinPerfectNoteStarName, 35, EParticeType.PerfNoteStar);
|
||||||
_PlayerNotes[n].PerfectNoteEffect.Add(stars);
|
_PlayerNotes[n].PerfectNoteEffect.Add(stars);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void AddPerfectLine(int n)
|
private void AddPerfectLine(int n)
|
||||||
{
|
{
|
||||||
CParticleEffect twinkle = new CParticleEffect(_Base, 200, _PlayerNotes[n].Color, _PlayerNotes[n].Rect, _Theme.SkinGoldenStarName, 25, EParticeType.Twinkle);
|
CParticleEffect twinkle = new CParticleEffect(_Base, _PartyModeID, 200, _PlayerNotes[n].Color, _PlayerNotes[n].Rect, _Theme.SkinGoldenStarName, 25, EParticeType.Twinkle);
|
||||||
_PlayerNotes[n].PerfectLineTwinkle.Add(twinkle);
|
_PlayerNotes[n].PerfectLineTwinkle.Add(twinkle);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ namespace Vocaluxe.Menu.SingNotes
|
|||||||
{
|
{
|
||||||
private Basic _Base;
|
private Basic _Base;
|
||||||
|
|
||||||
public CSingNotesClassic(Basic Base)
|
public CSingNotesClassic(Basic Base, int PartyModeID)
|
||||||
: base(Base)
|
: base(Base, PartyModeID)
|
||||||
{
|
{
|
||||||
_Base = Base;
|
_Base = Base;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,13 +11,15 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
{
|
{
|
||||||
public class CSongMenu : ISongMenu
|
public class CSongMenu : ISongMenu
|
||||||
{
|
{
|
||||||
|
private int _PartyModeID;
|
||||||
private Basic _Base;
|
private Basic _Base;
|
||||||
|
|
||||||
private ISongMenu _SongMenu;
|
private ISongMenu _SongMenu;
|
||||||
private ESongMenu _Type;
|
private ESongMenu _Type;
|
||||||
|
|
||||||
public CSongMenu(Basic Base)
|
public CSongMenu(Basic Base, int PartyModeID)
|
||||||
{
|
{
|
||||||
|
_PartyModeID = PartyModeID;
|
||||||
_Base = Base;
|
_Base = Base;
|
||||||
CreateSongMenu();
|
CreateSongMenu();
|
||||||
}
|
}
|
||||||
@@ -218,7 +220,7 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
// break;
|
// break;
|
||||||
|
|
||||||
case ESongMenu.TR_CONFIG_TILE_BOARD:
|
case ESongMenu.TR_CONFIG_TILE_BOARD:
|
||||||
_SongMenu = new CSongMenuTileBoard(_Base);
|
_SongMenu = new CSongMenuTileBoard(_Base, _PartyModeID);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
//case ESongMenu.TR_CONFIG_BOOK:
|
//case ESongMenu.TR_CONFIG_BOOK:
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
{
|
{
|
||||||
new private Basic _Base;
|
new private Basic _Base;
|
||||||
|
|
||||||
public CSongMenuBook(Basic Base)
|
public CSongMenuBook(Basic Base, int PartyModeID)
|
||||||
: base(Base)
|
: base(Base, PartyModeID)
|
||||||
{
|
{
|
||||||
_Base = Base;
|
_Base = Base;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,8 +29,8 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public CSongMenuDreidel(Basic Base)
|
public CSongMenuDreidel(Basic Base, int PartyModeID)
|
||||||
: base(Base)
|
: base(Base, PartyModeID)
|
||||||
{
|
{
|
||||||
_Base = Base;
|
_Base = Base;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -91,6 +91,7 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
|
|
||||||
abstract class CSongMenuFramework : ISongMenu
|
abstract class CSongMenuFramework : ISongMenu
|
||||||
{
|
{
|
||||||
|
protected int _PartyModeID;
|
||||||
protected Basic _Base;
|
protected Basic _Base;
|
||||||
protected SThemeSongMenu _Theme;
|
protected SThemeSongMenu _Theme;
|
||||||
private bool _ThemeLoaded;
|
private bool _ThemeLoaded;
|
||||||
@@ -233,21 +234,22 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
_Visible = Visible;
|
_Visible = Visible;
|
||||||
}
|
}
|
||||||
|
|
||||||
public CSongMenuFramework(Basic Base)
|
public CSongMenuFramework(Basic Base, int PartyModeID)
|
||||||
{
|
{
|
||||||
|
_PartyModeID = PartyModeID;
|
||||||
_Base = Base;
|
_Base = Base;
|
||||||
_Theme = new SThemeSongMenu();
|
_Theme = new SThemeSongMenu();
|
||||||
|
|
||||||
_Theme.songMenuTileBoard.TextArtist = new CText(_Base);
|
_Theme.songMenuTileBoard.TextArtist = new CText(_Base, _PartyModeID);
|
||||||
_Theme.songMenuTileBoard.TextTitle = new CText(_Base);
|
_Theme.songMenuTileBoard.TextTitle = new CText(_Base, _PartyModeID);
|
||||||
_Theme.songMenuTileBoard.TextSongLength = new CText(_Base);
|
_Theme.songMenuTileBoard.TextSongLength = new CText(_Base, _PartyModeID);
|
||||||
|
|
||||||
_Theme.songMenuTileBoard.StaticCoverBig = new CStatic(_Base);
|
_Theme.songMenuTileBoard.StaticCoverBig = new CStatic(_Base, _PartyModeID);
|
||||||
_Theme.songMenuTileBoard.StaticTextBG = new CStatic(_Base);
|
_Theme.songMenuTileBoard.StaticTextBG = new CStatic(_Base, _PartyModeID);
|
||||||
_Theme.songMenuTileBoard.StaticDuetIcon = new CStatic(_Base);
|
_Theme.songMenuTileBoard.StaticDuetIcon = new CStatic(_Base, _PartyModeID);
|
||||||
_Theme.songMenuTileBoard.StaticVideoIcon = new CStatic(_Base);
|
_Theme.songMenuTileBoard.StaticVideoIcon = new CStatic(_Base, _PartyModeID);
|
||||||
_Theme.songMenuTileBoard.StaticMedleyCalcIcon = new CStatic(_Base);
|
_Theme.songMenuTileBoard.StaticMedleyCalcIcon = new CStatic(_Base, _PartyModeID);
|
||||||
_Theme.songMenuTileBoard.StaticMedleyTagIcon = new CStatic(_Base);
|
_Theme.songMenuTileBoard.StaticMedleyTagIcon = new CStatic(_Base, _PartyModeID);
|
||||||
|
|
||||||
_ThemeLoaded = false;
|
_ThemeLoaded = false;
|
||||||
}
|
}
|
||||||
@@ -540,7 +542,7 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
|
|
||||||
public virtual CStatic GetSelectedSongCover()
|
public virtual CStatic GetSelectedSongCover()
|
||||||
{
|
{
|
||||||
return new CStatic(_Base);
|
return new CStatic(_Base, _PartyModeID);
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual int GetSelectedCategory()
|
public virtual int GetSelectedCategory()
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
{
|
{
|
||||||
new private Basic _Base;
|
new private Basic _Base;
|
||||||
|
|
||||||
public CSongMenuList(Basic Base)
|
public CSongMenuList(Basic Base, int PartyModeID)
|
||||||
: base(Base)
|
: base(Base, PartyModeID)
|
||||||
{
|
{
|
||||||
_Base = Base;
|
_Base = Base;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,8 +42,8 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
|
|
||||||
private bool _SmallView = false;
|
private bool _SmallView = false;
|
||||||
|
|
||||||
public CSongMenuTileBoard(Basic Base)
|
public CSongMenuTileBoard(Basic Base, int PartyModeID)
|
||||||
: base(Base)
|
: base(Base, PartyModeID)
|
||||||
{
|
{
|
||||||
_Base = Base;
|
_Base = Base;
|
||||||
}
|
}
|
||||||
@@ -79,7 +79,7 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
{
|
{
|
||||||
SRectF rect = new SRectF(_Theme.songMenuTileBoard.TileRect.X + j * (_TileW + _SpaceW),
|
SRectF rect = new SRectF(_Theme.songMenuTileBoard.TileRect.X + j * (_TileW + _SpaceW),
|
||||||
_Theme.songMenuTileBoard.TileRect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, _Rect.Z);
|
_Theme.songMenuTileBoard.TileRect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, _Rect.Z);
|
||||||
CStatic tile = new CStatic(_Base, _CoverTexture, Color, rect);
|
CStatic tile = new CStatic(_Base, _PartyModeID, _CoverTexture, Color, rect);
|
||||||
_Tiles.Add(tile);
|
_Tiles.Add(tile);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -523,7 +523,7 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
if (tile.Selected)
|
if (tile.Selected)
|
||||||
return new CStatic(tile);
|
return new CStatic(tile);
|
||||||
}
|
}
|
||||||
return new CStatic(_Base);
|
return new CStatic(_Base, _PartyModeID);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void SetSelectedSong(int VisibleSongNr)
|
public override void SetSelectedSong(int VisibleSongNr)
|
||||||
@@ -776,7 +776,7 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
{
|
{
|
||||||
SRectF rect = new SRectF(_Theme.songMenuTileBoard.TileRectSmall.X + j * (_TileW + _SpaceW),
|
SRectF rect = new SRectF(_Theme.songMenuTileBoard.TileRectSmall.X + j * (_TileW + _SpaceW),
|
||||||
_Theme.songMenuTileBoard.TileRectSmall.Y + i * (_TileH + _SpaceH), _TileW, _TileH, _Rect.Z);
|
_Theme.songMenuTileBoard.TileRectSmall.Y + i * (_TileH + _SpaceH), _TileW, _TileH, _Rect.Z);
|
||||||
CStatic tile = new CStatic(_Base, _CoverTexture, Color, rect);
|
CStatic tile = new CStatic(_Base, _PartyModeID, _CoverTexture, Color, rect);
|
||||||
_Tiles.Add(tile);
|
_Tiles.Add(tile);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -802,7 +802,7 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
{
|
{
|
||||||
SRectF rect = new SRectF(_Theme.songMenuTileBoard.TileRect.X + j * (_TileW + _SpaceW),
|
SRectF rect = new SRectF(_Theme.songMenuTileBoard.TileRect.X + j * (_TileW + _SpaceW),
|
||||||
_Theme.songMenuTileBoard.TileRect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, _Rect.Z);
|
_Theme.songMenuTileBoard.TileRect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, _Rect.Z);
|
||||||
CStatic tile = new CStatic(_Base, _CoverTexture, Color, rect);
|
CStatic tile = new CStatic(_Base, _PartyModeID, _CoverTexture, Color, rect);
|
||||||
_Tiles.Add(tile);
|
_Tiles.Add(tile);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user