diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am index 245565e0e1..07568daaef 100644 --- a/stepmania/src/Makefile.am +++ b/stepmania/src/Makefile.am @@ -57,7 +57,7 @@ StepMania = global.h ScreenDimensions.h StdString.h StepMania.cpp StepMania.h Transitions = \ Transition.cpp Transition.h TransitionFade.cpp TransitionFade.h TransitionFadeWipe.cpp TransitionFadeWipe.h \ -TransitionOniFade.cpp TransitionOniFade.h TransitionRectWipe.cpp TransitionRectWipe.h \ +TransitionOniFade.cpp TransitionOniFade.h \ TransitionStarWipe.cpp TransitionStarWipe.h TransitionBGAnimation.cpp TransitionBGAnimation.h Actors = \ diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp index c86ada3c62..38ffdf8610 100644 --- a/stepmania/src/StepMania.dsp +++ b/stepmania/src/StepMania.dsp @@ -920,14 +920,6 @@ SOURCE=.\TransitionOniFade.h # End Source File # Begin Source File -SOURCE=.\TransitionRectWipe.cpp -# End Source File -# Begin Source File - -SOURCE=.\TransitionRectWipe.h -# End Source File -# Begin Source File - SOURCE=.\TransitionStarWipe.cpp # End Source File # Begin Source File diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj index d1ff6b9fa7..81f69bf5ec 100644 --- a/stepmania/src/StepMania.vcproj +++ b/stepmania/src/StepMania.vcproj @@ -983,12 +983,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ - - - - diff --git a/stepmania/src/TransitionRectWipe.cpp b/stepmania/src/TransitionRectWipe.cpp deleted file mode 100644 index c8310fe4b7..0000000000 --- a/stepmania/src/TransitionRectWipe.cpp +++ /dev/null @@ -1,86 +0,0 @@ -#include "global.h" -/* ------------------------------------------------------------------------------ - File: TransitionStarWipe.cpp - - Desc: Black bands (horizontal window blinds) gradually close. - - Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. ------------------------------------------------------------------------------ -*/ - -#include "RageUtil.h" - -#include "TransitionRectWipe.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 - - - -TransitionRectWipe::TransitionRectWipe() -{ - -} - -TransitionRectWipe::~TransitionRectWipe() -{ - -} - -void TransitionRectWipe::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); - - } - //iRectWidth = RECTANGLE_WIDTH; - - if( iRectWidth > 0 ) - //if( i == iFadeLeftEdge || i == iFadeRightEdge ) - { // draw the rectangle -/* RECT rect; - SetRect( &rect, iRectX-iRectWidth/2, 0, - iRectX+iRectWidth/2, SCREEN_HEIGHT ); - DISPLAY->DrawRect( &rect, D3DCOLOR_ARGB(255,0,0,0) ); -*/ } - } // end foreach rect -} - - diff --git a/stepmania/src/TransitionRectWipe.h b/stepmania/src/TransitionRectWipe.h deleted file mode 100644 index 5d20e96afd..0000000000 --- a/stepmania/src/TransitionRectWipe.h +++ /dev/null @@ -1,30 +0,0 @@ -/* ------------------------------------------------------------------------------ - File: TransitionStarWipe.cpp - - Desc: Black bands (horizontal window blinds) gradually close. - - Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. ------------------------------------------------------------------------------ -*/ - -#ifndef _TransitionRectWipe_H_ -#define _TransitionRectWipe_H_ - - -#include "Transition.h" - - -class TransitionRectWipe : public Transition -{ -public: - TransitionRectWipe(); - ~TransitionRectWipe(); - - virtual void DrawPrimitives(); -}; - - - - -#endif