diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj index 076b551dbd..f0b90ea0c0 100644 --- a/stepmania/src/StepMania.vcproj +++ b/stepmania/src/StepMania.vcproj @@ -959,12 +959,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ - - - - diff --git a/stepmania/src/TransitionBackWipe.cpp b/stepmania/src/TransitionBackWipe.cpp deleted file mode 100644 index 10f9f66dff..0000000000 --- a/stepmania/src/TransitionBackWipe.cpp +++ /dev/null @@ -1,82 +0,0 @@ -#include "global.h" -/* ------------------------------------------------------------------------------ - Class: TransitionBackWipe - - Desc: See header. - - Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. - Chris Danford ------------------------------------------------------------------------------ -*/ - -#include "TransitionBackWipe.h" -#include "RageUtil.h" -#include "PrefsManager.h" -#include "ThemeManager.h" -#include "GameConstantsAndTypes.h" - - -#define RECTANGLE_WIDTH 20 -#define NUM_RECTANGLES (SCREEN_WIDTH/RECTANGLE_WIDTH) -#define FADE_RECTS_WIDE (NUM_RECTANGLES/4) // number of rects from fade start to fade end - - -TransitionBackWipe::TransitionBackWipe() -{ - m_soundBack.Load( THEME->GetPathTo("Sounds","menu back") ); -} - -void TransitionBackWipe::DrawPrimitives() -{ - if( m_TransitionState == opened ) - return; - - ///////////////////////// - // draw rectangles that get progressively smaller at the edge of the wipe - ///////////////////////// - bool bLeftEdgeIsDarker = m_TransitionState == opening_left || m_TransitionState == closing_right; - bool bFadeIsMovingLeft = m_TransitionState == opening_left || m_TransitionState == closing_left; - - double fPercentComplete = m_fPercentThroughTransition; - double fPercentAlongScreen = bFadeIsMovingLeft ? 1-fPercentComplete : fPercentComplete; - - int iFadeLeftEdge = (int) - (-FADE_RECTS_WIDE + (NUM_RECTANGLES + FADE_RECTS_WIDE) * fPercentAlongScreen); - int iFadeRightEdge = (int) - (0 + (NUM_RECTANGLES + FADE_RECTS_WIDE) * fPercentAlongScreen); - - // draw all rectangles - for( int i=0; i iFadeRightEdge ) - iRectWidth = bLeftEdgeIsDarker ? 0 : RECTANGLE_WIDTH; - //iRectWidth = 0; - else // this is a fading rectangle - { - int iRectsFromLeftFadeEdge = i - iFadeLeftEdge; - double fPercentAlongFade = iRectsFromLeftFadeEdge / (double)FADE_RECTS_WIDE; - double fPercentDarkness = bLeftEdgeIsDarker ? 1-fPercentAlongFade : fPercentAlongFade; - iRectWidth = (int)(RECTANGLE_WIDTH * fPercentDarkness); - - } - - if( iRectWidth > 0 ) - if( i == iFadeLeftEdge || i == iFadeRightEdge ) - { - m_quad.SetXY( (float)iRectX, CENTER_Y ); - m_quad.SetZoomX( (float)iRectWidth ); - m_quad.SetZoomY( SCREEN_HEIGHT ); - m_quad.SetDiffuse( RageColor(0,0,0,1) ); - m_quad.Draw(); - } - } // end foreach rect -} - - diff --git a/stepmania/src/TransitionBackWipe.h b/stepmania/src/TransitionBackWipe.h deleted file mode 100644 index 9fc975d436..0000000000 --- a/stepmania/src/TransitionBackWipe.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef TRANSITIONBACKWIPE_H -#define TRANSITIONBACKWIPE_H -/* ------------------------------------------------------------------------------ - Class: TransitionBackWipe - - Desc: Black bands (horizontal window blinds) gradually close. - - Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. - Chris Danford ------------------------------------------------------------------------------ -*/ - -#include "Transition.h" -#include "Quad.h" - - -class TransitionBackWipe : public Transition -{ -public: - TransitionBackWipe(); - virtual void DrawPrimitives(); - - virtual void CloseWipingRight(ScreenMessage send_when_done = SM_None ) - { - m_soundBack.Play(); - Transition::CloseWipingRight(send_when_done); - } - virtual void CloseWipingLeft( ScreenMessage send_when_done = SM_None ) - { - m_soundBack.Play(); - Transition::CloseWipingLeft(send_when_done); - } - -protected: - Quad m_quad; - RageSound m_soundBack; -}; - - -#endif