diff --git a/stepmania/src/GhostArrow.cpp b/stepmania/src/GhostArrow.cpp deleted file mode 100644 index 260ffc805e..0000000000 --- a/stepmania/src/GhostArrow.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// GhostArrow.cpp: implementation of the GhostArrow class. -// -////////////////////////////////////////////////////////////////////// - -#include "stdafx.h" -#include "GhostArrow.h" - - - - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// - -GhostArrow::GhostArrow() -{ - Arrow::Arrow(); - - m_sprOutline.SetDiffuseColor( D3DXCOLOR(1,1,1,0) ); - m_sprMidSection.SetDiffuseColor( D3DXCOLOR(1,1,1,0) ); - m_sprCenter.SetDiffuseColor( D3DXCOLOR(1,1,1,0) ); -} - - -void GhostArrow::Step() -{ - m_sprOutline.SetZoom( 1 ); - m_sprOutline.SetDiffuseColor( D3DXCOLOR(1,1,0.5f,1) ); - m_sprOutline.BeginTweening( 0.3f ); - m_sprOutline.SetTweenZoom( 1.5 ); - m_sprOutline.SetTweenDiffuseColor( D3DXCOLOR(1,1,0.5f,0) ); - - m_sprMidSection.SetZoom( 1 ); - m_sprMidSection.SetDiffuseColor( D3DXCOLOR(1,1,0.5f,1) ); - m_sprMidSection.BeginTweening( 0.3f ); - m_sprMidSection.SetTweenZoom( 1.5 ); - m_sprMidSection.SetTweenDiffuseColor( D3DXCOLOR(1,1,0.5f,0) ); - - m_sprCenter.SetZoom( 1 ); - m_sprCenter.SetDiffuseColor( D3DXCOLOR(1,1,0.5f,1) ); - m_sprCenter.BeginTweening( 0.3f ); - m_sprCenter.SetTweenZoom( 1.5 ); - m_sprCenter.SetTweenDiffuseColor( D3DXCOLOR(1,1,0.5f,0) ); -} \ No newline at end of file diff --git a/stepmania/src/GhostArrow.h b/stepmania/src/GhostArrow.h deleted file mode 100644 index 7f0164e2f5..0000000000 --- a/stepmania/src/GhostArrow.h +++ /dev/null @@ -1,26 +0,0 @@ -/* ------------------------------------------------------------------------------ - File: GhostArrow.h - - Desc: Class used to represent a ghost arrow on the screen. - - Copyright (c) 2001 Ben Norstrom. All rights reserved. ------------------------------------------------------------------------------ -*/ - - -#ifndef _GHOST_ARROW_H_ -#define _GHOST_ARROW_H_ - - -#include "Arrow.h" - -class GhostArrow : public Arrow -{ -public: - GhostArrow(); - - virtual void Step(); -}; - -#endif diff --git a/stepmania/src/GrayArrow.cpp b/stepmania/src/GrayArrow.cpp deleted file mode 100644 index 65f03ea272..0000000000 --- a/stepmania/src/GrayArrow.cpp +++ /dev/null @@ -1,76 +0,0 @@ -// GrayArrow.cpp: implementation of the GrayArrow class. -// -////////////////////////////////////////////////////////////////////// - -#include "stdafx.h" -#include "GrayArrow.h" - - -const float GRAY_ARROW_POP_UP_TIME = 0.30f; - - - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction - -GrayArrow::GrayArrow() -{ - Arrow::Arrow(); - - // zero alpha for the center. don't show it. - m_sprCenter.SetDiffuseColor( D3DXCOLOR(0.4f,0.4f,0.4f,0) ); -} - - -void GrayArrow::Step() -{ - m_sprOutline.SetZoom( 0.50 ); - m_sprOutline.BeginTweening( GRAY_ARROW_POP_UP_TIME ); - m_sprOutline.SetTweenZoom( 1.0f ); - - m_sprMidSection.SetZoom( 0.50 ); - m_sprMidSection.BeginTweening( GRAY_ARROW_POP_UP_TIME ); - m_sprMidSection.SetTweenZoom( 1.0f ); - - //m_sprCenter.SetZoom( 0.50 ); - //m_sprCenter.BeginTweening( GRAY_ARROW_POP_UP_TIME ); - //m_sprCenter.SetTweenZoom( 1.0f ); -} - -void GrayArrow::CalculateColor( const float fBeatsTilStep ) -{ - float fOutline = 0.0f; - float fMidSection = 0.0f; - float fAlpha = 0.8f; - - - // get a float between 0 and 2 - // this will determine what shade you are - float fStage = fBeatsTilStep * 2.0f; - while( fStage >= 2.0f ) - fStage -= 2.0f; - - // less than 1, we are in the first stage, gettin darker - if( fStage < 1.0 ) - { - fOutline = 1.0f - fStage; - fMidSection = fStage; - } - // second stage, getting lighter again. - else - { - fOutline = fBeatsTilStep - 1.0f; - fMidSection = 2.0f - fStage; - } - - // shift the level a little so we never have entirely black or white. - fOutline *= 0.45f; - fOutline += 0.3f; - fMidSection *= 0.4f; - fMidSection += 0.4f; - - m_sprOutline.SetDiffuseColor( - D3DXCOLOR( fOutline,fOutline,fOutline,fAlpha ) ); - m_sprMidSection.SetDiffuseColor( - D3DXCOLOR( fMidSection,fMidSection,fMidSection,fAlpha ) ); -} diff --git a/stepmania/src/GrayArrow.h b/stepmania/src/GrayArrow.h deleted file mode 100644 index 6e52c211c5..0000000000 --- a/stepmania/src/GrayArrow.h +++ /dev/null @@ -1,29 +0,0 @@ -/* ------------------------------------------------------------------------------ - File: GrayArrow.h - - Desc: Class used to represent a gray arrow on the screen. - - Copyright (c) 2001 Ben Norstrom. All rights reserved. ------------------------------------------------------------------------------ -*/ - - -#ifndef _GRAYARROW_H_ -#define _GRAYARROW_H_ - - -#include "Arrow.h" - -class GrayArrow : public Arrow -{ -public: - GrayArrow(); - - // animates a step on the arrow - virtual void Step(); - - virtual void CalculateColor( const float fBeatsTilStep ); -}; - -#endif