Allow for displaying the chart artist separately.
This defaults to false/off right now. It needs testing.
This commit is contained in:
@@ -21,6 +21,8 @@ sm-ssc v1.2.3 | 2011022?
|
|||||||
require them. [Wolfman2000]
|
require them. [Wolfman2000]
|
||||||
* [ArrowEffects] Allow for dizzy hold heads. Again, enable at your own risk.
|
* [ArrowEffects] Allow for dizzy hold heads. Again, enable at your own risk.
|
||||||
[Wolfman2000]
|
[Wolfman2000]
|
||||||
|
* [StepsDisplay] Allow for displaying the chart artist in a separate field.
|
||||||
|
This defaults to false for the moment. [Wolfman2000]
|
||||||
|
|
||||||
20110227
|
20110227
|
||||||
--------
|
--------
|
||||||
|
|||||||
@@ -1260,6 +1260,13 @@ DescriptionOnCommand=
|
|||||||
DescriptionOffCommand=
|
DescriptionOffCommand=
|
||||||
DescriptionSetCommand=
|
DescriptionSetCommand=
|
||||||
#
|
#
|
||||||
|
ShowCredit=false
|
||||||
|
CreditX=0
|
||||||
|
CreditY=0
|
||||||
|
CreditOnCommand=
|
||||||
|
CreditOffCommand=
|
||||||
|
CreditSetCommand=
|
||||||
|
#
|
||||||
ShowAutogen=false
|
ShowAutogen=false
|
||||||
AutogenSetCommand=
|
AutogenSetCommand=
|
||||||
#
|
#
|
||||||
@@ -2048,6 +2055,11 @@ DescriptionX=-10
|
|||||||
DescriptionY=0
|
DescriptionY=0
|
||||||
DescriptionOnCommand=shadowlength,0;uppercase,true;
|
DescriptionOnCommand=shadowlength,0;uppercase,true;
|
||||||
DescriptionSetCommand=%function(self,param) if param.CustomDifficulty then self:diffuse(CustomDifficultyToLightColor(param.CustomDifficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); end end
|
DescriptionSetCommand=%function(self,param) if param.CustomDifficulty then self:diffuse(CustomDifficultyToLightColor(param.CustomDifficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); end end
|
||||||
|
ShowCredit=false
|
||||||
|
CreditX=0
|
||||||
|
CreditY=0
|
||||||
|
CreditOnCommand=
|
||||||
|
CreditSetCommand=
|
||||||
ShowAutogen=true
|
ShowAutogen=true
|
||||||
AutogenX=40
|
AutogenX=40
|
||||||
AutogenY=0
|
AutogenY=0
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ void StepsDisplay::Load( const RString &sMetricsGroup, const PlayerState *pPlaye
|
|||||||
m_bShowTicks.Load(m_sMetricsGroup,"ShowTicks");
|
m_bShowTicks.Load(m_sMetricsGroup,"ShowTicks");
|
||||||
m_bShowMeter.Load(m_sMetricsGroup,"ShowMeter");
|
m_bShowMeter.Load(m_sMetricsGroup,"ShowMeter");
|
||||||
m_bShowDescription.Load(m_sMetricsGroup,"ShowDescription");
|
m_bShowDescription.Load(m_sMetricsGroup,"ShowDescription");
|
||||||
|
m_bShowCredit.Load(m_sMetricsGroup,"ShowCredit");
|
||||||
m_bShowAutogen.Load(m_sMetricsGroup,"ShowAutogen");
|
m_bShowAutogen.Load(m_sMetricsGroup,"ShowAutogen");
|
||||||
m_bShowStepsType.Load(m_sMetricsGroup,"ShowStepsType");
|
m_bShowStepsType.Load(m_sMetricsGroup,"ShowStepsType");
|
||||||
m_sZeroMeterString.Load(m_sMetricsGroup,"ZeroMeterString");
|
m_sZeroMeterString.Load(m_sMetricsGroup,"ZeroMeterString");
|
||||||
@@ -91,6 +92,13 @@ void StepsDisplay::Load( const RString &sMetricsGroup, const PlayerState *pPlaye
|
|||||||
ActorUtil::LoadAllCommandsAndSetXYAndOnCommand( m_textDescription, m_sMetricsGroup );
|
ActorUtil::LoadAllCommandsAndSetXYAndOnCommand( m_textDescription, m_sMetricsGroup );
|
||||||
this->AddChild( &m_textDescription );
|
this->AddChild( &m_textDescription );
|
||||||
}
|
}
|
||||||
|
if( m_bShowCredit )
|
||||||
|
{
|
||||||
|
m_textAuthor.SetName( "Step Author" );
|
||||||
|
m_textAuthor.LoadFromFont( THEME->GetPathF(m_sMetricsGroup,"Credit") );
|
||||||
|
ActorUtil::LoadAllCommandsAndSetXYAndOnCommand( m_textAuthor, m_sMetricsGroup );
|
||||||
|
this->AddChild( &m_textAuthor );
|
||||||
|
}
|
||||||
|
|
||||||
if( m_bShowAutogen )
|
if( m_bShowAutogen )
|
||||||
{
|
{
|
||||||
@@ -197,6 +205,10 @@ void StepsDisplay::SetInternal( const SetParams ¶ms )
|
|||||||
sDisplayDescription = CustomDifficultyToLocalizedString( sCustomDifficulty );
|
sDisplayDescription = CustomDifficultyToLocalizedString( sCustomDifficulty );
|
||||||
msg.SetParam( "DisplayDescription", sDisplayDescription );
|
msg.SetParam( "DisplayDescription", sDisplayDescription );
|
||||||
|
|
||||||
|
RString sDisplayCredit;
|
||||||
|
if( params.pSteps )
|
||||||
|
sDisplayCredit = params.pSteps->GetCredit();
|
||||||
|
|
||||||
if( params.pSteps )
|
if( params.pSteps )
|
||||||
msg.SetParam( "Steps", LuaReference::CreateFromPush(*(Steps*)params.pSteps) );
|
msg.SetParam( "Steps", LuaReference::CreateFromPush(*(Steps*)params.pSteps) );
|
||||||
if( params.pTrail )
|
if( params.pTrail )
|
||||||
@@ -241,6 +253,11 @@ void StepsDisplay::SetInternal( const SetParams ¶ms )
|
|||||||
m_textDescription.SetText( sDisplayDescription );
|
m_textDescription.SetText( sDisplayDescription );
|
||||||
m_textDescription.HandleMessage( msg );
|
m_textDescription.HandleMessage( msg );
|
||||||
}
|
}
|
||||||
|
if( m_bShowCredit )
|
||||||
|
{
|
||||||
|
m_textAuthor.SetText( sDisplayCredit );
|
||||||
|
m_textAuthor.HandleMessage( msg );
|
||||||
|
}
|
||||||
|
|
||||||
if( m_bShowAutogen )
|
if( m_bShowAutogen )
|
||||||
{
|
{
|
||||||
|
|||||||
+12
-4
@@ -1,5 +1,3 @@
|
|||||||
/* StepsDisplay - A graphical representation of a Steps or a Trail - has a difficulty number, meter, text, edit description. */
|
|
||||||
|
|
||||||
#ifndef StepsDisplay_H
|
#ifndef StepsDisplay_H
|
||||||
#define StepsDisplay_H
|
#define StepsDisplay_H
|
||||||
|
|
||||||
@@ -16,7 +14,10 @@
|
|||||||
class Steps;
|
class Steps;
|
||||||
class Trail;
|
class Trail;
|
||||||
class PlayerState;
|
class PlayerState;
|
||||||
|
/**
|
||||||
|
* @brief A graphical representation of a Steps or a Trail.
|
||||||
|
*
|
||||||
|
* It has a difficulty number, meter, text, and an edit description. */
|
||||||
class StepsDisplay : public ActorFrame
|
class StepsDisplay : public ActorFrame
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
@@ -52,7 +53,13 @@ private:
|
|||||||
AutoActor m_sprFrame;
|
AutoActor m_sprFrame;
|
||||||
BitmapText m_textTicks; // 111100000
|
BitmapText m_textTicks; // 111100000
|
||||||
BitmapText m_textMeter; // 3, 9
|
BitmapText m_textMeter; // 3, 9
|
||||||
BitmapText m_textDescription; // Easy, Medium, SuperCoolEdit
|
/**
|
||||||
|
* @brief The description of the chart.
|
||||||
|
*
|
||||||
|
* This is meant to be separate from the author of the chart. */
|
||||||
|
BitmapText m_textDescription;
|
||||||
|
/** @brief The author of the chart. */
|
||||||
|
BitmapText m_textAuthor;
|
||||||
AutoActor m_sprAutogen; // visible if Steps and is autogen'd
|
AutoActor m_sprAutogen; // visible if Steps and is autogen'd
|
||||||
AutoActor m_sprStepsType;
|
AutoActor m_sprStepsType;
|
||||||
|
|
||||||
@@ -61,6 +68,7 @@ private:
|
|||||||
ThemeMetric<bool> m_bShowTicks;
|
ThemeMetric<bool> m_bShowTicks;
|
||||||
ThemeMetric<bool> m_bShowMeter;
|
ThemeMetric<bool> m_bShowMeter;
|
||||||
ThemeMetric<bool> m_bShowDescription;
|
ThemeMetric<bool> m_bShowDescription;
|
||||||
|
ThemeMetric<bool> m_bShowCredit;
|
||||||
ThemeMetric<bool> m_bShowAutogen;
|
ThemeMetric<bool> m_bShowAutogen;
|
||||||
ThemeMetric<bool> m_bShowStepsType;
|
ThemeMetric<bool> m_bShowStepsType;
|
||||||
ThemeMetric<RString> m_sZeroMeterString;
|
ThemeMetric<RString> m_sZeroMeterString;
|
||||||
|
|||||||
Reference in New Issue
Block a user