Skip to content

Commit

Permalink
Set default bganimations Preference to Off
Browse files Browse the repository at this point in the history
Pending removal of the whole feature, setting this to on by default caused odd issues for inexperienced players.
  • Loading branch information
poco0317 committed Jun 9, 2019
1 parent 68be106 commit c4acf2a
Showing 1 changed file with 16 additions and 12 deletions.
28 changes: 16 additions & 12 deletions src/Etterna/Actor/Gameplay/Background.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ static Preference<bool> g_bShowDanger("ShowDanger", false);
static Preference<float> g_fBGBrightness("BGBrightness", 0.2f);
static Preference<RandomBackgroundMode> g_RandomBackgroundMode(
"RandomBackgroundMode",
BGMODE_RANDOMMOVIES);
BGMODE_OFF);
static Preference<int> g_iNumBackgrounds("NumBackgrounds", 10);
static Preference<bool> g_bSongBackgrounds("SongBackgrounds", true);

Expand Down Expand Up @@ -230,7 +230,7 @@ BackgroundImpl::Init()

// bool bOneOrMoreChars = false;
// if (bOneOrMoreChars && SHOW_DANCING_CHARACTERS)
// m_pDancingCharacters = new DancingCharacters;
// m_pDancingCharacters = new DancingCharacters;

RageColor c = GetBrightnessColor(0);

Expand Down Expand Up @@ -938,8 +938,8 @@ bool
BackgroundImpl::IsDangerAllVisible()
{
// The players are never in danger in FAIL_OFF.
if (GAMESTATE->GetPlayerFailType(GAMESTATE->m_pPlayerState) ==
FailType_Off) return false;
if (GAMESTATE->GetPlayerFailType(GAMESTATE->m_pPlayerState) == FailType_Off)
return false;
if (!g_bShowDanger)
return false;

Expand All @@ -955,9 +955,11 @@ BrightnessOverlay::BrightnessOverlay()
{
float fQuadWidth = (RIGHT_EDGE - LEFT_EDGE);

m_quadBGBrightness.StretchTo( RectF(LEFT_EDGE,TOP_EDGE,LEFT_EDGE+fQuadWidth,BOTTOM_EDGE) );
m_quadBGBrightnessFade.StretchTo( RectF(LEFT_EDGE+fQuadWidth,TOP_EDGE,RIGHT_EDGE-fQuadWidth,BOTTOM_EDGE) );

m_quadBGBrightness.StretchTo(
RectF(LEFT_EDGE, TOP_EDGE, LEFT_EDGE + fQuadWidth, BOTTOM_EDGE));
m_quadBGBrightnessFade.StretchTo(RectF(
LEFT_EDGE + fQuadWidth, TOP_EDGE, RIGHT_EDGE - fQuadWidth, BOTTOM_EDGE));

m_quadBGBrightness.SetName("BrightnessOverlay");
ActorUtil::LoadAllCommands(m_quadBGBrightness, "Background");
this->AddChild(&m_quadBGBrightness);
Expand All @@ -982,8 +984,10 @@ BrightnessOverlay::Update(float fDeltaTime)
void
BrightnessOverlay::SetActualBrightness()
{
float fLeftBrightness = 1-GAMESTATE->m_pPlayerState->m_PlayerOptions.GetCurrent().m_fCover;
float fRightBrightness = 1-GAMESTATE->m_pPlayerState->m_PlayerOptions.GetCurrent().m_fCover;
float fLeftBrightness =
1 - GAMESTATE->m_pPlayerState->m_PlayerOptions.GetCurrent().m_fCover;
float fRightBrightness =
1 - GAMESTATE->m_pPlayerState->m_PlayerOptions.GetCurrent().m_fCover;

float fBaseBGBrightness = g_fBGBrightness;

Expand All @@ -1005,9 +1009,9 @@ BrightnessOverlay::SetActualBrightness()
RageColor LeftColor = GetBrightnessColor(fLeftBrightness);
RageColor RightColor = GetBrightnessColor(fRightBrightness);

m_quadBGBrightness.SetDiffuse( LeftColor );
m_quadBGBrightnessFade.SetDiffuseLeftEdge( LeftColor );
m_quadBGBrightnessFade.SetDiffuseRightEdge( RightColor );
m_quadBGBrightness.SetDiffuse(LeftColor);
m_quadBGBrightnessFade.SetDiffuseLeftEdge(LeftColor);
m_quadBGBrightnessFade.SetDiffuseRightEdge(RightColor);
}

void
Expand Down

0 comments on commit c4acf2a

Please sign in to comment.