diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 9d5256cde4..def909c69c 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1843,6 +1843,11 @@ Label4OffsetY=66 Label5OffsetX=120 // chaos Label5OffsetY=-20 DisableRadar=0 // turn this to 1 if you are experiencing trouble with the groove radar (voodoo3's) +LabelOnCommand=addx,-100;zoom,1.5;diffuse,1,1,1,0;sleep,0.6f +LabelOnDelay=0.2 +// begin fading on screen and fly to the right +LabelOnCommandPostDelay=linear,0.1f;glow,1,1,1,1;accelerate,0.3;addx,100;zoom,1;diffuse,1,1,1,1;glow,1,1,1,0 + [GrooveGraph] EdgeWidth= diff --git a/stepmania/src/GrooveRadar.cpp b/stepmania/src/GrooveRadar.cpp index f8439c79c7..9f12e12f20 100644 --- a/stepmania/src/GrooveRadar.cpp +++ b/stepmania/src/GrooveRadar.cpp @@ -22,9 +22,12 @@ #include -#define LABEL_OFFSET_X( i ) THEME->GetMetricF("GrooveRadar",ssprintf("Label%dOffsetX",i+1)) -#define LABEL_OFFSET_Y( i ) THEME->GetMetricF("GrooveRadar",ssprintf("Label%dOffsetY",i+1)) -#define DISABLE_RADAR THEME->GetMetricI("GrooveRadar","DisableRadar") +#define LABEL_OFFSET_X( i ) THEME->GetMetricF("GrooveRadar",ssprintf("Label%dOffsetX",i+1)) +#define LABEL_OFFSET_Y( i ) THEME->GetMetricF("GrooveRadar",ssprintf("Label%dOffsetY",i+1)) +#define LABEL_ON_COMMAND THEME->GetMetric ("GrooveRadar","LabelOnCommand") +#define LABEL_ON_DELAY THEME->GetMetricF("GrooveRadar","LabelOnDelay") +#define LABEL_ON_COMMAND_POST_DELAY THEME->GetMetric ("GrooveRadar","LabelOnCommandPostDelay") +#define DISABLE_RADAR THEME->GetMetricI("GrooveRadar","DisableRadar") float RADAR_VALUE_ROTATION( int iValueIndex ) { return PI/2 + PI*2 / 5.0f * iValueIndex; } @@ -49,21 +52,10 @@ void GrooveRadar::TweenOnScreen() { for( int c=0; c