From 7f6465f9fae11811bb882dc079e2e88d394c85a4 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 22 Mar 2003 20:30:30 +0000 Subject: [PATCH] TransitionFadeWipe is no longer used; remove --- stepmania/src/Makefile.am | 2 +- stepmania/src/StepMania.dsp | 8 ---- stepmania/src/StepMania.vcproj | 6 --- stepmania/src/TransitionFadeWipe.cpp | 65 ---------------------------- stepmania/src/TransitionFadeWipe.h | 35 --------------- 5 files changed, 1 insertion(+), 115 deletions(-) delete mode 100644 stepmania/src/TransitionFadeWipe.cpp delete mode 100644 stepmania/src/TransitionFadeWipe.h diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am index 07568daaef..fb67263acd 100644 --- a/stepmania/src/Makefile.am +++ b/stepmania/src/Makefile.am @@ -56,7 +56,7 @@ FileTypes = IniFile.cpp IniFile.h MsdFile.cpp MsdFile.h StepMania = global.h ScreenDimensions.h StdString.h StepMania.cpp StepMania.h Transitions = \ -Transition.cpp Transition.h TransitionFade.cpp TransitionFade.h TransitionFadeWipe.cpp TransitionFadeWipe.h \ +Transition.cpp Transition.h TransitionFade.cpp TransitionFade.h \ TransitionOniFade.cpp TransitionOniFade.h \ TransitionStarWipe.cpp TransitionStarWipe.h TransitionBGAnimation.cpp TransitionBGAnimation.h diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp index 38ffdf8610..1b3578ce2c 100644 --- a/stepmania/src/StepMania.dsp +++ b/stepmania/src/StepMania.dsp @@ -904,14 +904,6 @@ SOURCE=.\TransitionFade.h # End Source File # Begin Source File -SOURCE=.\TransitionFadeWipe.cpp -# End Source File -# Begin Source File - -SOURCE=.\TransitionFadeWipe.h -# End Source File -# Begin Source File - SOURCE=.\TransitionOniFade.cpp # End Source File # Begin Source File diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj index 81f69bf5ec..076b551dbd 100644 --- a/stepmania/src/StepMania.vcproj +++ b/stepmania/src/StepMania.vcproj @@ -971,12 +971,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ - - - - diff --git a/stepmania/src/TransitionFadeWipe.cpp b/stepmania/src/TransitionFadeWipe.cpp deleted file mode 100644 index 13185bef19..0000000000 --- a/stepmania/src/TransitionFadeWipe.cpp +++ /dev/null @@ -1,65 +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 "TransitionFadeWipe.h" -#include "GameConstantsAndTypes.h" -#include "PrefsManager.h" - -const float FADE_RECT_WIDTH = SCREEN_WIDTH/2; - - -TransitionFadeWipe::TransitionFadeWipe() -{ -} - -TransitionFadeWipe::~TransitionFadeWipe() -{ - -} - -void TransitionFadeWipe::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; - - float fPercentComplete = m_fPercentThroughTransition; - float fPercentAlongScreen = bFadeIsMovingLeft ? 1-fPercentComplete*1.3f : fPercentComplete*1.3f; - - float fFadeLeftEdgeX = fPercentAlongScreen * SCREEN_WIDTH - FADE_RECT_WIDTH/2; - float fFadeRightEdgeX = fPercentAlongScreen * SCREEN_WIDTH + FADE_RECT_WIDTH/2; - - float fDarkEdgeX = bLeftEdgeIsDarker ? fFadeLeftEdgeX : fFadeRightEdgeX; - float fLightEdgeX = bLeftEdgeIsDarker ? fFadeRightEdgeX : fFadeLeftEdgeX; - - float fDarkOutsideX = bLeftEdgeIsDarker ? fDarkEdgeX - SCREEN_WIDTH*2 : fDarkEdgeX + SCREEN_WIDTH*2; - - - m_rectBlack.SetDiffuse( RageColor(0,0,0,1) ); - m_rectBlack.StretchTo( RectI((int)fDarkOutsideX, 0, (int)fDarkEdgeX, (int)SCREEN_HEIGHT) ); - m_rectBlack.Draw(); - - m_rectGradient.SetDiffuseLeftEdge( RageColor(0,0,0,1) ); - m_rectGradient.SetDiffuseRightEdge( RageColor(0,0,0,0) ); - m_rectGradient.StretchTo( RectI((int)fDarkEdgeX, 0, (int)fLightEdgeX, (int)SCREEN_HEIGHT) ); - m_rectGradient.Draw(); - - -} - - diff --git a/stepmania/src/TransitionFadeWipe.h b/stepmania/src/TransitionFadeWipe.h deleted file mode 100644 index bca6edc99b..0000000000 --- a/stepmania/src/TransitionFadeWipe.h +++ /dev/null @@ -1,35 +0,0 @@ -/* ------------------------------------------------------------------------------ - File: TransitionFadeWipe.cpp - - Desc: Fades out or in. - - Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. ------------------------------------------------------------------------------ -*/ - -#ifndef TRANSITION_FADE_WIPE_H -#define TRANSITION_FADE_WIPE_H - - -#include "Transition.h" -#include "Quad.h" - - -class TransitionFadeWipe : public Transition -{ -public: - TransitionFadeWipe(); - ~TransitionFadeWipe(); - - virtual void DrawPrimitives(); - -protected: - Quad m_rectBlack, m_rectGradient; - -}; - - - - -#endif